diff --git a/.changeset/empty-states-relax.md b/.changeset/empty-states-relax.md new file mode 100644 index 0000000000..c6b1bfa536 --- /dev/null +++ b/.changeset/empty-states-relax.md @@ -0,0 +1,5 @@ +--- +'@tanstack/router-core': patch +--- + +Avoid constructing a query serializer when search is empty or all values are undefined. diff --git a/.changeset/fast-compose-handlers.md b/.changeset/fast-compose-handlers.md new file mode 100644 index 0000000000..47c477dccb --- /dev/null +++ b/.changeset/fast-compose-handlers.md @@ -0,0 +1,5 @@ +--- +'@tanstack/react-router': patch +--- + +Avoid allocating event-handler arrays and wrapper functions for links without user-supplied event handlers. diff --git a/.changeset/fresh-tools-rest.md b/.changeset/fresh-tools-rest.md new file mode 100644 index 0000000000..1bf0d6e698 --- /dev/null +++ b/.changeset/fresh-tools-rest.md @@ -0,0 +1,9 @@ +--- +'@tanstack/router-plugin': patch +'@tanstack/router-generator': patch +'@tanstack/router-utils': patch +'@tanstack/start-plugin-core': patch +'@tanstack/nitro-v2-vite-plugin': patch +--- + +Refresh compatible build and runtime dependencies. diff --git a/.changeset/gentle-nights-bet.md b/.changeset/gentle-nights-bet.md new file mode 100644 index 0000000000..d2185a6247 --- /dev/null +++ b/.changeset/gentle-nights-bet.md @@ -0,0 +1,19 @@ +--- +'@tanstack/history': patch +'@tanstack/router-core': patch +'@tanstack/react-router': patch +'@tanstack/solid-router': patch +'@tanstack/vue-router': patch +'@tanstack/start-plugin-core': patch +'@tanstack/start-server-core': patch +--- + +Validate navigation and redirect destinations, keep ambiguous relative URLs on the current origin, and constrain prerender requests and output paths. Prevent redirect headers from appearing in serialized server function response bodies. + +Preserve native form HTTP redirects, route error handling and masks for document redirects, and per-navigation destinations for shared loader redirects. Avoid redundant origin parsing and reduce link styling and server-rendering work. Configured origins must already be normalized. + +Keep blocked-link inactive props consistent during React hydration, honor explicit redirect Location headers before checking route options, and refresh Vue link state when destinations become internal. Reuse the protocol-relative URL check while parsing redirect schemes once. + +Reduce React link bundle size by sharing pathname comparisons, state-prop selection, and element creation. + +Share normalized pathname comparisons in Solid and Vue links to reduce bundle size. diff --git a/.changeset/honest-nails-burn.md b/.changeset/honest-nails-burn.md new file mode 100644 index 0000000000..af614527d4 --- /dev/null +++ b/.changeset/honest-nails-burn.md @@ -0,0 +1,5 @@ +--- +'@tanstack/react-router': patch +--- + +React Links resolve state props without temporary class-name arrays or unnecessary style copies. diff --git a/.changeset/lucky-lies-tell.md b/.changeset/lucky-lies-tell.md new file mode 100644 index 0000000000..a3ffd18cb5 --- /dev/null +++ b/.changeset/lucky-lies-tell.md @@ -0,0 +1,5 @@ +--- +'@tanstack/router-core': patch +--- + +Reduce cache maintenance work during navigation by indexing incoming match IDs once per commit. diff --git a/.changeset/rsbuild-manifest-module-chunks-once.md b/.changeset/rsbuild-manifest-module-chunks-once.md deleted file mode 100644 index 02febd9d84..0000000000 --- a/.changeset/rsbuild-manifest-module-chunks-once.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@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 deleted file mode 100644 index 04e8e29928..0000000000 --- a/.changeset/rsbuild-manifest-own-chunks.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@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 deleted file mode 100644 index a84a054fbd..0000000000 --- a/.changeset/rsbuild-rule-use-falsy-loaders.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@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 deleted file mode 100644 index 01a0c5ee6e..0000000000 --- a/.changeset/rsbuild-virtual-modules-build.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@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 deleted file mode 100644 index 427043a712..0000000000 --- a/.changeset/rsbuild-virtual-modules-root.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@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 deleted file mode 100644 index 9c828f13b3..0000000000 --- a/.changeset/rsc-security-floor.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -'@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/silent-cycles-like.md b/.changeset/silent-cycles-like.md new file mode 100644 index 0000000000..2efeeaec7d --- /dev/null +++ b/.changeset/silent-cycles-like.md @@ -0,0 +1,5 @@ +--- +'@tanstack/solid-router': patch +--- + +Move the server shortcut for external and blocked links ahead of hydration, preloading, and active-state setup. diff --git a/.changeset/some-shirts-strive.md b/.changeset/some-shirts-strive.md new file mode 100644 index 0000000000..0a1f636b83 --- /dev/null +++ b/.changeset/some-shirts-strive.md @@ -0,0 +1,5 @@ +--- +'@tanstack/start-plugin-core': patch +--- + +Avoid unused build indexes and skip CSS content capture when inline CSS is disabled in Vite and Rsbuild. diff --git a/.changeset/start-server-fn-custom-id-check.md b/.changeset/start-server-fn-custom-id-check.md deleted file mode 100644 index 384f0ade06..0000000000 --- a/.changeset/start-server-fn-custom-id-check.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -'@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 deleted file mode 100644 index d4e8221c59..0000000000 --- a/.changeset/start-vite-root-library-discovery.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@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/.changeset/tidy-comics-chew.md b/.changeset/tidy-comics-chew.md new file mode 100644 index 0000000000..dc533fa9fb --- /dev/null +++ b/.changeset/tidy-comics-chew.md @@ -0,0 +1,8 @@ +--- +'@tanstack/router-core': patch +'@tanstack/history': patch +--- + +Use full-document navigation when an output rewrite produces a cross-origin destination, including the public URL of a route mask. + +Respect registered history blockers during document navigation, passing history locations and the requested push or replace action. diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 9dd0def7bd..a33150af03 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -4,14 +4,6 @@ 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 a5ef10f1ff..1245a0a0fd 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -12,11 +12,3 @@ - [ ] 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 6fd5aa1c86..01be1ce5c2 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -21,6 +21,7 @@ "@types/node", "@types/react", "@types/react-dom", + "h3", "node", "react", "react-dom", diff --git a/.github/workflows/bundle-size.yml b/.github/workflows/bundle-size.yml index 51ffa28e4c..23c354e06e 100644 --- a/.github/workflows/bundle-size.yml +++ b/.github/workflows/bundle-size.yml @@ -9,18 +9,12 @@ 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: @@ -51,7 +45,7 @@ jobs: uses: TanStack/config/.github/setup@e4b48f16568324f76f467aa4c2aac2f05db632c3 # main - name: Measure Bundle Size - run: pnpm benchmark:bundle-size --outputStyle=stream --skipRemoteCache + run: pnpm nx run @benchmarks/bundle-size:build --outputStyle=stream --skipRemoteCache - name: Capture Benchmark Outputs id: capture @@ -109,8 +103,6 @@ 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: | @@ -120,7 +112,7 @@ jobs: benchmark-main: name: Publish Bundle Size History - if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/main' && github.repository_owner == 'TanStack' + if: github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'TanStack' runs-on: ubuntu-latest permissions: contents: write @@ -135,7 +127,7 @@ jobs: uses: TanStack/config/.github/setup@e4b48f16568324f76f467aa4c2aac2f05db632c3 # main - name: Measure Bundle Size - run: pnpm benchmark:bundle-size --outputStyle=stream --skipRemoteCache + run: pnpm nx run @benchmarks/bundle-size:build --outputStyle=stream --skipRemoteCache - name: Publish Benchmark Dashboard uses: benchmark-action/github-action-benchmark@52576c92bccf6ac60c8223ec7eb2565637cae9ba # v1.22.1 with: diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/client-nav-benchmarks.yml similarity index 91% rename from .github/workflows/benchmarks.yml rename to .github/workflows/client-nav-benchmarks.yml index bbc3a1fa24..7eedc222ae 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/client-nav-benchmarks.yml @@ -18,15 +18,11 @@ on: pull_request: paths: - 'packages/**' - - '!packages/**/tests/**' - - '!packages/**/__tests__/**' - - '!packages/**/*.test.*' - 'benchmarks/**' - - '.nvmrc' workflow_dispatch: concurrency: - group: benchmarks-${{ github.ref }} + group: client-nav-benchmarks-${{ github.ref }} cancel-in-progress: false queue: single @@ -81,7 +77,7 @@ jobs: @benchmarks/${{ matrix.benchmark }}:build:${{ matrix.framework }} - name: Run ${{ matrix.benchmark }}:${{ matrix.framework }} CodSpeed benchmark - uses: CodSpeedHQ/action@373d6868929f444bc08d901fd0eb0ad52a8875ea # v5.2.1 + uses: CodSpeedHQ/action@4296e51e7041e24dadb86d1d6e8b9320d223dbe8 # v5.0.3 timeout-minutes: 20 with: mode: ${{ matrix.mode }} diff --git a/.github/workflows/compiler-platforms.yml b/.github/workflows/compiler-platforms.yml deleted file mode 100644 index ad70e39bb6..0000000000 --- a/.github/workflows/compiler-platforms.yml +++ /dev/null @@ -1,101 +0,0 @@ -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 fde1100409..d8c779b170 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -9,8 +9,6 @@ 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 ae19b4f0d2..71026a0a92 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -10,13 +10,6 @@ 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 @@ -33,8 +26,8 @@ jobs: with: fetch-depth: 0 persist-credentials: false - - name: Start Nx Workers - run: npx nx-cloud start-workers + - name: Start Nx Agents + run: npx nx-cloud start-ci-run --distribute-on=".nx/workflows/dynamic-changesets.yaml" - name: Setup Tools uses: TanStack/config/.github/setup@e4b48f16568324f76f467aa4c2aac2f05db632c3 # main - name: Get base and head commits for `nx affected` @@ -43,9 +36,9 @@ jobs: main-branch-name: main - name: Run Checks run: pnpm run test:pr --parallel=3 - - name: Stop Nx Workers + - name: Stop Nx Agents if: ${{ always() }} - run: npx nx-cloud stop-all-workers + run: npx nx-cloud stop-all-agents preview: name: Preview runs-on: ubuntu-latest diff --git a/.gitignore b/.gitignore index 70028b2860..1699592784 100644 --- a/.gitignore +++ b/.gitignore @@ -66,7 +66,6 @@ nx-cloud.env .nx/workspace-data .nx/polygraph .nx/self-healing -.nx/migrate-runs gpt/db.json diff --git a/.nvmrc b/.nvmrc index 63f87c20ef..b404027604 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -26.12.1 +24.8.0 diff --git a/.nx/ci-config.yaml b/.nx/ci-config.yaml deleted file mode 100644 index 2f0783feb4..0000000000 --- a/.nx/ci-config.yaml +++ /dev/null @@ -1,5 +0,0 @@ -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 new file mode 100644 index 0000000000..39d858d5b2 --- /dev/null +++ b/.nx/workflows/dynamic-changesets.yaml @@ -0,0 +1,4 @@ +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/sandboxing-config.yaml new file mode 100644 index 0000000000..4fa2634bc3 --- /dev/null +++ b/.nx/workflows/sandboxing-config.yaml @@ -0,0 +1,9 @@ +exclude-reads: + - e2e/.gitignore + - '**/src/routeTree.gen.ts' +exclude-writes: + - '**/src/routeTree.gen.ts' +task-exclusions: + - target: test:build + exclude-reads: + - LICENSE diff --git a/.nx/workflows/ultracache-config.yaml b/.nx/workflows/ultracache-config.yaml deleted file mode 100644 index b3ed223621..0000000000 --- a/.nx/workflows/ultracache-config.yaml +++ /dev/null @@ -1,124 +0,0 @@ -ignore-reads: - - e2e/.gitignore - - '**/src/routeTree.gen.ts' -ignore-writes: - - '**/src/routeTree.gen.ts' -task-exclusions: - - target: test:build - 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 - ignore-writes: - - e2e/react-start/deferred-hydration/src/routes/components.tsx - - project: tanstack-react-start-e2e-hmr - target: test:e2e - 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 - - e2e/react-start/hmr/src/routes/__root.tsx - - e2e/react-start/hmr/src/routes/child.tsx - - e2e/react-start/hmr/src/routes/component-hmr-inline-error-split.tsx - - e2e/react-start/hmr/src/routes/component-hmr-inline-nosplit.tsx - - e2e/react-start/hmr/src/routes/component-hmr-inline-split.tsx - - e2e/react-start/hmr/src/routes/component-hmr-lowercase-named-split.tsx - - e2e/react-start/hmr/src/routes/component-hmr-named-error-split.tsx - - e2e/react-start/hmr/src/routes/component-hmr-named-nosplit.tsx - - e2e/react-start/hmr/src/routes/component-hmr-named-split.tsx - - e2e/react-start/hmr/src/routes/index.tsx - - e2e/react-start/hmr/src/routes/inputs.tsx - - project: tanstack-react-start-e2e-hmr - target: test:e2e--vite-ssr - ignore-writes: *hmr-source-writes - - project: tanstack-react-start-e2e-hmr - target: test:e2e--vite-ssr--bundled-dev - ignore-writes: *hmr-source-writes - - project: tanstack-react-start-e2e-hmr - target: test:e2e--rsbuild-ssr - ignore-writes: *hmr-source-writes - - project: tanstack-react-start-e2e-rsbuild - target: test:e2e--rsbuild-ssr - ignore-writes: - - e2e/react-start/rsbuild/src/routes/index.tsx - - project: tanstack-react-start-e2e-server-functions - target: test:e2e - 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 - 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 - - packages/router-generator/tests/generator/custom-scaffolding/routes/index.tsx - # These reads are of scratch files created by the same test invocation. - - project: tanstack-solid-start-e2e-basic-auth - target: test:e2e - ignore-reads: - - e2e/solid-start/basic-auth/.tmp/dev.db - - project: tanstack-vue-start-e2e-basic-auth - target: test:e2e - ignore-reads: - - e2e/vue-start/basic-auth/.tmp/dev.db - - project: '@tanstack/router-generator' - target: test:unit - 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 - ignore-reads: - - e2e/react-start/basic-tsr-config/count.txt - ignore-writes: - - e2e/react-start/basic-tsr-config/count.txt - - project: tanstack-solid-start-e2e-basic-tsr-config - target: test:e2e - ignore-reads: - - e2e/solid-start/basic-tsr-config/count.txt - ignore-writes: - - e2e/solid-start/basic-tsr-config/count.txt - - project: tanstack-vue-start-e2e-basic-tsr-config - target: test:e2e - ignore-reads: - - e2e/vue-start/basic-tsr-config/count.txt - 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 - ignore-reads: - - e2e/react-start/i18n-paraglide/project.inlang/cache/plugins/* - - project: tanstack-router-e2e-react-i18n-paraglide - target: build - ignore-reads: - - e2e/react-router/i18n-paraglide/project.inlang/cache/plugins/* - - project: tanstack-react-start-e2e-i18n-paraglide - target: test:e2e - ignore-reads: - - e2e/react-start/i18n-paraglide/project.inlang/cache/plugins/* - - project: tanstack-router-e2e-react-i18n-paraglide - target: test:e2e - ignore-reads: - - e2e/react-router/i18n-paraglide/project.inlang/cache/plugins/* - - project: tanstack-router-i18n-paraglide - target: build - ignore-reads: - - examples/react/i18n-paraglide/project.inlang/cache/plugins/* - - project: tanstack-start-i18n-paraglide - target: build - ignore-reads: - - examples/react/start-i18n-paraglide/project.inlang/cache/plugins/* - - project: tanstack-router-solid-i18n-paraglide - target: build - ignore-reads: - - examples/solid/i18n-paraglide/project.inlang/cache/plugins/* - - project: tanstack-solid-start-i18n-paraglide - target: build - ignore-reads: - - examples/solid/start-i18n-paraglide/project.inlang/cache/plugins/* diff --git a/AGENTS.md b/AGENTS.md index f47b5103e1..3368f3f100 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -1,41 +1,181 @@ # AGENTS.md -## Scope +Read and follow [`CONTRIBUTING.md`](./CONTRIBUTING.md) before analyzing or +changing this repository. Its contribution and pull request requirements apply +to AI-assisted work. -- Read applicable nested `AGENTS.md` files before editing or testing a subtree. -- Shared routing belongs in `packages/router-core`; check React, Solid, and Vue bindings for shared changes. Shared Start runtime/build logic lives in `packages/start-*-core`. +## Project overview -## Work and validation +TanStack Router is a type-safe router with built-in caching and URL state management for React and Solid applications. This monorepo contains two main products: -- 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 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. +- **TanStack Router** - Core routing library with type-safe navigation, search params, and path params +- **TanStack Start** - Full-stack framework built on top of TanStack Router -```sh -CI=1 NX_DAEMON=false pnpm nx run-many -p -t --skipRemoteCache -``` +## Setup commands -- 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. -- For code changes, run affected packages' `test:unit`, `test:types`, and `test:eslint` where available, including affected consumers; use `test:e2e` for browser/app behavior and `test:build` for exports/build changes. Root `pnpm test` includes the full e2e suite. Published-code changes require `pnpm changeset`. +- Install deps: `pnpm install` +- Setup e2e testing: `pnpm exec playwright install` +- Build packages: `pnpm build` (affected) or `pnpm build:all` (force all) +- Start dev server: `pnpm dev` +- Run tests: `pnpm test` -## Runtime rules +## Code style -- Import `isServer` from `@tanstack/router-core/isServer`. Conditional exports select: `development` → `undefined`; server (`workerd`, `worker`, `deno`, `node`, `bun`) → `true` except `NODE_ENV=test` → `undefined`; browser/fallback → `false`. `development` wins; `NODE_ENV=development` alone does not select it. -- Keep `isServer ?? router.isServer` directly in each branch condition for dead-code elimination; negate the whole expression for client branches. Never extract it into a variable (e.g. `const serverRendering = isServer ?? router.isServer`) or helper. Without a router, inline `isServer ?? typeof window === 'undefined'` (or the existing `document` check). Keep the constant first and use `??`, never `||`. -- **Never create UI/router reactivity on the server, including development/tests.** Branch before reactive setup; use direct reads and core non-reactive stores. Required transport listeners are allowed only with request-scoped lifetimes and cleanup. -- Shared route definitions/build metadata must not acquire request/user data. Keep it on the request's Router, context, or QueryClient. -- HMR can replace code while caches and pending work survive. Invalidate derived state or bypass caching in development; reject stale async results while preserving intentional HMR identities/state. -- Gate developer diagnostics and message construction with direct `process.env.NODE_ENV !== 'production'` checks. Preserve required validation/throws in production (e.g. detailed development error, compact `invariant()` failure). `!== 'development'` also enables the guarded code in tests; preserve existing dev-server mode gates. +- TypeScript strict mode with extensive type safety +- Framework-agnostic core logic separated from React/Solid bindings +- Type-safe routing with search params and path params +- Use workspace protocol for internal dependencies (`workspace:*`) +- Always use curly braces for `if`, `else`, loops, and similar control statements. Never write one-line bodies like `if (foo) x = 1`. -## Performance and final bundle pass +## Dev environment tips -- For runtime/memory changes, compare identical baseline/candidate workloads using the relevant [benchmark guide](benchmarks/AGENTS.md): client navigation, Start SSR, or memory. Add coverage for unmeasured mechanisms. -- **Last phase for every change affecting emitted client JavaScript**, including core/build transforms: complete the full [bundle-size-optimization skill](.agents/skills/bundle-size-optimization/SKILL.md) after correctness and performance validation. The full workflow is mandatory. +- This is a pnpm workspace monorepo with packages organized by functionality +- Nx provides caching, affected testing, targeting, and parallel execution for efficiency +- Use `pnpm nx show projects` to list all available packages +- Target specific packages: `pnpm nx run @tanstack/react-router:test:unit` +- Target multiple packages: `pnpm nx run-many --target=test:eslint --projects=@tanstack/history,@tanstack/router-core` +- Run affected tests only: `pnpm nx affected --target=test:unit` +- Exclude patterns: `pnpm nx run-many --target=test:unit --exclude="examples/**,e2e/**"` +- Navigate to examples and run `pnpm dev` to test changes: `cd examples/react/basic && pnpm dev` +- **Granular unit testing through Nx (recommended):** + - Specific files: `pnpm nx run @tanstack/react-router:test:unit -- tests/link.test.tsx tests/Scripts.test.tsx` + - Test patterns: `pnpm nx run @tanstack/react-router:test:unit -- tests/ClientOnly.test.tsx -t "should render fallback"` + - Name patterns: `pnpm nx run @tanstack/react-router:test:unit -- -t "navigation"` (all tests with "navigation" in name) + - Exclude patterns: `pnpm nx run @tanstack/react-router:test:unit -- --exclude="**/*link*" tests/` + - List tests: `pnpm nx run @tanstack/react-router:test:unit -- list tests/link.test.tsx` (or `-- list` for all) +- **Available test targets per package:** `test:unit`, `test:types`, `test:eslint`, `test:build`, `test:perf`, `build` +- **Testing strategy:** Package level (nx) → File-level args via nx → Test-level args (`-t`) via nx → Pattern-level args (`--exclude`) via nx +- **Agent execution guardrails (important):** + - Always prefer `pnpm nx ...` over `npx nx ...`. + - Prefer Nx targets over direct test runners so task dependencies (including required builds) remain in the graph. + - In sandbox, run Nx with `CI=1 NX_DAEMON=false pnpm nx run : --outputStyle=stream --skipRemoteCache` + - Run only one Nx command at a time. + - If an Nx command shows no output for ~20 seconds, stop, run `pnpm nx reset` once, and retry once. + - Do not loop retries indefinitely. If it still hangs or sandbox blocks graph/daemon behavior, request escalation immediately. + +## Testing instructions + +- **Critical**: Always run unit and type tests during development - do not proceed if they fail +- **Test types:** `pnpm test:unit`, `pnpm test:types`, `pnpm test:eslint`, `pnpm test:e2e`, `pnpm test:build` +- **Full CI suite:** `pnpm test:ci` +- **Fix formatting:** `pnpm format` +- **Efficient targeted testing workflow:** + 1. **Affected only:** `pnpm nx affected --target=test:unit` (compares to main branch) + 2. **Specific packages:** `pnpm nx run @tanstack/react-router:test:unit` + 3. **Specific files:** `pnpm nx run @tanstack/react-router:test:unit -- tests/link.test.tsx` + 4. **Specific patterns:** `pnpm nx run @tanstack/react-router:test:unit -- tests/link.test.tsx -t "preloading"` +- **Pro tips:** + - Use `pnpm nx run @tanstack/react-router:test:unit -- list` to explore available tests before running + - Use `-t "pattern"` to focus on specific functionality during development + - Use `--exclude` patterns to skip unrelated tests + - Keep all test filtering arguments behind `pnpm nx run ... -- ...` for maximum precision while preserving task dependencies +- **Example workflow:** `pnpm nx run @tanstack/react-router:test:unit` → `pnpm nx run @tanstack/react-router:test:unit -- tests/link.test.tsx` → `pnpm nx run @tanstack/react-router:test:unit -- tests/link.test.tsx -t "preloading"` + +## PR instructions + +- Always run `pnpm test:eslint`, `pnpm test:types`, and `pnpm test:unit` before committing +- Test changes in relevant example apps: `cd examples/react/basic && pnpm dev` +- Update corresponding documentation in `docs/` directory when adding features +- Add or update tests for any code changes +- Use internal docs links relative to `docs/` folder (e.g., `./guide/data-loading`) + +## Package structure + +**Core packages:** + +- `packages/router-core/` - Framework-agnostic core router logic +- `packages/react-router/`, `packages/solid-router/` - React/Solid bindings and components +- `packages/history/` - Browser history management + +**Tooling:** + +- `packages/router-cli/` - CLI tools for code generation +- `packages/router-generator/` - Route generation utilities +- `packages/router-plugin/` - Universal bundler plugins (Vite, Webpack, ESBuild, Rspack) +- `packages/virtual-file-routes/` - Virtual file routing system + +**Developer experience:** + +- `packages/router-devtools/`, `packages/*-router-devtools/` - Development tools +- `packages/eslint-plugin-router/` - ESLint rules for router + +**Validation adapters:** + +- `packages/zod-adapter/`, `packages/valibot-adapter/`, `packages/arktype-adapter/` + +**Start framework:** + +- `packages/*-start/`, `packages/start-*/` - Full-stack framework packages + +**Examples & testing:** + +- `examples/react/`, `examples/solid/` - Example applications (test changes here) +- `e2e/` - End-to-end tests (requires Playwright) +- `docs/router/`, `docs/start/` - Documentation with React/Solid subdirectories + +**Dependencies:** Uses workspace protocol (`workspace:*`) - core → framework → start packages + +## Common development tasks + +**Adding new routes:** + +- Use file-based routing in `src/routes/` directories +- Or use code-based routing with route definitions +- Run route generation with CLI tools + +**Testing changes:** + +- Build packages: `pnpm build` or `pnpm dev` (watch mode) +- Run example apps to test functionality +- Use devtools for debugging router state + +**Documentation updates:** + +- Update relevant docs in `docs/` directory +- Ensure examples reflect documentation changes +- Test documentation links and references +- Use relative links to `docs/` folder format + +## Framework-specific notes + +**React:** + +- Uses React Router components and hooks +- Supports React Server Components (RSC) +- Examples include React Query integration +- Package: `@tanstack/react-router` + +**Solid:** + +- Uses Solid Router components and primitives +- Supports Solid Start for full-stack applications +- Examples include Solid Query integration +- Package: `@tanstack/solid-router` + +## Environment requirements + +- **Node.js** - Required for development +- **pnpm** - Package manager (required for workspace features) +- **Playwright** - Required for e2e tests (`pnpm exec playwright install`) + +## Key architecture patterns + +- **Type Safety**: Extensive TypeScript for type-safe routing +- **Framework Agnostic**: Core logic separated from framework bindings +- **Plugin Architecture**: Universal bundler plugins using unplugin +- **File-based Routing**: Support for both code-based and file-based routing +- **Search Params**: First-class support for type-safe search parameters + +## Development workflow + +1. **Setup**: `pnpm install` and `pnpm exec playwright install` +2. **Build**: `pnpm build:all` or `pnpm dev` for watch mode +3. **Test**: Make changes and run relevant tests (use nx for targeted testing) +4. **Examples**: Navigate to examples and run `pnpm dev` to test changes +5. **Quality**: Run `pnpm test:eslint`, `pnpm test:types`, `pnpm test:unit` before committing + +## References + +- **Documentation**: https://tanstack.com/router +- **GitHub**: https://github.com/TanStack/router +- **Discord Community**: https://discord.com/invite/WrRKjPJ diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4b6e808af1..ce76a5ba5d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -142,14 +142,6 @@ 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 0b2672f0c6..4b5d6f8386 100644 --- a/_artifacts/domain_map.yaml +++ b/_artifacts/domain_map.yaml @@ -147,15 +147,13 @@ skills: context types to not flow into loader. wrong_pattern: | createFileRoute('/posts')({ - loader: ({ context }) => - context.queryClient.query({ ...postsQuery, staleTime: 'static' }), + loader: ({ context }) => context.queryClient.ensureQueryData(postsQuery), beforeLoad: ({ context }) => ({ queryClient: context.queryClient }), }) correct_pattern: | createFileRoute('/posts')({ beforeLoad: ({ context }) => ({ queryClient: context.queryClient }), - loader: ({ context }) => - context.queryClient.query({ ...postsQuery, staleTime: 'static' }), + loader: ({ context }) => context.queryClient.ensureQueryData(postsQuery), }) source: 'docs/router/eslint/create-route-property-order.md' priority: HIGH @@ -538,7 +536,7 @@ skills: - '@tanstack/react-router-ssr-query' covers: - External cache coordination pattern - - "queryClient.query with staleTime: 'static' in loader" + - queryClient.ensureQueryData in loader - useSuspenseQuery in components - setupRouterSsrQueryIntegration - defaultPreloadStaleTime @@ -581,11 +579,11 @@ skills: priority: HIGH status: active - - mistake: 'Awaiting a fire-and-forget query in loader blocks rendering' + - mistake: 'Awaiting prefetchQuery in loader blocks rendering' mechanism: >- - 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. + 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. source: 'docs/router/integrations/query.md' priority: MEDIUM status: active diff --git a/_artifacts/skill_spec.md b/_artifacts/skill_spec.md index 7eb9554a42..4503afb48a 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 a fire-and-forget query 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 prefetchQuery 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 6f7c4c8742..ec38a04bdd 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, static queries and fire-and-forget queries in loaders, + in router context, ensureQueryData/prefetchQuery 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 deleted file mode 100644 index 9d56a2411a..0000000000 --- a/benchmarks/AGENTS.md +++ /dev/null @@ -1,15 +0,0 @@ -# Benchmarks - -Read the relevant README before running benchmarks. Compare baseline and candidate with the same workload and production builds; add a focused case when existing scenarios miss the changed mechanism. Keep workloads and benchmark names stable for historical comparisons. - -| Changed behavior | Guide | Nx project | -| ------------------------------------------ | ---------------------------------- | -------------------------------------------------------- | -| Standalone Router navigation/rendering CPU | [client-nav](client-nav/README.md) | `@benchmarks/client-nav` | -| Start request/SSR CPU | [ssr](ssr/README.md) | `@benchmarks/ssr` | -| Client/server retention and allocations | [memory](memory/README.md) | `@benchmarks/memory-client`, `@benchmarks/memory-server` | - -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 94d2f31802..96cd63f850 100644 --- a/benchmarks/README.md +++ b/benchmarks/README.md @@ -1,7 +1,6 @@ # CPU simulation benchmarks -`client-nav` measures navigation, mounting, and React/Solid hydration in -Node/jsdom; `ssr` measures server requests. +`client-nav` measures navigation in Node/jsdom; `ssr` measures server requests. Both suites run through the CodSpeed Vitest integration in CPU simulation mode. ## Worker runtime @@ -76,13 +75,13 @@ Node and use `setImmediate` directly. Dispatch the existing `Benchmarks` workflow against an unchanged branch: ```sh -gh workflow run benchmarks.yml --ref +gh workflow run client-nav-benchmarks.yml --ref ``` Wait for each workflow run to finish before dispatching the next repetition at the same commit. The workflow also runs memory benchmarks; exclude those results when assessing CPU repeatability. Check that every repetition has all expected -CPU results (currently 134), rather than inherited results from an earlier run. +CPU results (currently 132), rather than inherited results from an earlier run. Compare each benchmark's minimum and maximum across repetitions; keep input data, navigation/request counts, builds, dependencies and Node version fixed when testing runtime configuration changes. diff --git a/benchmarks/bundle-size/README.md b/benchmarks/bundle-size/README.md index 2185d6b43f..c845382fdb 100644 --- a/benchmarks/bundle-size/README.md +++ b/benchmarks/bundle-size/README.md @@ -40,9 +40,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:measure` directly produces only the cacheable outputs; run `node scripts/benchmarks/bundle-size/report.mjs` afterward to refresh `current.json`. +The existing `pnpm benchmark:bundle-size` command keeps its CI build graph unchanged. If the required packages are already built and unchanged, skip that step: @@ -52,7 +50,6 @@ pnpm benchmark:bundle-size:run --scenario react-router.minimal --skip-package-bu This writes: -- `benchmarks/bundle-size/results/measurements.json` - `benchmarks/bundle-size/results/current.json` - `benchmarks/bundle-size/results/benchmark-action.json` - `benchmarks/bundle-size/results/measure.log` @@ -65,29 +62,6 @@ Full stdout and stderr stay in the log files. A positive bundle-size delta does For agent runs, use `pnpm --silent benchmark:bundle-size:run ...` to omit the package-manager command echo. -### Phase Timings - -To diagnose measurement time, request a fresh run: - -```bash -pnpm benchmark:bundle-size:run --scenario react-router.minimal --analysis --timings -``` - -The runner directly executes `measure.mjs` on every invocation, rebuilding the selected scenarios and recording fresh timings in `measure.log`. Its package-build step still uses Nx and may restore cached packages. Use `--skip-package-builds` only when those packages are already built and unchanged. - -`measure.mjs` also accepts `--timings` directly. Alternatively, set `BUNDLE_SIZE_TIMINGS=1`. Timing lines go to stderr with the prefix `[bundle-size:timing]` followed by JSON containing `phase`, `durationMs`, and, for scenario phases, `scenario`. They are diagnostics only and do not add fields to the size metrics. - -The cached `pnpm benchmark:bundle-size` / Nx build path can replay terminal output from an earlier execution, including old timing lines. Setting `BUNDLE_SIZE_TIMINGS=1` does not invalidate that cache or guarantee fresh timings. Use the direct runner above for timing investigations; refreshing `current.json` after a cache hit does not remeasure build time. - -- `package-builds`: elapsed time for the package-build invocation, including Nx startup/cache handling; omitted when package builds are skipped. -- `scenario-build`: elapsed time for each scenario's build and cleanup. -- `manifest-resolution`: manifest discovery, parsing, entry selection, and collection of all/initial JS file lists. -- `gzip` / `brotli`: accumulated codec time across distinct files for each scenario, using Node's default compression settings. File reads and summation are excluded; initial files reuse already measured sizes. -- `analysis`: source attribution, when `--analysis` is enabled. -- `overall`: measurement execution through report/history writing. Module imports, process startup, and the outer runner's tests/report command are excluded. - -Phases that start also report elapsed work on failure; compression reports partial accumulated times before propagating the error. Timing records alone do not indicate success. `overall` contains the other phases, so nested timings must not be added to it. The phase breakdown also excludes overhead such as file reads and result writing, so its sum is not expected to equal `overall`. - ## Compare Optimization Candidates Before you change the implementation, save a named baseline: @@ -114,8 +88,6 @@ Without `--name`, runs replace `current.json` and the logs for the steps they ru Emitted bundles still use the shared `dist/` directory. To retain emitted bundles for a candidate, pass a separate `--dist-dir`. `--baseline` accepts a run name or a JSON file path, such as `--baseline ./baseline.json`. -With `--scenario`, the comparison reports only the scenarios measured in the current run, even when the baseline contains more scenarios. Selected scenarios missing from the baseline remain visible with `n/a` for their baseline and deltas. -Without `--scenario`, comparisons include scenarios from either result file. `--results-dir ` changes the results root, including the location of named runs. Use the same scenario selection and measurement flags for the baseline and candidate. @@ -133,8 +105,6 @@ pnpm benchmark:bundle-size:diff --baseline /tmp/base-current.json --id react-rou pnpm benchmark:bundle-size:history --id react-router.minimal --top-deltas 20 ``` -Use `pnpm benchmark:bundle-size:diff --baseline /tmp/base-current.json --current-only` to compare only scenarios present in the current results. This applies to both text and `--json` output; an explicit `--id` takes precedence. - For source attribution, run an analysis build. This uses hidden source maps and writes source estimates into `current.json`; those estimates are for investigation only, not tracking. ```bash diff --git a/benchmarks/bundle-size/package.json b/benchmarks/bundle-size/package.json index ca34cd6cd7..9decbae9da 100644 --- a/benchmarks/bundle-size/package.json +++ b/benchmarks/bundle-size/package.json @@ -3,30 +3,13 @@ "private": true, "type": "module", "scripts": { - "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" + "build": "node ../../scripts/benchmarks/bundle-size/measure.mjs --skip-package-builds", + "test:unit": "node --test ../../scripts/benchmarks/bundle-size/pr-report.test.mjs ../../scripts/benchmarks/bundle-size/run.test.mjs" }, "nx": { "targets": { - "measure": { - "cache": true, - "inputs": [ - "buildProduction", - "^buildProduction", - "dependentTaskOutputs", - "{workspaceRoot}/scripts/benchmarks/bundle-size/measure.mjs", - "{workspaceRoot}/scripts/benchmarks/bundle-size/compress.mjs", - "{workspaceRoot}/scripts/benchmarks/bundle-size/timings.mjs", - "{workspaceRoot}/scripts/benchmarks/bundle-size/report.mjs", - { - "runtime": "node --version" - } - ], - "outputs": [ - "{projectRoot}/dist", - "{projectRoot}/results/measurements.json", - "{projectRoot}/results/benchmark-action.json" - ], + "build": { + "cache": false, "dependsOn": [ { "projects": [ @@ -68,7 +51,7 @@ "vue": "^3.5.16" }, "devDependencies": { - "@rsbuild/core": "^2.3.1", + "@rsbuild/core": "^2.1.0", "@rsbuild/plugin-react": "^2.0.0", "@tanstack/router-plugin": "workspace:^", "@types/react": "^19.0.8", diff --git a/benchmarks/bundle-size/scenarios/vue-router-full/src/routes/__root.tsx b/benchmarks/bundle-size/scenarios/vue-router-full/src/routes/__root.tsx index 0ff40aebfc..d696063083 100644 --- a/benchmarks/bundle-size/scenarios/vue-router-full/src/routes/__root.tsx +++ b/benchmarks/bundle-size/scenarios/vue-router-full/src/routes/__root.tsx @@ -1,4 +1,3 @@ -import { defineComponent } from 'vue' import { Asset, Await, @@ -46,151 +45,143 @@ import { useTags, } from '@tanstack/vue-router' -const RootComponent = defineComponent({ - setup() { - const router = useRouter() - const [awaited] = useAwaited({ promise: Promise.resolve('ready') }) - const linkProps = useLinkProps({ to: '/' } as any) - const matchRoute = useMatchRoute() - const matches = useMatches() - const parentMatches = useParentMatches() - const childMatches = useChildMatches() - const match = useMatch({ strict: false, shouldThrow: false } as any) - const loaderDeps = useLoaderDeps({ strict: false } as any) - const loaderData = useLoaderData({ strict: false } as any) - const params = useParams({ strict: false } as any) - const search = useSearch({ strict: false } as any) - const routeContext = useRouteContext({ strict: false } as any) - const routerState = useRouterState({ - select: (state) => state.status, - } as any) - const location = useLocation() - const canGoBack = useCanGoBack() - const navigate = useNavigate() - const scrollEntry = useElementScrollRestoration({ id: 'root-scroll' }) - const tags = useTags() - - useBlocker({ - shouldBlockFn: () => false, - disabled: true, - withResolver: false, - }) - - const linkFactoryResult = linkOptions({ to: '/' } as any) - const routeMatchResult = matchRoute({ to: '/' } as any) - const SvgLink = createLink('svg') - - const hooksAndComponents = [ - useAwaited, - useLinkProps, - useMatchRoute, - useMatches, - useParentMatches, - useChildMatches, - useMatch, - useLoaderDeps, - useLoaderData, - useBlocker, - useNavigate, - useParams, - useSearch, - useRouteContext, - useRouter, - useRouterState, - useLocation, - useCanGoBack, - useElementScrollRestoration, - useTags, - Await, - CatchBoundary, - CatchNotFound, - ClientOnly, - DefaultGlobalNotFound, - ErrorComponent, - Link, - Match, - MatchRoute, - Matches, - Navigate, - Outlet, - RouterContextProvider, - ScrollRestoration, - Block, - ScriptOnce, - Asset, - HeadContent, - Scripts, - Body, - Html, - ] - - ;(globalThis as any).__TANSTACK_BUNDLE_SIZE_KEEP__ = { - hooksAndComponents, - } - - return () => { - void awaited - void linkFactoryResult - void matches.value - void parentMatches.value - void childMatches.value - void match.value - void loaderDeps.value - void loaderData.value - void params.value - void search.value - void routeContext.value - void routerState.value - void location.value - void canGoBack.value - void navigate - void scrollEntry - void tags() - void routeMatchResult.value - - return ( - <> - - {'window.__tsr_bundle_size = true'} - - home - - - - - {() => } - - }> - - - } - /> - false} disabled withResolver={false}> - {() => } - - }> - - - - - - - - -
-
hello world
-
- - ) - } - }, -}) - export const Route = createRootRoute({ component: RootComponent, }) + +function RootComponent() { + const router = useRouter() + const [awaited] = useAwaited({ promise: Promise.resolve('ready') }) + const linkProps = useLinkProps({ to: '/' } as any) + const matchRoute = useMatchRoute() + const matches = useMatches() + const parentMatches = useParentMatches() + const childMatches = useChildMatches() + const match = useMatch({ strict: false, shouldThrow: false } as any) + const loaderDeps = useLoaderDeps({ strict: false } as any) + const loaderData = useLoaderData({ strict: false } as any) + const params = useParams({ strict: false } as any) + const search = useSearch({ strict: false } as any) + const routeContext = useRouteContext({ strict: false } as any) + const routerState = useRouterState({ select: (state) => state.status } as any) + const location = useLocation() + const canGoBack = useCanGoBack() + const navigate = useNavigate() + const scrollEntry = useElementScrollRestoration({ id: 'root-scroll' }) + const tags = useTags() + + useBlocker({ + shouldBlockFn: () => false, + disabled: true, + withResolver: false, + }) + + const linkFactoryResult = linkOptions({ to: '/' } as any) + const routeMatchResult = matchRoute({ to: '/' } as any) + const SvgLink = createLink('svg') + + const hooksAndComponents = [ + useAwaited, + useLinkProps, + useMatchRoute, + useMatches, + useParentMatches, + useChildMatches, + useMatch, + useLoaderDeps, + useLoaderData, + useBlocker, + useNavigate, + useParams, + useSearch, + useRouteContext, + useRouter, + useRouterState, + useLocation, + useCanGoBack, + useElementScrollRestoration, + useTags, + Await, + CatchBoundary, + CatchNotFound, + ClientOnly, + DefaultGlobalNotFound, + ErrorComponent, + Link, + Match, + MatchRoute, + Matches, + Navigate, + Outlet, + RouterContextProvider, + ScrollRestoration, + Block, + ScriptOnce, + Asset, + HeadContent, + Scripts, + Body, + Html, + ] + + ;(globalThis as any).__TANSTACK_BUNDLE_SIZE_KEEP__ = { + hooksAndComponents, + } + + void awaited + void linkFactoryResult + void matches.value + void parentMatches.value + void childMatches.value + void match.value + void loaderDeps.value + void loaderData.value + void params.value + void search.value + void routeContext.value + void routerState.value + void location.value + void canGoBack.value + void navigate + void scrollEntry + void tags() + void routeMatchResult.value + + return ( + <> + + {'window.__tsr_bundle_size = true'} + + home + + + + {() => } + }> + + + } + /> + false} disabled withResolver={false}> + {() => } + + }> + + + + + + + + +
+
hello world
+
+ + ) +} diff --git a/benchmarks/bundle-size/scenarios/vue-start-full/src/routes/__root.tsx b/benchmarks/bundle-size/scenarios/vue-start-full/src/routes/__root.tsx index 8e8870a2ce..aa0539fa1a 100644 --- a/benchmarks/bundle-size/scenarios/vue-start-full/src/routes/__root.tsx +++ b/benchmarks/bundle-size/scenarios/vue-start-full/src/routes/__root.tsx @@ -1,4 +1,3 @@ -import { defineComponent } from 'vue' import { Asset, Await, @@ -69,159 +68,151 @@ const helloServerFn = createServerFn({ method: 'GET' }) return 'hello from server fn' }) -const RootComponent = defineComponent({ - setup() { - const router = useRouter() - const [awaited] = useAwaited({ promise: Promise.resolve('ready') }) - const linkProps = useLinkProps({ to: '/' } as any) - const matchRoute = useMatchRoute() - const matches = useMatches() - const parentMatches = useParentMatches() - const childMatches = useChildMatches() - const match = useMatch({ strict: false, shouldThrow: false } as any) - const loaderDeps = useLoaderDeps({ strict: false } as any) - const loaderData = useLoaderData({ strict: false } as any) - const params = useParams({ strict: false } as any) - const search = useSearch({ strict: false } as any) - const routeContext = useRouteContext({ strict: false } as any) - const routerState = useRouterState({ - select: (state) => state.status, - } as any) - const location = useLocation() - const canGoBack = useCanGoBack() - const navigate = useNavigate() - const scrollEntry = useElementScrollRestoration({ id: 'root-scroll' }) - const tags = useTags() - const invokeServerFn = useServerFn(helloServerFn) - - useBlocker({ - shouldBlockFn: () => false, - disabled: true, - withResolver: false, - }) - - const linkFactoryResult = linkOptions({ to: '/' } as any) - const routeMatchResult = matchRoute({ to: '/' } as any) - const SvgLink = createLink('svg') - - const startSurface = [createMiddleware, createServerFn, useServerFn] - const hooksAndComponents = [ - useAwaited, - useLinkProps, - useMatchRoute, - useMatches, - useParentMatches, - useChildMatches, - useMatch, - useLoaderDeps, - useLoaderData, - useBlocker, - useNavigate, - useParams, - useSearch, - useRouteContext, - useRouter, - useRouterState, - useLocation, - useCanGoBack, - useElementScrollRestoration, - useTags, - Await, - CatchBoundary, - CatchNotFound, - ClientOnly, - DefaultGlobalNotFound, - ErrorComponent, - Link, - Match, - MatchRoute, - Matches, - Navigate, - Outlet, - RouterContextProvider, - ScrollRestoration, - Block, - ScriptOnce, - Asset, - HeadContent, - Scripts, - Body, - Html, - ] - - ;(globalThis as any).__TANSTACK_BUNDLE_SIZE_KEEP__ = { - hooksAndComponents, - startSurface, - } - - return () => { - void awaited - void linkFactoryResult - void matches.value - void parentMatches.value - void childMatches.value - void match.value - void loaderDeps.value - void loaderData.value - void params.value - void search.value - void routeContext.value - void routerState.value - void location.value - void canGoBack.value - void navigate - void scrollEntry - void tags() - void routeMatchResult.value - void invokeServerFn - - return ( - - - - - - {'window.__tsr_bundle_size = true'} - - home - - - - - {() => } - - }> - - - } - /> - false} disabled withResolver={false}> - {() => } - - }> - - - - - - - - -
-
hello world
-
- - - ) - } - }, -}) - export const Route = createRootRoute({ component: RootComponent, }) + +function RootComponent() { + const router = useRouter() + const [awaited] = useAwaited({ promise: Promise.resolve('ready') }) + const linkProps = useLinkProps({ to: '/' } as any) + const matchRoute = useMatchRoute() + const matches = useMatches() + const parentMatches = useParentMatches() + const childMatches = useChildMatches() + const match = useMatch({ strict: false, shouldThrow: false } as any) + const loaderDeps = useLoaderDeps({ strict: false } as any) + const loaderData = useLoaderData({ strict: false } as any) + const params = useParams({ strict: false } as any) + const search = useSearch({ strict: false } as any) + const routeContext = useRouteContext({ strict: false } as any) + const routerState = useRouterState({ select: (state) => state.status } as any) + const location = useLocation() + const canGoBack = useCanGoBack() + const navigate = useNavigate() + const scrollEntry = useElementScrollRestoration({ id: 'root-scroll' }) + const tags = useTags() + const invokeServerFn = useServerFn(helloServerFn) + + useBlocker({ + shouldBlockFn: () => false, + disabled: true, + withResolver: false, + }) + + const linkFactoryResult = linkOptions({ to: '/' } as any) + const routeMatchResult = matchRoute({ to: '/' } as any) + const SvgLink = createLink('svg') + + const startSurface = [createMiddleware, createServerFn, useServerFn] + const hooksAndComponents = [ + useAwaited, + useLinkProps, + useMatchRoute, + useMatches, + useParentMatches, + useChildMatches, + useMatch, + useLoaderDeps, + useLoaderData, + useBlocker, + useNavigate, + useParams, + useSearch, + useRouteContext, + useRouter, + useRouterState, + useLocation, + useCanGoBack, + useElementScrollRestoration, + useTags, + Await, + CatchBoundary, + CatchNotFound, + ClientOnly, + DefaultGlobalNotFound, + ErrorComponent, + Link, + Match, + MatchRoute, + Matches, + Navigate, + Outlet, + RouterContextProvider, + ScrollRestoration, + Block, + ScriptOnce, + Asset, + HeadContent, + Scripts, + Body, + Html, + ] + + ;(globalThis as any).__TANSTACK_BUNDLE_SIZE_KEEP__ = { + hooksAndComponents, + startSurface, + } + + void awaited + void linkFactoryResult + void matches.value + void parentMatches.value + void childMatches.value + void match.value + void loaderDeps.value + void loaderData.value + void params.value + void search.value + void routeContext.value + void routerState.value + void location.value + void canGoBack.value + void navigate + void scrollEntry + void tags() + void routeMatchResult.value + void invokeServerFn + + return ( + + + + + + {'window.__tsr_bundle_size = true'} + + home + + + + {() => } + }> + + + } + /> + false} disabled withResolver={false}> + {() => } + + }> + + + + + + + + +
+
hello world
+
+ + + ) +} diff --git a/benchmarks/client-nav/README.md b/benchmarks/client-nav/README.md index ec34ecc0c1..6179c7f0b8 100644 --- a/benchmarks/client-nav/README.md +++ b/benchmarks/client-nav/README.md @@ -9,11 +9,10 @@ Cross-framework client-side CPU benchmarks for: The benchmarks run in jsdom against production builds of real apps, and are tracked in CI by CodSpeed (simulation mode). -> **Scope:** these benchmarks cover the client router. The hydration -> scenarios also cover DOM hydration and the Router state-restoration path -> used by Start. Start-specific entry-point initialization, streamed payload -> arrival and client server-function calls are not included. Server request work -> is covered by `benchmarks/ssr`. +> **Scope:** these benchmarks cover the standalone client router only. The +> client side of TanStack Start (hydration of a server-rendered document, +> streamed payload consumption, server-function calls from the client, ...) is +> not covered here; the server side of Start is covered by `benchmarks/ssr`. ## Layout @@ -39,7 +38,7 @@ scenarios/// routes/ ``` -Navigation scenario apps use file-based routing (`@tanstack/router-plugin`) with a +Scenario apps use file-based routing (`@tanstack/router-plugin`) with a generated `routeTree.gen.ts`, like a regular user app. Each scenario uses one app per framework instead of sharing routes in the baseline app. This keeps route-tree size and router options isolated so one scenario cannot shift @@ -58,11 +57,9 @@ be attributed to a specific feature area. | `control-flow` | Loader-thrown `redirect` (including a 2-hop chain), `notFound()` with `notFoundComponent`, loader errors with `errorComponent`, and boundary reset on recovery navigation. | | `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. | +| `mount` | Cold start: `createRouter` (route-tree processing) + first render + initial `router.load()` + unmount, with a fresh router per mount. The only scenario measuring router creation. | | `nested-params` | Deep nesting (8 dynamic levels): per-level `params.parse`/`stringify`, `beforeLoad` context accumulation across matches, and per-level `useParams`/`useRouteContext` subscriptions. Param values include characters requiring percent-encoding (as do `route-tree-scale`'s), so segment encode/decode paths run on every navigation. | | `preload` | Intent preloading from hover events, programmatic `router.preloadRoute`, deterministic preload cache behavior (`defaultPreloadStaleTime: 0`), and commit-time cache maintenance. | | `rewrites` | Composed client-side location rewrites: router `basepath` plus a locale input/output rewrite pair, running on every href build and location parse (the client analog of the SSR `rewrites` scenario). | @@ -71,14 +68,10 @@ be attributed to a specific feature area. ## Conventions -The hydration scenario has the separate lifecycle described below. The other -scenarios follow these navigation/mount conventions: - - Apps are built with `NODE_ENV=production` (`minify: false`) into `dist/app.js`; benches import the built bundle, so production package builds and production JSX output are measured, not dev transforms. - 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). @@ -103,7 +96,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 --mode benchmark --config ./scenarios///vite.config.ts +cd benchmarks/client-nav && NODE_ENV=production vitest bench --config ./scenarios///vite.config.ts ``` Run framework-specific flame benchmarks (10 second loop, profiled with `@platformatic/flame`, forced to `NODE_ENV=production`): @@ -122,186 +115,3 @@ Typecheck benchmark sources (baseline + scenarios): ```bash CI=1 NX_DAEMON=false pnpm nx run @benchmarks/client-nav:test:types --outputStyle=stream --skipRemoteCache ``` - -## Hydration - -`scenarios/hydration/{react,solid}` provide the same initial-hydration -workload: 192 ordinary Links, eight hash-sensitive Links, and three matched -routes with three `beforeLoad` contexts and two loader results. The server URL -has no fragment; the client URL has `#details`, matching half of the hash-sensitive Links. - -```bash -CI=1 NX_DAEMON=false pnpm nx run @benchmarks/client-nav-hydration-react:test:perf --outputStyle=stream --skipRemoteCache -CI=1 NX_DAEMON=false pnpm nx run @benchmarks/client-nav-hydration-react:test:unit --outputStyle=stream --skipRemoteCache -CI=1 NX_DAEMON=false pnpm nx run @benchmarks/client-nav-hydration-react:test:types:client --outputStyle=stream --skipRemoteCache -``` - -Replace `react` with `solid` to run the other adapter. - -The build generates static HTML and its real Router SSR bootstrap scripts once -with `createRequestHandler` and the adapter's streaming renderer. Generation -fully consumes the response and runs outside the CodSpeed action. The measured -worker only reads these artifacts; it does not import a server renderer or start a server. - -Each invocation uses a fresh jsdom window and a fresh evaluation of the complete -production client bundle in that window's realm. HTML parsing, bundle evaluation, -and the initial document lifecycle finish in untimed setup. This resets module -state as well as the DOM, avoiding cached hydration promises and cross-realm -payload objects. The bundle and bootstrap scripts are compiled once, so this -measures a fresh application with warm code, not JavaScript download/parse cost. - -The timed region executes the serialized payload, creates the router and its -small code-based route tree, calls the public client `hydrate` API, and hydrates -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. 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 - element so template fallback cannot silently replace server nodes. - -Solid bounds settlement to 100 turns. Ending at the hydration call or the -first mount would miss post-hydration Link updates. -Timer turns use `setImmediate`; scrolling is a no-op -because this is CPU simulation rather than browser layout/paint measurement. - -Untimed assertions verify restored contexts and every loader row, zero client -`beforeLoad`/loader calls, expected hrefs/active state, original DOM-node identity, -working event handlers, and absence of hydration errors. Root unmount, pending -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. - -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 -hydration optimization. Regenerate each revision's artifacts with identical -fixture data and dependencies; do not pin an old hydration wire format forever. - -## Isolated route-tree construction - -`scenarios/route-tree-scale` measures navigation over an existing tree, not -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 --reporter=json --outputFile=/tmp/route-tree-construction.json -``` - -It covers 100, 1,000, and 10,000 static, dynamic, nested, or mixed routes. -The processing-only case creates fresh route objects in an untimed -`beforeEach`, then measures `processRouteTree` and `route.init`. A separate -case includes route-object creation. Neither case measures first interpolation -or navigation. Remove the name filter to run all sizes. Compare identical -benchmark sources in separate checkouts and repeat fresh processes; a cached -router or repeatedly initialized tree is not a construction baseline. - -## Opt-in React Link performance suite - -`link-performance/` contains additional client-navigation and SSR workloads for -focused Link work. They are **not included** in the regular client-nav/SSR -aggregate projects or their CodSpeed build dependencies; they only run through -the dedicated `@benchmarks/react-link-performance` targets below. Use `-t` to -narrow a run to specific cases. - -```bash -CI=1 NX_DAEMON=false pnpm nx run @benchmarks/react-link-performance:test:perf:client --outputStyle=stream --skipRemoteCache -- --run -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" --reporter=json --outputFile=/tmp/link-perf.json -``` - -The cases cover repeated versus unique destination params, updater functions, -relative/inherited values, search middleware chains, param stringification, -optional and splat segments, encoding, masks, basepath/rewrites, and active -props with structured search. These exercise different costs: cache hits and -misses, parameter cloning, callbacks, middleware traversal, URI encoding, -building masked/public locations, active-state comparisons, and prop merging. -Existing preload, mount, and route-tree-scale scenarios remain responsible for -those separate workloads. - -- **Client:** 200 persistent measured Links, four control Links, and eight - completed navigations per timed batch. The existing client harness checks - hrefs and active state during its untimed warm-up lap. Control navigations - replace the history entry, keeping history size constant. Post-measurement - assertions also check that the measured anchors stayed mounted. -- **SSR:** four fresh-router requests per timed batch, each rendering 200 - measured Links through `RouterProvider` and `renderToString`. Router creation, - `router.load()`, rendering, and history cleanup are included. This isolates - Router SSR Link work, not Start HTTP handling, dehydration, or streaming. - HTML assertions run outside the timed batch. -- Both use the same code-based workload definitions and production JSX/library - builds. The regular Vitest entry points use at least 100 warm-up iterations, - one second of warm-up time, and five-second measurement windows. The client - and server bundles assert their resolved `isServer` environment. React and - React DOM remain external so comparisons can share the same renderer runtime. - These bundles are Node-hosted (jsdom for client mode), not browser deployments. - -Run the gate tests and typecheck separately: - -```bash -CI=1 NX_DAEMON=false pnpm nx run @benchmarks/react-link-performance:test:unit --outputStyle=stream --skipRemoteCache -CI=1 NX_DAEMON=false pnpm nx run @benchmarks/react-link-performance:test:types --outputStyle=stream --skipRemoteCache -``` - -For before/after comparisons, use identical benchmark files and dependencies -on both refs, build each ref through its Nx targets, and alternate fresh -Vitest processes. Report the actual refs, per-case means and relative margins -of error; rerun noisy or borderline results with `-t` rather than interpreting -a small difference as a proven speedup. Client and SSR times have different -batch units and should not be compared directly. - -### Stable paired comparisons - -For regression decisions, prefer the paired runner over a whole-file Vitest -run. It starts a fresh process for every case and repetition, avoiding JIT -feedback from earlier cases. Inside each process, both revisions share the -same production React installation but have separate router/app modules and -router instances. Initialization order alternates between repetitions. -Built snapshots are staged under `node_modules/.cache` so the TypeScript -harness loader does not transpile their emitted JavaScript a second time. - -```bash -# Build the baseline using these same benchmark sources in its own checkout. -# --baseline points to that checkout's link-performance/dist directory. -pnpm nx run @benchmarks/react-link-performance:test:perf:stable -- \ - --baseline /path/to/baseline/benchmarks/client-nav/link-performance/dist \ - --outputJson /tmp/paired-links.json - -# Narrow a comparison, or increase independent process repetitions. -pnpm nx run @benchmarks/react-link-performance:test:perf:stable -- \ - --baseline /path/to/baseline/benchmarks/client-nav/link-performance/dist \ - --mode ssr -t "middleware|unique-params" --repeats 6 \ - --outputJson /tmp/paired-links-ssr.json -``` - -The runner requires Node with `process.threadCpuUsage` (Node 24 works). -It fixes V8 random/hash seeds, warms each variant for at least two seconds -and 100 batches, then alternates ABBA/BAAB blocks calibrated to roughly 500 ms. -Both variants do exactly the same number of batches per block. It records -main-thread CPU time, wall time, and whole-process CPU time; GC during -measurement is not disabled or discarded. - -The default is four independent process repetitions. Reported 95% intervals -use their paired log-ratios, not the many correlated batches as independent -samples. A faster/slower verdict requires CPU and wall intervals to agree. -Intervals overlapping zero or disagreeing metrics are inconclusive; narrow -intervals entirely inside +/-2% are reported separately. - -An A/A calibration uses the current `dist` directory as `--baseline`. Its -intervals should contain zero before trusting similarly sized A/B differences. -Shared-machine contention can still make small changes unresolved. Do not -interpret a point estimate alone, or an inconclusive result, as proof that -a workload is unchanged. diff --git a/benchmarks/client-nav/link-performance/cases.ts b/benchmarks/client-nav/link-performance/cases.ts deleted file mode 100644 index a25eac563b..0000000000 --- a/benchmarks/client-nav/link-performance/cases.ts +++ /dev/null @@ -1,360 +0,0 @@ -export const LINK_CASES = [ - { - id: 'shared-params', - label: 'Shared string params', - description: '200 persistent Links reuse 40 string parameter values.', - }, - { - id: 'unique-params', - label: 'Unique string params', - description: '200 distinct parameter values exceed the 128-result cache.', - }, - { - id: 'param-updaters', - label: 'Parameter updaters', - description: 'Parameter functions derive destinations from current params.', - }, - { - id: 'location-updaters', - label: 'Search, hash and state updaters', - description: - 'Functions derive search, hash and history state from the source.', - }, - { - id: 'relative', - label: 'Relative targets', - description: 'Parent and child targets inherit current params and search.', - }, - { - id: 'middleware', - label: 'Search middleware chain', - description: - 'Retain a tenant, strip a default page and normalize a filter.', - }, - { - id: 'numeric-params', - label: 'Numeric params', - description: 'Parse numbers, update them numerically and stringify them.', - }, - { - id: 'optional-params', - label: 'Optional segments', - description: 'Set, inherit and explicitly clear an optional path segment.', - }, - { - id: 'splats', - label: 'Splat params', - description: 'Empty, multi-segment and encoded splat values.', - }, - { - id: 'encoding', - label: 'Allowed path characters', - description: 'Preserve allowed @, : and + while encoding other characters.', - }, - { - id: 'masks', - label: 'Explicit route masks', - description: - 'Build a different public path and search for each destination.', - }, - { - id: 'rewrites', - label: 'Basepath and rewrites', - description: 'Compose /app with input/output locale path rewrites.', - }, - { - id: 'active', - label: 'Active props and structured search', - description: - 'Exact, fuzzy and search matching with props and render children.', - }, -] as const - -export type LinkCaseId = (typeof LINK_CASES)[number]['id'] - -export const LINK_COUNT = 200 -export const NAVIGATION_STATES = [1, 2, 3, 0] as const -export const LOCALES = ['en', 'fr', 'de', 'es'] as const - -export interface Filter { - tag: string - flags: { open: boolean } - tags: Array -} - -export interface LinkSearch { - page?: number - tenant?: string - filter?: Filter -} - -export function sourceFilter(index: number): Filter { - return { - tag: `group-${index}`, - flags: { open: index % 2 === 0 }, - tags: ['links', `state-${index}`], - } -} - -export function sourceSearch( - caseId: LinkCaseId, - stateIndex: number, -): Partial { - switch (caseId) { - case 'location-updaters': - case 'relative': - case 'middleware': - case 'active': - return { - page: stateIndex + 1, - tenant: `tenant-${stateIndex}`, - filter: sourceFilter(stateIndex), - } - case 'rewrites': - return { tenant: LOCALES[stateIndex] } - default: - return {} - } -} - -export function optionalCategory(stateIndex: number) { - return stateIndex % 2 === 0 ? `category-${stateIndex}` : undefined -} - -export function splatValue(index: number) { - switch (index % 4) { - case 0: - return '' - case 1: - return `folder/sub/file-${index % 40}` - case 2: - return 'a b/100%/caf\u00e9?#' - default: - return 'literal%2F/\u{1f680}' - } -} - -export function encodedValue(index: number) { - return `user-${index % 40}@mail.test:tag+value /?#% caf\u00e9` -} - -function url(pathname: string, search: Partial = {}, hash = '') { - const result = new URL(pathname, 'http://localhost') - for (const [key, value] of Object.entries( - search, - )) { - if (value !== undefined) { - result.searchParams.set( - key, - typeof value === 'object' ? JSON.stringify(value) : String(value), - ) - } - } - result.hash = hash - return result.pathname + result.search + result.hash -} - -function sourcePath(caseId: LinkCaseId, stateIndex: number) { - switch (caseId) { - case 'relative': - return `/teams/team-${stateIndex}/item-${stateIndex}` - case 'numeric-params': - return `/numbers/${stateIndex}` - case 'optional-params': { - const category = optionalCategory(stateIndex) - return `/optional/${category ? `${category}/` : ''}item-${stateIndex}` - } - case 'splats': - return `/files/source/state-${stateIndex}` - case 'encoding': - return `/encoded/source-${stateIndex}` - case 'active': - return `/items/item-${stateIndex}/details` - default: - return `/items/item-${stateIndex}` - } -} - -export function getSourceUrl(caseId: LinkCaseId, stateIndex: number): string { - if (!Number.isInteger(stateIndex) || stateIndex < 0 || stateIndex > 3) { - throw new Error(`Invalid Link performance state: ${stateIndex}`) - } - const pathname = sourcePath(caseId, stateIndex) - if (caseId === 'rewrites') { - return `/app/${LOCALES[stateIndex]}${pathname}` - } - return url( - pathname, - sourceSearch(caseId, stateIndex), - caseId === 'location-updaters' ? `source-${stateIndex}` : '', - ) -} - -// These expectations use fixture values and platform encoding, not router APIs. -function expectedHref(caseId: LinkCaseId, stateIndex: number, index: number) { - const itemId = `item-${index % 40}` - switch (caseId) { - case 'shared-params': - return `/items/${itemId}` - case 'unique-params': - return `/items/item-${index}` - case 'param-updaters': - return `/items/item-${stateIndex}-related-${index % 40}` - case 'location-updaters': - return url( - `/items/item-${stateIndex}`, - { - ...sourceSearch(caseId, stateIndex), - page: stateIndex + 2 + (index % 5), - }, - `source-${stateIndex}-link-${index % 5}`, - ) - case 'relative': - return url( - index % 2 === 0 - ? `/teams/team-${stateIndex}` - : `/teams/team-${stateIndex}/item-${stateIndex}/details`, - sourceSearch(caseId, stateIndex), - ) - case 'middleware': - return url(`/filtered/${itemId}`, { - tenant: `tenant-${stateIndex}`, - page: index % 2 === 0 ? undefined : 2, - filter: { ...sourceFilter(index % 4), tag: `LABEL-${index % 40}` }, - }) - case 'numeric-params': - return `/numbers/${stateIndex + (index % 40)}` - case 'optional-params': { - const category = - index % 3 === 0 - ? 'fixed' - : index % 3 === 1 - ? optionalCategory(stateIndex) - : undefined - return `/optional/${category ? `${category}/` : ''}${itemId}` - } - case 'splats': { - const value = splatValue(index) - return `/files${value ? `/${value.split('/').map(encodeURIComponent).join('/')}` : ''}` - } - case 'encoding': { - const value = encodeURIComponent(encodedValue(index)) - .replaceAll('%40', '@') - .replaceAll('%3A', ':') - .replaceAll('%2B', '+') - return `/encoded/${value}` - } - case 'masks': - return url(`/public/display-${index % 40}`, { - tenant: `mask-${index % 4}`, - }) - case 'rewrites': - return url(`/app/${LOCALES[index % 4]}/items/${itemId}`, { - page: (index % 3) + 1, - }) - case 'active': { - const item = Math.floor(index / 5) - const variant = index % 5 - const search = - variant < 3 - ? { filter: sourceFilter(item % 4) } - : { - ...sourceSearch('active', item % 4), - ...(variant === 4 ? { filter: undefined } : {}), - } - return url(`/items/item-${item}${variant < 2 ? '' : '/details'}`, search) - } - } -} - -function assertUrl( - actualHref: string | null, - expectedHref: string, - label: string, -) { - if (actualHref === null) { - throw new Error(`${label}: missing href`) - } - const actual = new URL(actualHref, 'http://localhost') - const expected = new URL(expectedHref, 'http://localhost') - // Query ordering and the platform's '+' versus '%20' are immaterial here. - const query = (value: URL) => - JSON.stringify([...value.searchParams.entries()].sort()) - if ( - actual.origin !== expected.origin || - actual.pathname !== expected.pathname || - actual.hash !== expected.hash || - query(actual) !== query(expected) - ) { - throw new Error( - `${label}: expected ${expectedHref}, received ${actualHref}`, - ) - } -} - -export function assertScenario( - caseId: LinkCaseId, - stateIndex: number, - root: ParentNode, -): void { - const source = root.querySelector('[data-testid="source-path"]') - if (source?.textContent !== sourcePath(caseId, stateIndex)) { - throw new Error( - `${caseId}/${stateIndex}: unexpected source path ${source?.textContent}`, - ) - } - const links = root.querySelectorAll('a[data-perf-link]') - if (links.length !== LINK_COUNT) { - throw new Error( - `${caseId}: expected ${LINK_COUNT} Links, got ${links.length}`, - ) - } - for (const [index, link] of links.entries()) { - const label = `${caseId}/${stateIndex}/link-${index}` - if (link.getAttribute('data-perf-link') !== String(index)) { - throw new Error(`${label}: unexpected Link order`) - } - assertUrl( - link.getAttribute('href'), - expectedHref(caseId, stateIndex, index), - label, - ) - let active: boolean | undefined - if (caseId === 'shared-params') { - active = index % 40 === stateIndex - } else if (caseId === 'unique-params') { - active = index === stateIndex - } else if (caseId === 'active') { - active = - Math.floor(index / 5) === stateIndex && [0, 2, 3].includes(index % 5) - if ( - link.textContent !== `${index}:${active ? 'active' : 'inactive'}` || - link.getAttribute('title') !== (active ? 'active' : 'inactive') || - !link.classList.contains(active ? 'perf-active' : 'perf-inactive') || - link.style.color !== (active ? 'green' : 'gray') || - link.style.opacity !== '0.8' - ) { - throw new Error( - `${label}: active props or render children are incorrect`, - ) - } - } - if ( - active !== undefined && - (link.getAttribute('data-status') === 'active') !== active - ) { - throw new Error(`${label}: expected active=${active}`) - } - } - for (let state = 0; state < 4; state++) { - const control = root.querySelector(`[data-testid="go-state-${state}"]`) - if (!control || control.hasAttribute('data-perf-link')) { - throw new Error(`${caseId}: missing or measured control Link ${state}`) - } - assertUrl( - control.getAttribute('href'), - getSourceUrl(caseId, state), - `${caseId}/control-${state}`, - ) - } -} diff --git a/benchmarks/client-nav/link-performance/client.bench.ts b/benchmarks/client-nav/link-performance/client.bench.ts deleted file mode 100644 index f819fab52b..0000000000 --- a/benchmarks/client-nav/link-performance/client.bench.ts +++ /dev/null @@ -1,30 +0,0 @@ -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' - -const appModulePath = './dist/client/app.js' -const app: typeof App = await import(/* @vite-ignore */ appModulePath) -if (app.serverEnvironment !== false) { - throw new Error('Link client benchmarks must use the production client build') -} - -for (const { id, label } of LINK_CASES) { - test(label, async ({ bench }) => { - const scenario = createClientScenario(app, id) - function finish() { - try { - scenario.check() - } finally { - scenario.teardown() - } - } - - await bench( - `client Links: ${id}`, - benchLifecycle({ before: scenario.setup, after: finish }), - scenario.batch, - ).run(samplingOptions) - }) -} diff --git a/benchmarks/client-nav/link-performance/config.test.ts b/benchmarks/client-nav/link-performance/config.test.ts deleted file mode 100644 index 1a468a3169..0000000000 --- a/benchmarks/client-nav/link-performance/config.test.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { afterEach, describe, expect, test, vi } from 'vitest' -import { createLinkPerformanceConfig } from './config' - -afterEach(() => vi.unstubAllEnvs()) - -describe.each(['client', 'ssr'] as const)('%s configuration', (target) => { - test('discovers only the requested suite', () => { - const config = createLinkPerformanceConfig(target) - expect(config.test?.benchmark?.include).toEqual([`${target}.bench.ts`]) - }) - - test('builds production code for the correct environment', () => { - const config = createLinkPerformanceConfig(target) - expect(config.define?.['process.env.NODE_ENV']).toBe('"production"') - expect(config.resolve?.conditions).toContain( - target === 'ssr' ? 'node' : 'browser', - ) - expect(config.build?.ssr).toBe(target === 'ssr') - expect(config.build?.outDir).toBe(`./dist/${target}`) - expect(config.build?.rolldownOptions?.platform).toBe('node') - expect(config.build?.rolldownOptions?.external).toEqual([ - 'node:module', - 'module', - /^react(?:\/|$)/, - /^react-dom(?:\/|$)/, - ]) - }) - - test('does not retransform built bundles in the test environment', () => { - vi.stubEnv('VITEST', 'true') - const config = createLinkPerformanceConfig(target) - expect(config.ssr?.noExternal).toBeUndefined() - expect(config.test?.server?.deps?.external).toEqual([ - /\/link-performance\/dist\//, - ]) - }) - - test('bundles router dependencies when building app snapshots', () => { - vi.stubEnv('VITEST', undefined) - expect(createLinkPerformanceConfig(target).ssr?.noExternal).toBe(true) - }) -}) diff --git a/benchmarks/client-nav/link-performance/config.ts b/benchmarks/client-nav/link-performance/config.ts deleted file mode 100644 index 416b027057..0000000000 --- a/benchmarks/client-nav/link-performance/config.ts +++ /dev/null @@ -1,69 +0,0 @@ -import { fileURLToPath } from 'node:url' -import react from '@vitejs/plugin-react' -import codspeedPlugin from '@codspeed/vitest-plugin' -import type { UserConfig } from 'vite' - -const root = fileURLToPath(new URL('.', import.meta.url)) - -export function createLinkPerformanceConfig( - target: 'client' | 'ssr', -): UserConfig { - const server = target === 'ssr' - - return { - root, - define: { - 'process.env.NODE_ENV': JSON.stringify('production'), - }, - plugins: [ - !!(process.env.VITEST && process.env.WITH_INSTRUMENTATION) && - codspeedPlugin(), - react(), - ], - resolve: { - conditions: [server ? 'node' : 'browser', 'production'], - }, - ssr: { - noExternal: process.env.VITEST ? undefined : true, - resolve: { - conditions: ['node', 'production'], - }, - }, - build: { - outDir: `./dist/${target}`, - emptyOutDir: true, - minify: false, - ssr: server, - lib: { - entry: `${root}src/${target}.tsx`, - formats: ['es'], - fileName: 'app', - }, - rolldownOptions: { - platform: 'node', - external: [ - 'node:module', - 'module', - /^react(?:\/|$)/, - /^react-dom(?:\/|$)/, - ], - output: { entryFileNames: 'app.js' }, - }, - }, - test: { - name: `react-link-performance-${target}`, - watch: false, - environment: server ? 'node' : 'jsdom', - setupFiles: server ? [] : ['../vitest.setup.ts'], - server: { - deps: { - external: [/\/link-performance\/dist\//], - }, - }, - include: [], - benchmark: { - include: [`${target}.bench.ts`], - }, - }, - } -} diff --git a/benchmarks/client-nav/link-performance/project.json b/benchmarks/client-nav/link-performance/project.json deleted file mode 100644 index fd1751c081..0000000000 --- a/benchmarks/client-nav/link-performance/project.json +++ /dev/null @@ -1,103 +0,0 @@ -{ - "name": "@benchmarks/react-link-performance", - "projectType": "application", - "tags": ["optional-benchmark"], - "targets": { - "build:client": { - "executor": "nx:run-commands", - "cache": false, - "dependsOn": [ - { - "projects": ["@tanstack/react-router"], - "target": "build" - } - ], - "options": { - "command": "NODE_ENV=production vite build --config ./link-performance/vite.client.config.ts", - "cwd": "benchmarks/client-nav" - } - }, - "build:ssr": { - "executor": "nx:run-commands", - "cache": false, - "dependsOn": [ - { - "projects": ["@tanstack/react-router"], - "target": "build" - } - ], - "options": { - "command": "NODE_ENV=production vite build --config ./link-performance/vite.ssr.config.ts", - "cwd": "benchmarks/client-nav" - } - }, - "test:perf:client": { - "executor": "nx:run-commands", - "cache": false, - "dependsOn": ["build:client"], - "options": { - "command": "NODE_ENV=production vitest bench --mode benchmark --config ./link-performance/vite.client.config.ts", - "cwd": "benchmarks/client-nav" - } - }, - "test:perf:ssr": { - "executor": "nx:run-commands", - "cache": false, - "dependsOn": ["build:ssr"], - "options": { - "command": "NODE_ENV=production vitest bench --mode benchmark --config ./link-performance/vite.ssr.config.ts", - "cwd": "benchmarks/client-nav" - } - }, - "test:perf:stable": { - "executor": "nx:run-commands", - "cache": false, - "dependsOn": ["build:client", "build:ssr"], - "options": { - "command": "NODE_ENV=production node --import=@swc-node/register/esm-register benchmarks/client-nav/link-performance/stable-runner.ts" - } - }, - "test:unit": { - "executor": "nx:run-commands", - "inputs": [ - "...", - "{workspaceRoot}/benchmarks/client-nav/scenarios/harness.ts", - "{workspaceRoot}/benchmarks/client-nav/scenarios/links/shared.ts", - "{workspaceRoot}/benchmarks/client-nav/setup-helpers.ts", - "{workspaceRoot}/benchmarks/client-nav/tsconfig.json" - ], - "dependsOn": [ - { - "projects": ["@tanstack/history"], - "target": "build" - } - ], - "options": { - "command": "vitest run --config ./link-performance/vitest.config.ts", - "cwd": "benchmarks/client-nav" - } - }, - "test:types": { - "executor": "nx:run-commands", - "inputs": [ - "...", - "{workspaceRoot}/benchmarks/client-nav/jsdom.ts", - "{workspaceRoot}/benchmarks/client-nav/scenarios/harness.ts", - "{workspaceRoot}/benchmarks/client-nav/scenarios/links/shared.ts", - "{workspaceRoot}/benchmarks/client-nav/setup-helpers.ts", - "{workspaceRoot}/benchmarks/client-nav/tsconfig.json", - "{workspaceRoot}/benchmarks/client-nav/vitest.setup.ts" - ], - "dependsOn": [ - { - "projects": ["@tanstack/react-router"], - "target": "build" - } - ], - "options": { - "command": "tsc -p ./link-performance/tsconfig.json --noEmit", - "cwd": "benchmarks/client-nav" - } - } - } -} diff --git a/benchmarks/client-nav/link-performance/scenario.ts b/benchmarks/client-nav/link-performance/scenario.ts deleted file mode 100644 index f1a3fb6df7..0000000000 --- a/benchmarks/client-nav/link-performance/scenario.ts +++ /dev/null @@ -1,114 +0,0 @@ -import { JSDOM } from 'jsdom' -import { createScenarioSetup } from '../scenarios/harness' -import { ticksPerIteration } from '../scenarios/links/shared' -import { NAVIGATION_STATES, assertScenario, getSourceUrl } from './cases' -import type { LinkCaseId } from './cases' -import type * as ClientApp from './src/client' -import type * as SsrApp from './src/ssr' - -export interface LinkScenario { - setup: () => Promise - batch: () => Promise - check: () => void - teardown: () => void -} - -export const samplingOptions = { - warmupIterations: 100, - warmupTime: 1_000, - time: 5_000, - throws: true, -} - -export function createClientScenario( - app: typeof ClientApp, - id: LinkCaseId, -): LinkScenario { - let mounted: ReturnType | undefined - let container: HTMLElement | undefined - let anchors: Array = [] - const test = createScenarioSetup({ - frameworkLabel: 'React', - mount: (element, history) => { - container = element - mounted = app.mountTestApp(element, history, id) - return mounted - }, - initialUrl: getSourceUrl(id, 0), - steps: NAVIGATION_STATES.map((state) => `go-state-${state}`), - assertAfterStep: (index, element) => { - assertScenario(id, NAVIGATION_STATES[index]!, element) - if (!mounted) { - throw new Error('Link benchmark app was not mounted') - } - mounted.assertStateUpdates() - }, - }) - - return { - async setup() { - await test.before() - if (!container) { - throw new Error('Link benchmark container was not created') - } - anchors = [...container.querySelectorAll('a[data-perf-link]')] - }, - async batch() { - for (let index = 0; index < ticksPerIteration; index++) { - await test.tick() - } - await test.finishBatch() - }, - check() { - if (!container || !mounted) { - throw new Error('Link benchmark app was not mounted') - } - assertScenario(id, 0, container) - mounted.assertStateUpdates() - if (mounted.router.history.length !== 1) { - throw new Error('Link benchmark history must remain bounded') - } - const current = container.querySelectorAll('a[data-perf-link]') - if (anchors.some((anchor, index) => current[index] !== anchor)) { - throw new Error('Measured Links must stay mounted across navigations') - } - }, - teardown: test.after, - } -} - -export function createSsrScenario( - app: typeof SsrApp, - id: LinkCaseId, -): LinkScenario { - let html = '' - let state = 0 - function check() { - const dom = new JSDOM(html) - try { - assertScenario(id, state, dom.window.document) - } finally { - dom.window.close() - } - } - - return { - async setup() { - for (const nextState of NAVIGATION_STATES) { - state = nextState - html = await app.renderScenario(id, state, true) - check() - } - }, - async batch() { - for (const nextState of NAVIGATION_STATES) { - state = nextState - html = await app.renderScenario(id, state) - } - }, - check, - teardown() { - html = '' - }, - } -} diff --git a/benchmarks/client-nav/link-performance/src/client.tsx b/benchmarks/client-nav/link-performance/src/client.tsx deleted file mode 100644 index a187ee8c15..0000000000 --- a/benchmarks/client-nav/link-performance/src/client.tsx +++ /dev/null @@ -1,29 +0,0 @@ -import { RouterProvider } from '@tanstack/react-router' -import { isServer } from '@tanstack/router-core/isServer' -import { createRoot } from 'react-dom/client' -import { assertStateUpdates, createLinkRouter } from './workload' -import type { LinkRouter } from './workload' -import type { RouterHistory } from '@tanstack/history' -import type { LinkCaseId } from '../cases' - -export const serverEnvironment: boolean | undefined = isServer - -export function mountTestApp( - container: HTMLElement, - history: RouterHistory, - caseId: LinkCaseId, -): { - router: LinkRouter - unmount: () => void - assertStateUpdates: () => void -} { - const router = createLinkRouter(caseId, history, false) - const root = createRoot(container) - root.render() - - return { - router, - unmount: () => root.unmount(), - assertStateUpdates: () => assertStateUpdates(router), - } -} diff --git a/benchmarks/client-nav/link-performance/src/ssr.tsx b/benchmarks/client-nav/link-performance/src/ssr.tsx deleted file mode 100644 index 491191b1f9..0000000000 --- a/benchmarks/client-nav/link-performance/src/ssr.tsx +++ /dev/null @@ -1,29 +0,0 @@ -import { RouterProvider, createMemoryHistory } from '@tanstack/react-router' -import { isServer } from '@tanstack/router-core/isServer' -import { renderToString } from 'react-dom/server' -import { getSourceUrl } from '../cases' -import { assertStateUpdates, createLinkRouter } from './workload' -import type { LinkCaseId } from '../cases' - -export const serverEnvironment: boolean | undefined = isServer - -export async function renderScenario( - caseId: LinkCaseId, - stateIndex: number, - verify = false, -) { - const history = createMemoryHistory({ - initialEntries: [getSourceUrl(caseId, stateIndex)], - }) - const router = createLinkRouter(caseId, history, true) - try { - await router.load() - const html = renderToString() - if (verify) { - assertStateUpdates(router) - } - return html - } finally { - history.destroy() - } -} diff --git a/benchmarks/client-nav/link-performance/src/workload.tsx b/benchmarks/client-nav/link-performance/src/workload.tsx deleted file mode 100644 index 8315b85b8b..0000000000 --- a/benchmarks/client-nav/link-performance/src/workload.tsx +++ /dev/null @@ -1,506 +0,0 @@ -import { - Link, - Outlet, - createRootRouteWithContext, - createRoute, - createRouter, - linkOptions, - retainSearchParams, - stripSearchParams, - useLocation, -} from '@tanstack/react-router' -import { - LINK_COUNT, - LOCALES, - encodedValue, - optionalCategory, - sourceFilter, - sourceSearch, - splatValue, -} from '../cases' -import type { RouterHistory } from '@tanstack/history' -import type { SearchSchemaInput } from '@tanstack/react-router' -import type { Filter, LinkCaseId, LinkSearch } from '../cases' - -interface StateUpdates { - calls: number - verifiedCalls: number - input: number - output: number - offset: number -} - -interface WorkloadContext { - caseId: LinkCaseId - stateUpdates: StateUpdates -} - -function isFilter(value: unknown): value is Filter { - return ( - typeof value === 'object' && - value !== null && - 'tag' in value && - typeof value.tag === 'string' && - 'flags' in value && - typeof value.flags === 'object' && - value.flags !== null && - 'open' in value.flags && - typeof value.flags.open === 'boolean' && - 'tags' in value && - Array.isArray(value.tags) && - value.tags.every((tag: unknown) => typeof tag === 'string') - ) -} - -const rootRoute = createRootRouteWithContext()({ - validateSearch: ( - search: Record & SearchSchemaInput, - ): LinkSearch => ({ - page: typeof search.page === 'number' ? search.page : undefined, - tenant: typeof search.tenant === 'string' ? search.tenant : undefined, - filter: isFilter(search.filter) ? search.filter : undefined, - }), - component: RootLayout, -}) - -const itemsRoute = createRoute({ - getParentRoute: () => rootRoute, - path: 'items/$itemId', -}) -const detailsRoute = createRoute({ - getParentRoute: () => itemsRoute, - path: 'details', -}) -const teamRoute = createRoute({ - getParentRoute: () => rootRoute, - path: 'teams/$teamId', -}) -const teamItemRoute = createRoute({ - getParentRoute: () => teamRoute, - path: '$itemId', -}) -const teamDetailsRoute = createRoute({ - getParentRoute: () => teamItemRoute, - path: 'details', -}) -const filteredRoute = createRoute({ - getParentRoute: () => rootRoute, - path: 'filtered/$itemId', - search: { - middlewares: [ - retainSearchParams(['tenant']), - stripSearchParams({ page: 1 }), - ({ search, next }) => { - const result = next(search) - return { - ...result, - filter: result.filter - ? { ...result.filter, tag: result.filter.tag.trim().toUpperCase() } - : undefined, - } - }, - ], - }, -}) -const numericRoute = createRoute({ - getParentRoute: () => rootRoute, - path: 'numbers/$number', - params: { - parse: ({ number }) => { - const value = Number(number) - if (!Number.isFinite(value)) { - throw new Error(`Invalid number: ${number}`) - } - return { number: value } - }, - stringify: ({ number }) => ({ number: String(number) }), - }, -}) -const optionalRoute = createRoute({ - getParentRoute: () => rootRoute, - path: 'optional/{-$category}/$itemId', -}) -const splatRoute = createRoute({ - getParentRoute: () => rootRoute, - path: 'files/$', -}) -const encodedRoute = createRoute({ - getParentRoute: () => rootRoute, - path: 'encoded/$value', -}) -const publicRoute = createRoute({ - getParentRoute: () => rootRoute, - path: 'public/$itemId', -}) - -const routeTree = rootRoute.addChildren([ - itemsRoute.addChildren([detailsRoute]), - teamRoute.addChildren([teamItemRoute.addChildren([teamDetailsRoute])]), - filteredRoute, - numericRoute, - optionalRoute, - splatRoute, - encodedRoute, - publicRoute, -]) - -const localeRewrite = { - input: ({ url }: { url: URL }) => { - const match = /^\/(en|fr|de|es)(\/.*)$/.exec(url.pathname) - if (match) { - url.pathname = match[2]! - url.searchParams.set('tenant', match[1]!) - } - return url - }, - output: ({ url }: { url: URL }) => { - const locale = url.searchParams.get('tenant') - if (locale) { - url.searchParams.delete('tenant') - url.pathname = `/${locale}${url.pathname}` - } - return url - }, -} - -export function createLinkRouter( - caseId: LinkCaseId, - history: RouterHistory, - isServer: boolean, -) { - const context: WorkloadContext = { - caseId, - stateUpdates: { - calls: 0, - verifiedCalls: 0, - input: 0, - output: 0, - offset: 0, - }, - } - return createRouter({ - routeTree, - history, - isServer, - context, - scrollRestoration: false, - defaultPreload: false, - trailingSlash: 'never', - pathParamsAllowedCharacters: - caseId === 'encoding' ? ['@', ':', '+'] : undefined, - ...(caseId === 'rewrites' - ? { basepath: '/app', rewrite: localeRewrite } - : {}), - }) -} - -export type LinkRouter = ReturnType - -declare module '@tanstack/react-router' { - interface Register { - router: LinkRouter - } -} - -declare module '@tanstack/history' { - interface HistoryState { - linkPerfState?: number - } -} - -// Call alongside DOM assertions, outside the timed loop, after each sample. -export function assertStateUpdates(router: LinkRouter): void { - const { caseId, stateUpdates } = router.options.context - if (caseId !== 'location-updaters') { - return - } - const input = router.state.location.state.linkPerfState ?? 0 - if ( - stateUpdates.calls - stateUpdates.verifiedCalls < LINK_COUNT || - stateUpdates.input !== input || - stateUpdates.output !== input + stateUpdates.offset || - stateUpdates.offset < 1 || - stateUpdates.offset > 40 - ) { - throw new Error( - 'Link history-state updaters did not run with current state', - ) - } - stateUpdates.verifiedCalls = stateUpdates.calls -} - -function sourceOptions(caseId: LinkCaseId, stateIndex: number) { - const itemId = `item-${stateIndex}` - const common = { - search: sourceSearch(caseId, stateIndex), - hash: caseId === 'location-updaters' ? `source-${stateIndex}` : '', - state: { linkPerfState: stateIndex + 10 }, - } - switch (caseId) { - case 'relative': - return linkOptions({ - ...common, - to: '/teams/$teamId/$itemId', - params: { teamId: `team-${stateIndex}`, itemId }, - }) - case 'numeric-params': - return linkOptions({ - ...common, - to: '/numbers/$number', - params: { number: stateIndex }, - }) - case 'optional-params': - return linkOptions({ - ...common, - to: '/optional/{-$category}/$itemId', - params: { category: optionalCategory(stateIndex), itemId }, - }) - case 'splats': - return linkOptions({ - ...common, - to: '/files/$', - params: { _splat: `source/state-${stateIndex}` }, - }) - case 'encoding': - return linkOptions({ - ...common, - to: '/encoded/$value', - params: { value: `source-${stateIndex}` }, - }) - case 'active': - return linkOptions({ - ...common, - to: '/items/$itemId/details', - params: { itemId }, - }) - default: - return linkOptions({ - ...common, - to: '/items/$itemId', - params: { itemId }, - }) - } -} - -const indexes = Array.from({ length: LINK_COUNT }, (_, index) => index) -const controls = [0, 1, 2, 3] as const - -function SourcePath() { - const pathname = useLocation({ select: (location) => location.pathname }) - return {pathname} -} - -function RootLayout() { - const context = rootRoute.useRouteContext() - return ( - <> - - -
- {indexes.map((index) => measuredLink(context, index))} -
- - - ) -} - -function measuredLink( - { caseId, stateUpdates }: WorkloadContext, - index: number, -) { - const common = { - key: index, - 'data-perf-link': index, - preload: false, - children: `Link ${index}`, - } as const - const itemId = `item-${index % 40}` - switch (caseId) { - case 'shared-params': - case 'unique-params': - return ( - - ) - case 'param-updaters': - return ( - ({ - itemId: `${previous.itemId}-related-${index % 40}`, - })} - /> - ) - case 'location-updaters': - return ( - ({ - ...previous, - page: (previous.page ?? 1) + 1 + (index % 5), - })} - hash={(previous) => `${previous}-link-${index % 5}`} - state={(previous) => { - const input = previous.linkPerfState ?? 0 - const offset = (index % 40) + 1 - const output = input + offset - stateUpdates.calls++ - stateUpdates.input = input - stateUpdates.output = output - stateUpdates.offset = offset - return { ...previous, linkPerfState: output } - }} - /> - ) - case 'relative': - return ( - - ) - case 'middleware': - return ( - - ) - case 'numeric-params': - return ( - ({ number: previous.number + (index % 40) })} - /> - ) - case 'optional-params': - return ( - - ) - case 'splats': - return ( - - ) - case 'encoding': - return ( - - ) - case 'masks': - return ( - - ) - case 'rewrites': - return ( - - ) - case 'active': { - const item = Math.floor(index / 5) - const variant = index % 5 - return ( - ({ - className: 'perf-active', - title: 'active', - style: { color: 'green' }, - })} - inactiveProps={() => ({ - className: 'perf-inactive', - title: 'inactive', - style: { color: 'gray' }, - })} - > - {({ isActive }) => `${index}:${isActive ? 'active' : 'inactive'}`} - - ) - } - } -} diff --git a/benchmarks/client-nav/link-performance/ssr.bench.ts b/benchmarks/client-nav/link-performance/ssr.bench.ts deleted file mode 100644 index c30084e510..0000000000 --- a/benchmarks/client-nav/link-performance/ssr.bench.ts +++ /dev/null @@ -1,30 +0,0 @@ -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' - -const appUrl = new URL('./dist/ssr/app.js', import.meta.url).href -const app: typeof App = await import(/* @vite-ignore */ appUrl) -if (app.serverEnvironment !== true) { - throw new Error('Link SSR benchmarks must use the production server build') -} - -for (const { id, label } of LINK_CASES) { - test(label, async ({ bench }) => { - const scenario = createSsrScenario(app, id) - function finish() { - try { - scenario.check() - } finally { - scenario.teardown() - } - } - - await bench( - `SSR Links: ${id}`, - benchLifecycle({ before: scenario.setup, after: finish }), - scenario.batch, - ).run(samplingOptions) - }) -} diff --git a/benchmarks/client-nav/link-performance/stable-runner.ts b/benchmarks/client-nav/link-performance/stable-runner.ts deleted file mode 100644 index 59ccfa3cb4..0000000000 --- a/benchmarks/client-nav/link-performance/stable-runner.ts +++ /dev/null @@ -1,269 +0,0 @@ -import { fork } from 'node:child_process' -import { createHash } from 'node:crypto' -import { - copyFileSync, - mkdirSync, - readFileSync, - rmSync, - writeFileSync, -} from 'node:fs' -import { dirname, resolve } from 'node:path' -import { fileURLToPath } from 'node:url' -import { parseArgs } from 'node:util' -import { LINK_CASES } from './cases' -import { createStagingDirectory } from './staging' -import { classify, mean, summarizeRatios } from './statistics' -import type { LinkCaseId } from './cases' -import type { - BlockSample, - Mode, - Variant, - WorkerRequest, - WorkerResponse, -} from './worker-protocol' - -const projectRoot = fileURLToPath(new URL('.', import.meta.url)) -const workspaceRoot = resolve(projectRoot, '../../..') - -function startWorker() { - const child = fork( - fileURLToPath(new URL('./stable-worker.ts', import.meta.url)), - { - cwd: workspaceRoot, - env: { ...process.env, NODE_ENV: 'production' }, - execArgv: [ - '--import=@swc-node/register/esm-register', - '--random-seed=42', - '--hash-seed=42', - ], - stdio: ['ignore', 'ignore', 'pipe', 'ipc'], - }, - ) - let stderr = '' - child.stderr?.on('data', (data: Buffer) => { - stderr = (stderr + data.toString()).slice(-4_096) - }) - - function request(message: WorkerRequest): Promise { - return new Promise((resolveResponse, reject) => { - const timeout = setTimeout(() => { - finish( - new Error(`Sampling worker timed out: ${message.kind}\n${stderr}`), - ) - }, 60_000) - const onExit = (code: number | null) => - finish(new Error(`Sampling worker exited (${code})\n${stderr}`)) - const onError = (error: Error) => finish(error) - const onMessage = (response: WorkerResponse) => { - if (response.kind === 'error') { - finish(new Error(response.message)) - } else { - finish(undefined, response) - } - } - function finish(error?: Error, response?: WorkerResponse) { - clearTimeout(timeout) - child.off('message', onMessage) - child.off('error', onError) - child.off('exit', onExit) - if (error) { - reject(error) - } else if (response) { - resolveResponse(response) - } - } - child.once('message', onMessage) - child.once('error', onError) - child.once('exit', onExit) - child.send(message, (error) => { - if (error) { - finish(error) - } - }) - }) - } - - return { - request, - kill: () => child.kill(), - } -} - -async function sampleReplica( - mode: Mode, - caseId: LinkCaseId, - baseline: string, - current: string, - replica: number, -) { - const worker = startWorker() - const samples: Array> = [[], []] - const ratios: Array<{ cpu: number; wall: number }> = [] - try { - const starts: Array = [] - // Balance module initialization and which variant finishes warming last. - const startupOrder: Array = replica % 2 ? [1, 0] : [0, 1] - for (const index of startupOrder) { - const ready = await worker.request({ - kind: 'init', - mode, - caseId, - bundle: index === 0 ? baseline : current, - variant: index, - }) - if (ready.kind !== 'ready') { - throw new Error('Expected a ready sampling worker') - } - starts[index] = ready.batchMs - } - const iterations = Math.max(1, Math.ceil(500 / Math.min(...starts))) - for (let round = 0; round < 2; round++) { - const block: Array> = [[], []] - const order: Array = - (round + replica) % 2 ? [1, 0, 0, 1] : [0, 1, 1, 0] - for (const index of order) { - const result = await worker.request({ - kind: 'measure', - iterations, - variant: index, - }) - if (result.kind !== 'sample') { - throw new Error('Expected a block measurement') - } - samples[index]!.push(result.sample) - block[index]!.push(result.sample) - } - ratios.push({ - cpu: - mean(block[1]!.map((s) => s.cpuMs)) / - mean(block[0]!.map((s) => s.cpuMs)), - wall: - mean(block[1]!.map((s) => s.wallMs)) / - mean(block[0]!.map((s) => s.wallMs)), - }) - } - const response = await worker.request({ kind: 'stop' }) - if (response.kind !== 'stopped') { - throw new Error('Expected successful post-measurement assertions') - } - return { - iterations, - baseline: samples[0]!, - current: samples[1]!, - cpuRatio: Math.exp(mean(ratios.map((r) => Math.log(r.cpu)))), - wallRatio: Math.exp(mean(ratios.map((r) => Math.log(r.wall)))), - } - } finally { - worker.kill() - } -} - -async function main() { - const { values } = parseArgs({ - options: { - baseline: { type: 'string' }, - current: { type: 'string', default: resolve(projectRoot, 'dist') }, - mode: { type: 'string', default: 'all' }, - repeats: { type: 'string', default: '4' }, - outputJson: { type: 'string' }, - testNamePattern: { type: 'string', short: 't' }, - }, - }) - if (!values.baseline || !values.outputJson) { - throw new Error( - 'Specify --baseline and --outputJson ', - ) - } - const repeats = Number(values.repeats) - if (!Number.isInteger(repeats) || repeats < 3 || repeats > 11) { - throw new Error('--repeats must be an integer between 3 and 11') - } - if (!['all', 'client', 'ssr'].includes(values.mode)) { - throw new Error('--mode must be all, client, or ssr') - } - const modes: Array = - values.mode === 'all' - ? ['client', 'ssr'] - : values.mode === 'client' - ? ['client'] - : ['ssr'] - const pattern = values.testNamePattern - ? new RegExp(values.testNamePattern) - : undefined - const cases = LINK_CASES.filter( - (c) => !pattern || pattern.test(`${c.label} ${c.id}`), - ) - if (!cases.length) { - throw new Error('No Link workloads match the requested pattern') - } - const report: { - protocol: string - node: string - complete: boolean - results: Array<{ - mode: Mode - caseId: LinkCaseId - baselineSha256: string - currentSha256: string - replicas: Array>> - cpu: ReturnType - wall: ReturnType - verdict: ReturnType - }> - } = { - protocol: - 'fresh process per case/replica; shared React runtime; separately loaded router variants; 2 ABBA/BAAB rounds; ~500ms calibrated fixed-work blocks; >=2s/100 batches warmup; main-thread CPU and wall time; fixed V8 random/hash seeds', - node: process.version, - complete: false, - results: [], - } - const output = resolve(values.outputJson) - mkdirSync(dirname(output), { recursive: true }) - const staging = createStagingDirectory() - try { - for (const mode of modes) { - const baselineInput = resolve(values.baseline, mode, 'app.js') - const currentInput = resolve(values.current, mode, 'app.js') - // Both snapshots resolve React from the same package installation. - const baseline = resolve(staging, `baseline-${mode}.mjs`) - const current = resolve(staging, `current-${mode}.mjs`) - copyFileSync(baselineInput, baseline) - copyFileSync(currentInput, current) - const digest = (file: string) => - createHash('sha256').update(readFileSync(file)).digest('hex') - const baselineSha256 = digest(baseline) - const currentSha256 = digest(current) - for (const { id } of cases) { - const replicas = [] - for (let replica = 0; replica < repeats; replica++) { - replicas.push( - await sampleReplica(mode, id, baseline, current, replica), - ) - } - const cpu = summarizeRatios(replicas.map((r) => r.cpuRatio)) - const wall = summarizeRatios(replicas.map((r) => r.wallRatio)) - const verdict = classify(cpu, wall) - report.results.push({ - mode, - caseId: id, - baselineSha256, - currentSha256, - replicas, - cpu, - wall, - verdict, - }) - writeFileSync(output, JSON.stringify(report, null, 2)) - console.log( - `${mode} ${id}: CPU ${cpu.changePercent.toFixed(2)}% [${cpu.low95.toFixed(2)}, ${cpu.high95.toFixed(2)}], wall ${wall.changePercent.toFixed(2)}% [${wall.low95.toFixed(2)}, ${wall.high95.toFixed(2)}] ${verdict}`, - ) - } - } - report.complete = true - writeFileSync(output, JSON.stringify(report, null, 2)) - } finally { - rmSync(staging, { recursive: true }) - } -} - -await main() diff --git a/benchmarks/client-nav/link-performance/stable-worker.test.ts b/benchmarks/client-nav/link-performance/stable-worker.test.ts deleted file mode 100644 index 087b32414a..0000000000 --- a/benchmarks/client-nav/link-performance/stable-worker.test.ts +++ /dev/null @@ -1,60 +0,0 @@ -import { fork } from 'node:child_process' -import { rmdirSync, unlinkSync, writeFileSync } from 'node:fs' -import { join } from 'node:path' -import { fileURLToPath } from 'node:url' -import { expect, test } from 'vitest' -import { createStagingDirectory } from './staging' -import type { WorkerResponse } from './worker-protocol' - -test('loads emitted JavaScript without retranspiling it through SWC', async () => { - const directory = createStagingDirectory() - const bundle = join(directory, 'app.mjs') - const definition = 'function untouched ( ) { return 1 }' - writeFileSync( - bundle, - `${definition}\nawait Promise.resolve()\nthrow new Error(untouched.toString())`, - ) - const worker = fork( - fileURLToPath(new URL('./stable-worker.ts', import.meta.url)), - { - cwd: fileURLToPath(new URL('../../../', import.meta.url)), - execArgv: ['--import=@swc-node/register/esm-register'], - env: { ...process.env, NODE_ENV: 'production' }, - stdio: ['ignore', 'ignore', 'pipe', 'ipc'], - }, - ) - let stderr = '' - worker.stderr?.on('data', (data: Buffer) => { - stderr += data.toString() - }) - let timeout: ReturnType | undefined - try { - const result = new Promise((resolve, reject) => { - worker.once('message', (message: WorkerResponse) => resolve(message)) - worker.once('error', reject) - worker.once('exit', (code) => { - reject(new Error(`Worker exited (${code}): ${stderr}`)) - }) - timeout = setTimeout(() => { - reject(new Error(`Worker timed out: ${stderr}`)) - }, 5_000) - }) - worker.send({ - kind: 'init', - mode: 'ssr', - caseId: 'shared-params', - bundle, - variant: 0, - }) - const response = await result - expect(response.kind).toBe('error') - if (response.kind === 'error') { - expect(response.message).toContain(`Error: ${definition}`) - } - } finally { - clearTimeout(timeout) - worker.kill() - unlinkSync(bundle) - rmdirSync(directory) - } -}) diff --git a/benchmarks/client-nav/link-performance/stable-worker.ts b/benchmarks/client-nav/link-performance/stable-worker.ts deleted file mode 100644 index d98679dc15..0000000000 --- a/benchmarks/client-nav/link-performance/stable-worker.ts +++ /dev/null @@ -1,112 +0,0 @@ -import { pathToFileURL } from 'node:url' -import { createClientScenario, createSsrScenario } from './scenario' -import type { LinkScenario } from './scenario' -import type { WorkerRequest, WorkerResponse } from './worker-protocol' -import type * as ClientApp from './src/client' -import type * as SsrApp from './src/ssr' - -const scenarios: Array = [] -const creationOrder: Array = [] -let closeWindow = () => {} - -function reply(response: WorkerResponse) { - if (!process.send) { - throw new Error('The Link sampling worker requires an IPC parent') - } - process.send(response) -} - -async function handle(request: WorkerRequest) { - if (request.kind === 'init') { - if (typeof process.threadCpuUsage !== 'function') { - throw new Error( - 'Stable sampling requires Node.js with process.threadCpuUsage', - ) - } - if (scenarios[request.variant]) { - throw new Error('A worker must only initialize each variant once') - } - let scenario: LinkScenario - const bundleUrl = pathToFileURL(request.bundle) - bundleUrl.searchParams.set('linkPerfVariant', String(request.variant)) - if (request.mode === 'client') { - const { window } = await import('../jsdom') - closeWindow = () => window.close() - const app: typeof ClientApp = await import(bundleUrl.href) - if (app.serverEnvironment !== false) { - throw new Error('Expected a production client bundle') - } - scenario = createClientScenario(app, request.caseId) - } else { - const app: typeof SsrApp = await import(bundleUrl.href) - if (app.serverEnvironment !== true) { - throw new Error('Expected a production SSR bundle') - } - scenario = createSsrScenario(app, request.caseId) - } - scenarios[request.variant] = scenario - creationOrder.push(scenario) - await scenario.setup() - const start = performance.now() - let iterations = 0 - do { - await scenario.batch() - iterations++ - } while (iterations < 100 || performance.now() - start < 2_000) - reply({ - kind: 'ready', - batchMs: (performance.now() - start) / iterations, - }) - return - } - if (request.kind === 'measure') { - const scenario = scenarios[request.variant] - if (!scenario) { - throw new Error('The sampling worker has not been initialized') - } - if (!Number.isInteger(request.iterations) || request.iterations < 1) { - throw new Error('Expected a positive batch count') - } - const cpuStart = process.threadCpuUsage() - const processStart = process.cpuUsage() - const start = performance.now() - for (let index = 0; index < request.iterations; index++) { - await scenario.batch() - } - const wallMs = performance.now() - start - const cpu = process.threadCpuUsage(cpuStart) - const processCpu = process.cpuUsage(processStart) - reply({ - kind: 'sample', - sample: { - iterations: request.iterations, - wallMs: wallMs / request.iterations, - cpuMs: (cpu.user + cpu.system) / 1_000 / request.iterations, - processCpuMs: - (processCpu.user + processCpu.system) / 1_000 / request.iterations, - }, - }) - return - } - try { - for (const scenario of creationOrder) { - scenario.check() - } - } finally { - for (const scenario of creationOrder.reverse()) { - scenario.teardown() - } - closeWindow() - } - reply({ kind: 'stopped' }) -} - -process.on('message', (request: WorkerRequest) => { - void handle(request).catch((error: unknown) => { - reply({ - kind: 'error', - message: - error instanceof Error ? error.stack || error.message : String(error), - }) - }) -}) diff --git a/benchmarks/client-nav/link-performance/staging.ts b/benchmarks/client-nav/link-performance/staging.ts deleted file mode 100644 index ac07d34c29..0000000000 --- a/benchmarks/client-nav/link-performance/staging.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { mkdirSync, mkdtempSync } from 'node:fs' -import { resolve } from 'node:path' -import { fileURLToPath } from 'node:url' - -export function createStagingDirectory() { - // SWC skips node_modules, leaving the emitted benchmark JavaScript intact. - const root = fileURLToPath(new URL('./node_modules/.cache/', import.meta.url)) - mkdirSync(root, { recursive: true }) - return mkdtempSync(resolve(root, 'link-performance-')) -} diff --git a/benchmarks/client-nav/link-performance/statistics.test.ts b/benchmarks/client-nav/link-performance/statistics.test.ts deleted file mode 100644 index 8f5f37413b..0000000000 --- a/benchmarks/client-nav/link-performance/statistics.test.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { expect, test } from 'vitest' -import { classify, mean, summarizeRatios } from './statistics' - -test('summarizes multiplicative paired changes across process replicas', () => { - const result = summarizeRatios([0.9, 0.9, 0.9, 0.9]) - expect(result.changePercent).toBeCloseTo(-10) - expect(result.low95).toBeCloseTo(-10) - expect(result.high95).toBeCloseTo(-10) - expect(result.replicas).toBe(4) -}) - -test('does not turn opposite noisy runs into a conclusive result', () => { - const result = summarizeRatios([0.9, 1.1, 0.95, 1.05]) - expect(result.low95).toBeLessThan(0) - expect(result.high95).toBeGreaterThan(0) - expect(classify(result, result)).toBe('inconclusive') -}) - -test('requires CPU and wall time to corroborate a direction', () => { - const slower = summarizeRatios([1.08, 1.09, 1.08, 1.09]) - const faster = summarizeRatios([0.9, 0.91, 0.9, 0.91]) - expect(classify(slower, slower)).toBe('slower') - expect(classify(faster, faster)).toBe('faster') - expect(classify(slower, faster)).toBe('inconclusive') - expect(classify(summarizeRatios([1, 1, 1]), summarizeRatios([1, 1, 1]))).toBe( - 'within-2%', - ) -}) - -test('rejects incomplete or invalid sampling data', () => { - expect(() => summarizeRatios([1])).toThrow() - expect(() => summarizeRatios([0, 1])).toThrow() - expect(() => summarizeRatios([NaN, 1])).toThrow() - expect(() => mean([])).toThrow() - expect(() => mean([Infinity])).toThrow() -}) diff --git a/benchmarks/client-nav/link-performance/statistics.ts b/benchmarks/client-nav/link-performance/statistics.ts deleted file mode 100644 index 469bdaf65a..0000000000 --- a/benchmarks/client-nav/link-performance/statistics.ts +++ /dev/null @@ -1,57 +0,0 @@ -const critical95 = [ - 12.7062, 4.3027, 3.1824, 2.7764, 2.5706, 2.4469, 2.3646, 2.306, 2.2622, - 2.2281, -] - -export function mean(values: ReadonlyArray) { - if (!values.length || values.some((value) => !Number.isFinite(value))) { - throw new Error('Expected finite, nonempty samples') - } - return values.reduce((sum, value) => sum + value, 0) / values.length -} - -export function summarizeRatios(ratios: ReadonlyArray) { - if ( - ratios.length < 2 || - ratios.length > 11 || - ratios.some((value) => value <= 0) - ) { - throw new Error('Expected 2-11 independent positive process-replica ratios') - } - const logs = ratios.map(Math.log) - const center = mean(logs) - const variance = - logs.reduce((sum, value) => sum + (value - center) ** 2, 0) / - (logs.length - 1) - // Replicas, not the many correlated batches inside a worker, are the samples. - const margin = - critical95[logs.length - 2]! * Math.sqrt(variance / logs.length) - const percent = (value: number) => (Math.exp(value) - 1) * 100 - return { - changePercent: percent(center), - low95: percent(center - margin), - high95: percent(center + margin), - replicas: ratios.length, - } -} - -export function classify( - cpu: ReturnType, - wall: ReturnType, -) { - if (cpu.low95 > 0 && wall.low95 > 0) { - return 'slower' - } - if (cpu.high95 < 0 && wall.high95 < 0) { - return 'faster' - } - if ( - cpu.low95 >= -2 && - cpu.high95 <= 2 && - wall.low95 >= -2 && - wall.high95 <= 2 - ) { - return 'within-2%' - } - return 'inconclusive' -} diff --git a/benchmarks/client-nav/link-performance/tsconfig.json b/benchmarks/client-nav/link-performance/tsconfig.json deleted file mode 100644 index fbf230c977..0000000000 --- a/benchmarks/client-nav/link-performance/tsconfig.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "extends": "../tsconfig.json", - "compilerOptions": { - "jsx": "react-jsx", - "jsxImportSource": "react", - "types": ["node", "vite/client", "vitest/globals"] - }, - "include": [ - "./**/*.ts", - "./**/*.tsx", - "../scenarios/harness.ts", - "../setup-helpers.ts", - "../vitest.setup.ts" - ] -} diff --git a/benchmarks/client-nav/link-performance/vite.client.config.ts b/benchmarks/client-nav/link-performance/vite.client.config.ts deleted file mode 100644 index 1cd45fc45e..0000000000 --- a/benchmarks/client-nav/link-performance/vite.client.config.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { createLinkPerformanceConfig } from './config' - -export default createLinkPerformanceConfig('client') diff --git a/benchmarks/client-nav/link-performance/vite.ssr.config.ts b/benchmarks/client-nav/link-performance/vite.ssr.config.ts deleted file mode 100644 index f59148eaf6..0000000000 --- a/benchmarks/client-nav/link-performance/vite.ssr.config.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { createLinkPerformanceConfig } from './config' - -export default createLinkPerformanceConfig('ssr') diff --git a/benchmarks/client-nav/link-performance/vitest.config.ts b/benchmarks/client-nav/link-performance/vitest.config.ts deleted file mode 100644 index f8454c819d..0000000000 --- a/benchmarks/client-nav/link-performance/vitest.config.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { fileURLToPath } from 'node:url' -import { defineConfig } from 'vitest/config' - -export default defineConfig({ - root: fileURLToPath(new URL('.', import.meta.url)), - test: { - watch: false, - environment: 'node', - include: ['*.test.ts'], - }, -}) diff --git a/benchmarks/client-nav/link-performance/worker-protocol.ts b/benchmarks/client-nav/link-performance/worker-protocol.ts deleted file mode 100644 index 474858a529..0000000000 --- a/benchmarks/client-nav/link-performance/worker-protocol.ts +++ /dev/null @@ -1,28 +0,0 @@ -import type { LinkCaseId } from './cases' - -export type Mode = 'client' | 'ssr' -export type Variant = 0 | 1 - -export type WorkerRequest = - | { - kind: 'init' - mode: Mode - caseId: LinkCaseId - bundle: string - variant: Variant - } - | { kind: 'measure'; iterations: number; variant: Variant } - | { kind: 'stop' } - -export interface BlockSample { - wallMs: number - cpuMs: number - processCpuMs: number - iterations: number -} - -export type WorkerResponse = - | { kind: 'ready'; batchMs: number } - | { kind: 'sample'; sample: BlockSample } - | { kind: 'stopped' } - | { kind: 'error'; message: string } diff --git a/benchmarks/client-nav/package.json b/benchmarks/client-nav/package.json index 1f878adc67..1b42e8fc87 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 --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: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: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": "^6.0.1", + "@codspeed/vitest-plugin": "^5.5.0", "@tanstack/router-plugin": "workspace:^", "@testing-library/react": "^16.2.0", "@vitejs/plugin-react": "^6.0.1", @@ -64,8 +64,6 @@ "@benchmarks/client-nav-control-flow-react", "@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,8 +92,6 @@ "@benchmarks/client-nav-control-flow-solid", "@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", @@ -124,7 +120,6 @@ "@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", @@ -183,13 +178,7 @@ ] }, "test:types": { - "inputs": [ - "default", - "^production", - "{workspaceRoot}/eslint.config.js", - "{workspaceRoot}/benchmarks/cpu-simulation.ts", - "dependentTaskOutputs" - ], + "cache": false, "dependsOn": [ "^build", { @@ -206,13 +195,8 @@ "@benchmarks/client-nav-history-react", "@benchmarks/client-nav-history-solid", "@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 944f182734..fcc15b5fbc 100644 --- a/benchmarks/client-nav/react/speed.bench.ts +++ b/benchmarks/client-nav/react/speed.bench.ts @@ -1,19 +1,34 @@ -import { test } from 'vitest' +import { afterAll, beforeAll, bench, describe } from 'vitest' import { setup } from './setup' -test('client-nav', async ({ bench }) => { - const scenario = setup() +describe('client-nav', () => { + const test = setup() - await bench( + /** + * 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( 'client-side navigation loop (react)', - { beforeAll: scenario.before, afterAll: scenario.after }, async () => { for (let i = 0; i < 10; i++) { - await scenario.tick() + await test.tick() } }, - ).run({ - warmupIterations: 100, - time: 10_000, - }) + { + warmupIterations: 100, + time: 10_000, + setup: test.before, + teardown: test.after, + }, + ) }) diff --git a/benchmarks/client-nav/react/vite.config.ts b/benchmarks/client-nav/react/vite.config.ts index 7df3f80e71..ea85a49a21 100644 --- a/benchmarks/client-nav/react/vite.config.ts +++ b/benchmarks/client-nav/react/vite.config.ts @@ -34,6 +34,5 @@ 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 65dab0781e..c3f4c5231c 100644 --- a/benchmarks/client-nav/scenarios/async-pipeline/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/async-pipeline/react/speed.bench.ts @@ -1,19 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-async-pipeline', async ({ bench }) => { - const scenario = setup() +describe('client-async-pipeline', () => { + const test = setup() - await bench( + /** + * 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-async-pipeline navigation loop (react)', - benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() + await test.tick() } - await scenario.finishBatch() + await test.finishBatch() }, - ).run(benchOptions) + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) }) 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 acef710469..96082e9963 100644 --- a/benchmarks/client-nav/scenarios/async-pipeline/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/async-pipeline/solid/speed.bench.ts @@ -1,19 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-async-pipeline', async ({ bench }) => { - const scenario = setup() +describe('client-async-pipeline', () => { + const test = setup() - await bench( + /** + * 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-async-pipeline navigation loop (solid)', - benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() + await test.tick() } - await scenario.finishBatch() + await test.finishBatch() }, - ).run(benchOptions) + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) }) 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 27b9498b11..7c15baf4e9 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 IndexRouteImport } from './routes/index' 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 IndexRouteImport } from './routes/index' import { Route as SlowIdRouteImport } from './routes/slow.$id' +import { Route as NestedIdRouteImport } from './routes/nested.$id' +import { Route as CtxIdRouteImport } from './routes/ctx.$id' -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => rootRouteImport, -} as any) const NestedRoute = NestedRouteImport.update({ id: '/nested', path: '/nested', getParentRoute: () => rootRouteImport, } as any) -const CtxIdRoute = CtxIdRouteImport.update({ - id: '/ctx/$id', - path: '/ctx/$id', +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => rootRouteImport, +} as any) +const SlowIdRoute = SlowIdRouteImport.update({ + id: '/slow/$id', + path: '/slow/$id', getParentRoute: () => rootRouteImport, } as any) const NestedIdRoute = NestedIdRouteImport.update({ @@ -35,9 +35,9 @@ const NestedIdRoute = NestedIdRouteImport.update({ path: '/$id', getParentRoute: () => NestedRoute, } as any) -const SlowIdRoute = SlowIdRouteImport.update({ - id: '/slow/$id', - path: '/slow/$id', +const CtxIdRoute = CtxIdRouteImport.update({ + id: '/ctx/$id', + path: '/ctx/$id', getParentRoute: () => rootRouteImport, } as any) @@ -80,13 +80,6 @@ export interface RootRouteChildren { declare module '@tanstack/solid-router' { interface FileRoutesByPath { - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport - parentRoute: typeof rootRouteImport - } '/nested': { id: '/nested' path: '/nested' @@ -94,11 +87,18 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof NestedRouteImport parentRoute: typeof rootRouteImport } - '/ctx/$id': { - id: '/ctx/$id' - path: '/ctx/$id' - fullPath: '/ctx/$id' - preLoaderRoute: typeof CtxIdRouteImport + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport + parentRoute: typeof rootRouteImport + } + '/slow/$id': { + id: '/slow/$id' + path: '/slow/$id' + fullPath: '/slow/$id' + preLoaderRoute: typeof SlowIdRouteImport parentRoute: typeof rootRouteImport } '/nested/$id': { @@ -108,11 +108,11 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof NestedIdRouteImport parentRoute: typeof NestedRoute } - '/slow/$id': { - id: '/slow/$id' - path: '/slow/$id' - fullPath: '/slow/$id' - preLoaderRoute: typeof SlowIdRouteImport + '/ctx/$id': { + id: '/ctx/$id' + path: '/ctx/$id' + fullPath: '/ctx/$id' + preLoaderRoute: typeof CtxIdRouteImport 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 f0fd3e58df..193a3837df 100644 --- a/benchmarks/client-nav/scenarios/async-pipeline/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/async-pipeline/vue/speed.bench.ts @@ -1,19 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-async-pipeline', async ({ bench }) => { - const scenario = setup() +describe('client-async-pipeline', () => { + const test = setup() - await bench( + /** + * 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-async-pipeline navigation loop (vue)', - benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() + await test.tick() } - await scenario.finishBatch() + await test.finishBatch() }, - ).run(benchOptions) + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) }) diff --git a/benchmarks/client-nav/scenarios/async-pipeline/vue/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/async-pipeline/vue/src/routeTree.gen.ts index 66b9efd7aa..ce26dc62d1 100644 --- a/benchmarks/client-nav/scenarios/async-pipeline/vue/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/async-pipeline/vue/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 IndexRouteImport } from './routes/index' 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 IndexRouteImport } from './routes/index' import { Route as SlowIdRouteImport } from './routes/slow.$id' +import { Route as NestedIdRouteImport } from './routes/nested.$id' +import { Route as CtxIdRouteImport } from './routes/ctx.$id' -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => rootRouteImport, -} as any) const NestedRoute = NestedRouteImport.update({ id: '/nested', path: '/nested', getParentRoute: () => rootRouteImport, } as any) -const CtxIdRoute = CtxIdRouteImport.update({ - id: '/ctx/$id', - path: '/ctx/$id', +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => rootRouteImport, +} as any) +const SlowIdRoute = SlowIdRouteImport.update({ + id: '/slow/$id', + path: '/slow/$id', getParentRoute: () => rootRouteImport, } as any) const NestedIdRoute = NestedIdRouteImport.update({ @@ -35,9 +35,9 @@ const NestedIdRoute = NestedIdRouteImport.update({ path: '/$id', getParentRoute: () => NestedRoute, } as any) -const SlowIdRoute = SlowIdRouteImport.update({ - id: '/slow/$id', - path: '/slow/$id', +const CtxIdRoute = CtxIdRouteImport.update({ + id: '/ctx/$id', + path: '/ctx/$id', getParentRoute: () => rootRouteImport, } as any) @@ -80,13 +80,6 @@ export interface RootRouteChildren { declare module '@tanstack/vue-router' { interface FileRoutesByPath { - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport - parentRoute: typeof rootRouteImport - } '/nested': { id: '/nested' path: '/nested' @@ -94,11 +87,18 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof NestedRouteImport parentRoute: typeof rootRouteImport } - '/ctx/$id': { - id: '/ctx/$id' - path: '/ctx/$id' - fullPath: '/ctx/$id' - preLoaderRoute: typeof CtxIdRouteImport + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport + parentRoute: typeof rootRouteImport + } + '/slow/$id': { + id: '/slow/$id' + path: '/slow/$id' + fullPath: '/slow/$id' + preLoaderRoute: typeof SlowIdRouteImport parentRoute: typeof rootRouteImport } '/nested/$id': { @@ -108,11 +108,11 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof NestedIdRouteImport parentRoute: typeof NestedRoute } - '/slow/$id': { - id: '/slow/$id' - path: '/slow/$id' - fullPath: '/slow/$id' - preLoaderRoute: typeof SlowIdRouteImport + '/ctx/$id': { + id: '/ctx/$id' + path: '/ctx/$id' + fullPath: '/ctx/$id' + preLoaderRoute: typeof CtxIdRouteImport parentRoute: typeof rootRouteImport } } 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 d6f2190be7..7f1153021f 100644 --- a/benchmarks/client-nav/scenarios/control-flow/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/control-flow/react/speed.bench.ts @@ -1,19 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-control-flow', async ({ bench }) => { - const scenario = setup() +describe('client-control-flow', () => { + const test = setup() - await bench( + /** + * 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-control-flow navigation loop (react)', - benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() + await test.tick() } - await scenario.finishBatch() + await test.finishBatch() }, - ).run(benchOptions) + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) }) 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 d803d2a313..a88093ca52 100644 --- a/benchmarks/client-nav/scenarios/control-flow/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/control-flow/solid/speed.bench.ts @@ -1,19 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-control-flow', async ({ bench }) => { - const scenario = setup() +describe('client-control-flow', () => { + const test = setup() - await bench( + /** + * 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-control-flow navigation loop (solid)', - benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() + await test.tick() } - await scenario.finishBatch() + await test.finishBatch() }, - ).run(benchOptions) + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) }) 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 cd84f99d5d..44d88e9f8d 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 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 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 MissingIdRouteImport } from './routes/missing.$id' -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => rootRouteImport, -} as any) -const BrokenRoute = BrokenRouteImport.update({ - id: '/broken', - path: '/broken', - getParentRoute: () => rootRouteImport, -} as any) -const Hop1Route = Hop1RouteImport.update({ - id: '/hop1', - path: '/hop1', +const TargetRoute = TargetRouteImport.update({ + id: '/target', + path: '/target', getParentRoute: () => rootRouteImport, } as any) const Hop2Route = Hop2RouteImport.update({ @@ -36,9 +26,19 @@ const Hop2Route = Hop2RouteImport.update({ path: '/hop2', getParentRoute: () => rootRouteImport, } as any) -const TargetRoute = TargetRouteImport.update({ - id: '/target', - path: '/target', +const Hop1Route = Hop1RouteImport.update({ + id: '/hop1', + path: '/hop1', + getParentRoute: () => rootRouteImport, +} as any) +const BrokenRoute = BrokenRouteImport.update({ + id: '/broken', + path: '/broken', + getParentRoute: () => rootRouteImport, +} as any) +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', getParentRoute: () => rootRouteImport, } as any) const MissingIdRoute = MissingIdRouteImport.update({ @@ -98,25 +98,11 @@ export interface RootRouteChildren { declare module '@tanstack/solid-router' { interface FileRoutesByPath { - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport - parentRoute: typeof rootRouteImport - } - '/broken': { - id: '/broken' - path: '/broken' - fullPath: '/broken' - preLoaderRoute: typeof BrokenRouteImport - parentRoute: typeof rootRouteImport - } - '/hop1': { - id: '/hop1' - path: '/hop1' - fullPath: '/hop1' - preLoaderRoute: typeof Hop1RouteImport + '/target': { + id: '/target' + path: '/target' + fullPath: '/target' + preLoaderRoute: typeof TargetRouteImport parentRoute: typeof rootRouteImport } '/hop2': { @@ -126,11 +112,25 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof Hop2RouteImport parentRoute: typeof rootRouteImport } - '/target': { - id: '/target' - path: '/target' - fullPath: '/target' - preLoaderRoute: typeof TargetRouteImport + '/hop1': { + id: '/hop1' + path: '/hop1' + fullPath: '/hop1' + preLoaderRoute: typeof Hop1RouteImport + parentRoute: typeof rootRouteImport + } + '/broken': { + id: '/broken' + path: '/broken' + fullPath: '/broken' + preLoaderRoute: typeof BrokenRouteImport + parentRoute: typeof rootRouteImport + } + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport 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 8a019945c7..9a335cfb87 100644 --- a/benchmarks/client-nav/scenarios/control-flow/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/control-flow/vue/speed.bench.ts @@ -1,19 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-control-flow', async ({ bench }) => { - const scenario = setup() +describe('client-control-flow', () => { + const test = setup() - await bench( + /** + * 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-control-flow navigation loop (vue)', - benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() + await test.tick() } - await scenario.finishBatch() + await test.finishBatch() }, - ).run(benchOptions) + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) }) diff --git a/benchmarks/client-nav/scenarios/control-flow/vue/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/control-flow/vue/src/routeTree.gen.ts index 6b53a6a203..60fc846f89 100644 --- a/benchmarks/client-nav/scenarios/control-flow/vue/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/control-flow/vue/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 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 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 MissingIdRouteImport } from './routes/missing.$id' -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => rootRouteImport, -} as any) -const BrokenRoute = BrokenRouteImport.update({ - id: '/broken', - path: '/broken', - getParentRoute: () => rootRouteImport, -} as any) -const Hop1Route = Hop1RouteImport.update({ - id: '/hop1', - path: '/hop1', +const TargetRoute = TargetRouteImport.update({ + id: '/target', + path: '/target', getParentRoute: () => rootRouteImport, } as any) const Hop2Route = Hop2RouteImport.update({ @@ -36,9 +26,19 @@ const Hop2Route = Hop2RouteImport.update({ path: '/hop2', getParentRoute: () => rootRouteImport, } as any) -const TargetRoute = TargetRouteImport.update({ - id: '/target', - path: '/target', +const Hop1Route = Hop1RouteImport.update({ + id: '/hop1', + path: '/hop1', + getParentRoute: () => rootRouteImport, +} as any) +const BrokenRoute = BrokenRouteImport.update({ + id: '/broken', + path: '/broken', + getParentRoute: () => rootRouteImport, +} as any) +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', getParentRoute: () => rootRouteImport, } as any) const MissingIdRoute = MissingIdRouteImport.update({ @@ -98,25 +98,11 @@ export interface RootRouteChildren { declare module '@tanstack/vue-router' { interface FileRoutesByPath { - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport - parentRoute: typeof rootRouteImport - } - '/broken': { - id: '/broken' - path: '/broken' - fullPath: '/broken' - preLoaderRoute: typeof BrokenRouteImport - parentRoute: typeof rootRouteImport - } - '/hop1': { - id: '/hop1' - path: '/hop1' - fullPath: '/hop1' - preLoaderRoute: typeof Hop1RouteImport + '/target': { + id: '/target' + path: '/target' + fullPath: '/target' + preLoaderRoute: typeof TargetRouteImport parentRoute: typeof rootRouteImport } '/hop2': { @@ -126,11 +112,25 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof Hop2RouteImport parentRoute: typeof rootRouteImport } - '/target': { - id: '/target' - path: '/target' - fullPath: '/target' - preLoaderRoute: typeof TargetRouteImport + '/hop1': { + id: '/hop1' + path: '/hop1' + fullPath: '/hop1' + preLoaderRoute: typeof Hop1RouteImport + parentRoute: typeof rootRouteImport + } + '/broken': { + id: '/broken' + path: '/broken' + fullPath: '/broken' + preLoaderRoute: typeof BrokenRouteImport + parentRoute: typeof rootRouteImport + } + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } '/missing/$id': { diff --git a/benchmarks/client-nav/scenarios/head/react/speed.bench.ts b/benchmarks/client-nav/scenarios/head/react/speed.bench.ts index d0d731a09f..97c76a1a11 100644 --- a/benchmarks/client-nav/scenarios/head/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/head/react/speed.bench.ts @@ -1,19 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-head', async ({ bench }) => { - const scenario = setup() +describe('client-head', () => { + const test = setup() - await bench( + /** + * 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-head navigation loop (react)', - benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() + await test.tick() } - await scenario.finishBatch() + await test.finishBatch() }, - ).run(benchOptions) + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) }) diff --git a/benchmarks/client-nav/scenarios/head/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/head/solid/speed.bench.ts index ca156c950b..075e7673de 100644 --- a/benchmarks/client-nav/scenarios/head/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/head/solid/speed.bench.ts @@ -1,19 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-head', async ({ bench }) => { - const scenario = setup() +describe('client-head', () => { + const test = setup() - await bench( + /** + * 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-head navigation loop (solid)', - benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() + await test.tick() } - await scenario.finishBatch() + await test.finishBatch() }, - ).run(benchOptions) + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) }) 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 b6f217e527..ead6a4436a 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 IndexRouteImport } from './routes/index' -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 DocsRouteImport } from './routes/docs' +import { Route as IndexRouteImport } from './routes/index' import { Route as DocsSectionRouteImport } from './routes/docs.$section' +import { Route as ArticlesIdRouteImport } from './routes/articles.$id' -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', +const SettingsRoute = SettingsRouteImport.update({ + id: '/settings', + path: '/settings', getParentRoute: () => rootRouteImport, } as any) const DocsRoute = DocsRouteImport.update({ @@ -25,14 +25,9 @@ const DocsRoute = DocsRouteImport.update({ path: '/docs', getParentRoute: () => rootRouteImport, } as any) -const SettingsRoute = SettingsRouteImport.update({ - id: '/settings', - path: '/settings', - getParentRoute: () => rootRouteImport, -} as any) -const ArticlesIdRoute = ArticlesIdRouteImport.update({ - id: '/articles/$id', - path: '/articles/$id', +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', getParentRoute: () => rootRouteImport, } as any) const DocsSectionRoute = DocsSectionRouteImport.update({ @@ -40,6 +35,11 @@ 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 { - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport + '/settings': { + id: '/settings' + path: '/settings' + fullPath: '/settings' + preLoaderRoute: typeof SettingsRouteImport parentRoute: typeof rootRouteImport } '/docs': { @@ -100,18 +100,11 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof DocsRouteImport parentRoute: typeof rootRouteImport } - '/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 + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } '/docs/$section': { @@ -121,6 +114,13 @@ 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 d188a9dd7a..7080b4ea7d 100644 --- a/benchmarks/client-nav/scenarios/head/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/head/vue/speed.bench.ts @@ -1,19 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-head', async ({ bench }) => { - const scenario = setup() +describe('client-head', () => { + const test = setup() - await bench( + /** + * 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-head navigation loop (vue)', - benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() + await test.tick() } - await scenario.finishBatch() + await test.finishBatch() }, - ).run(benchOptions) + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) }) diff --git a/benchmarks/client-nav/scenarios/head/vue/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/head/vue/src/routeTree.gen.ts index 161f99a65c..b115854c26 100644 --- a/benchmarks/client-nav/scenarios/head/vue/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/head/vue/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 IndexRouteImport } from './routes/index' -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 DocsRouteImport } from './routes/docs' +import { Route as IndexRouteImport } from './routes/index' import { Route as DocsSectionRouteImport } from './routes/docs.$section' +import { Route as ArticlesIdRouteImport } from './routes/articles.$id' -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', +const SettingsRoute = SettingsRouteImport.update({ + id: '/settings', + path: '/settings', getParentRoute: () => rootRouteImport, } as any) const DocsRoute = DocsRouteImport.update({ @@ -25,14 +25,9 @@ const DocsRoute = DocsRouteImport.update({ path: '/docs', getParentRoute: () => rootRouteImport, } as any) -const SettingsRoute = SettingsRouteImport.update({ - id: '/settings', - path: '/settings', - getParentRoute: () => rootRouteImport, -} as any) -const ArticlesIdRoute = ArticlesIdRouteImport.update({ - id: '/articles/$id', - path: '/articles/$id', +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', getParentRoute: () => rootRouteImport, } as any) const DocsSectionRoute = DocsSectionRouteImport.update({ @@ -40,6 +35,11 @@ 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/vue-router' { interface FileRoutesByPath { - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport + '/settings': { + id: '/settings' + path: '/settings' + fullPath: '/settings' + preLoaderRoute: typeof SettingsRouteImport parentRoute: typeof rootRouteImport } '/docs': { @@ -100,18 +100,11 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof DocsRouteImport parentRoute: typeof rootRouteImport } - '/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 + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } '/docs/$section': { @@ -121,6 +114,13 @@ declare module '@tanstack/vue-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/history/react/speed.bench.ts b/benchmarks/client-nav/scenarios/history/react/speed.bench.ts index 6ec7031857..9192258b66 100644 --- a/benchmarks/client-nav/scenarios/history/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/history/react/speed.bench.ts @@ -1,19 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-history', async ({ bench }) => { - const scenario = setup() +describe('client-history', () => { + const test = setup() - await bench( + /** + * 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-history navigation loop (react)', - benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() + await test.tick() } - await scenario.finishBatch() + await test.finishBatch() }, - ).run(benchOptions) + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) }) diff --git a/benchmarks/client-nav/scenarios/history/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/history/solid/speed.bench.ts index 56af035b2b..d7f4fd898d 100644 --- a/benchmarks/client-nav/scenarios/history/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/history/solid/speed.bench.ts @@ -1,19 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-history', async ({ bench }) => { - const scenario = setup() +describe('client-history', () => { + const test = setup() - await bench( + /** + * 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-history navigation loop (solid)', - benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() + await test.tick() } - await scenario.finishBatch() + await test.finishBatch() }, - ).run(benchOptions) + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) }) 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 af253f4a15..a6ab2a4fc8 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 IndexRouteImport } from './routes/index' import { Route as GalleryRouteImport } from './routes/gallery' -import { Route as PagesNRouteImport } from './routes/pages.$n' +import { Route as IndexRouteImport } from './routes/index' import { Route as PhotosPhotoIdRouteImport } from './routes/photos.$photoId' +import { Route as PagesNRouteImport } from './routes/pages.$n' -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => rootRouteImport, -} as any) const GalleryRoute = GalleryRouteImport.update({ id: '/gallery', path: '/gallery', getParentRoute: () => rootRouteImport, } as any) -const PagesNRoute = PagesNRouteImport.update({ - id: '/pages/$n', - path: '/pages/$n', +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', getParentRoute: () => rootRouteImport, } as any) const PhotosPhotoIdRoute = PhotosPhotoIdRouteImport.update({ @@ -34,6 +29,11 @@ const PhotosPhotoIdRoute = PhotosPhotoIdRouteImport.update({ path: '/photos/$photoId', getParentRoute: () => rootRouteImport, } as any) +const PagesNRoute = PagesNRouteImport.update({ + id: '/pages/$n', + path: '/pages/$n', + getParentRoute: () => rootRouteImport, +} as any) export interface FileRoutesByFullPath { '/': typeof IndexRoute @@ -71,13 +71,6 @@ export interface RootRouteChildren { declare module '@tanstack/solid-router' { interface FileRoutesByPath { - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport - parentRoute: typeof rootRouteImport - } '/gallery': { id: '/gallery' path: '/gallery' @@ -85,11 +78,11 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof GalleryRouteImport parentRoute: typeof rootRouteImport } - '/pages/$n': { - id: '/pages/$n' - path: '/pages/$n' - fullPath: '/pages/$n' - preLoaderRoute: typeof PagesNRouteImport + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } '/photos/$photoId': { @@ -99,6 +92,13 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof PhotosPhotoIdRouteImport parentRoute: typeof rootRouteImport } + '/pages/$n': { + id: '/pages/$n' + path: '/pages/$n' + fullPath: '/pages/$n' + preLoaderRoute: typeof PagesNRouteImport + 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 3d36ac4cfa..a378e45ac5 100644 --- a/benchmarks/client-nav/scenarios/history/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/history/vue/speed.bench.ts @@ -1,19 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-history', async ({ bench }) => { - const scenario = setup() +describe('client-history', () => { + const test = setup() - await bench( + /** + * 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-history navigation loop (vue)', - benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() + await test.tick() } - await scenario.finishBatch() + await test.finishBatch() }, - ).run(benchOptions) + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) }) diff --git a/benchmarks/client-nav/scenarios/history/vue/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/history/vue/src/routeTree.gen.ts index 519aef7c8f..cee1b68870 100644 --- a/benchmarks/client-nav/scenarios/history/vue/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/history/vue/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 IndexRouteImport } from './routes/index' import { Route as GalleryRouteImport } from './routes/gallery' -import { Route as PagesNRouteImport } from './routes/pages.$n' +import { Route as IndexRouteImport } from './routes/index' import { Route as PhotosPhotoIdRouteImport } from './routes/photos.$photoId' +import { Route as PagesNRouteImport } from './routes/pages.$n' -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => rootRouteImport, -} as any) const GalleryRoute = GalleryRouteImport.update({ id: '/gallery', path: '/gallery', getParentRoute: () => rootRouteImport, } as any) -const PagesNRoute = PagesNRouteImport.update({ - id: '/pages/$n', - path: '/pages/$n', +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', getParentRoute: () => rootRouteImport, } as any) const PhotosPhotoIdRoute = PhotosPhotoIdRouteImport.update({ @@ -34,6 +29,11 @@ const PhotosPhotoIdRoute = PhotosPhotoIdRouteImport.update({ path: '/photos/$photoId', getParentRoute: () => rootRouteImport, } as any) +const PagesNRoute = PagesNRouteImport.update({ + id: '/pages/$n', + path: '/pages/$n', + getParentRoute: () => rootRouteImport, +} as any) export interface FileRoutesByFullPath { '/': typeof IndexRoute @@ -71,13 +71,6 @@ export interface RootRouteChildren { declare module '@tanstack/vue-router' { interface FileRoutesByPath { - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport - parentRoute: typeof rootRouteImport - } '/gallery': { id: '/gallery' path: '/gallery' @@ -85,11 +78,11 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof GalleryRouteImport parentRoute: typeof rootRouteImport } - '/pages/$n': { - id: '/pages/$n' - path: '/pages/$n' - fullPath: '/pages/$n' - preLoaderRoute: typeof PagesNRouteImport + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } '/photos/$photoId': { @@ -99,6 +92,13 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof PhotosPhotoIdRouteImport parentRoute: typeof rootRouteImport } + '/pages/$n': { + id: '/pages/$n' + path: '/pages/$n' + fullPath: '/pages/$n' + preLoaderRoute: typeof PagesNRouteImport + parentRoute: typeof rootRouteImport + } } } diff --git a/benchmarks/client-nav/scenarios/hydration/react/fixture.ts b/benchmarks/client-nav/scenarios/hydration/react/fixture.ts deleted file mode 100644 index 950c870a1c..0000000000 --- a/benchmarks/client-nav/scenarios/hydration/react/fixture.ts +++ /dev/null @@ -1,31 +0,0 @@ -export const ordinaryLinkCount = 192 -export const hashLinkCount = 8 -export const serverUrl = '/teams/team-7/items/item-42?view=summary' -export const clientUrl = `${serverUrl}#details` - -export interface Diagnostics { - beforeLoads: number - loaders: number - mounted: boolean - clicks: number - ordinaryRenders: number - hashRenders: number - countRenders: boolean -} - -export function createDiagnostics(countRenders = false): Diagnostics { - return { - beforeLoads: 0, - loaders: 0, - mounted: false, - clicks: 0, - ordinaryRenders: 0, - hashRenders: 0, - countRenders, - } -} - -export interface FixtureArtifact { - html: string - scripts: Array -} diff --git a/benchmarks/client-nav/scenarios/hydration/react/generate-fixture.mjs b/benchmarks/client-nav/scenarios/hydration/react/generate-fixture.mjs deleted file mode 100644 index fbc67c5a08..0000000000 --- a/benchmarks/client-nav/scenarios/hydration/react/generate-fixture.mjs +++ /dev/null @@ -1,23 +0,0 @@ -import assert from 'node:assert/strict' -import { writeFile } from 'node:fs/promises' -import { JSDOM } from 'jsdom' - -if (process.env.NODE_ENV !== 'production') { - throw new Error('Generate the hydration fixture in production mode') -} -const { renderFixture } = await import('./dist/server/server.js') -const html = await renderFixture() -const dom = new JSDOM(html) -try { - const scriptElements = [...dom.window.document.querySelectorAll('script')] - assert.ok(scriptElements.length > 0) - assert.ok(scriptElements.every((script) => !script.src)) - const scripts = scriptElements.map((script) => script.textContent) - assert.ok(scripts.some((script) => script.includes('$_TSR'))) - await writeFile( - new URL('./dist/fixture.json', import.meta.url), - JSON.stringify({ html, scripts }), - ) -} finally { - dom.window.close() -} diff --git a/benchmarks/client-nav/scenarios/hydration/react/hydration.test.ts b/benchmarks/client-nav/scenarios/hydration/react/hydration.test.ts deleted file mode 100644 index 7e466cbaed..0000000000 --- a/benchmarks/client-nav/scenarios/hydration/react/hydration.test.ts +++ /dev/null @@ -1,93 +0,0 @@ -import { expect, test } from 'vitest' -import { hashLinkCount, ordinaryLinkCount } from './fixture' -import { setup } from './setup' -import { settleHydration } from './settle' - -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( - completed.diagnostics.ordinaryRenders, - ) - expect(completed.diagnostics.hashRenders).toBeGreaterThanOrEqual( - hashLinkCount + hashLinkCount / 2, - ) - for (let index = 0; index < 4; index++) { - await turn() - } - expect(scenario.snapshot()).toEqual(completed) - await expect(scenario.run()).rejects.toThrow('newly prepared sample') - } finally { - await scenario.after() - } - } - // 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 () => { - const scenario = setup() - await scenario.before() - await expect(scenario.after()).rejects.toThrow( - 'Hydration sample was not completed', - ) - await scenario.before() - try { - await scenario.run() - } finally { - await scenario.after() - } -}) - -test('waits for a commit and scheduler work lasting more than 100 turns', async () => { - let committed = false - const commit = (async () => { - for (let index = 0; index < 150; index++) { - await turn() - } - committed = true - })() - let remainingCallbacks = 150 - await settleHydration( - commit, - () => { - expect(committed).toBe(true) - return remainingCallbacks-- <= 0 - }, - () => 'delayed commit', - ) - expect(remainingCallbacks).toBeLessThan(0) -}) - -test('retains a watchdog for a commit that never completes', async () => { - await expect( - settleHydration( - new Promise(() => {}), - () => true, - () => 'commit pending', - 10, - ), - ).rejects.toThrow('Hydration did not settle within 10ms: commit pending') -}) - -test('retains a watchdog when scheduler work never becomes idle', async () => { - await expect( - settleHydration( - Promise.resolve(), - () => false, - () => 'callbacks pending', - 10, - ), - ).rejects.toThrow('Hydration did not settle within 10ms: callbacks pending') -}) diff --git a/benchmarks/client-nav/scenarios/hydration/react/project.json b/benchmarks/client-nav/scenarios/hydration/react/project.json deleted file mode 100644 index ca23838c0f..0000000000 --- a/benchmarks/client-nav/scenarios/hydration/react/project.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "@benchmarks/client-nav-hydration-react", - "projectType": "application", - "targets": { - "build:client": { - "executor": "nx:run-commands", - "cache": false, - "dependsOn": [ - { "projects": ["@tanstack/react-router"], "target": "build" } - ], - "options": { - "command": "NODE_ENV=production vite build --config {projectRoot}/vite.server.config.ts && NODE_ENV=production node {projectRoot}/generate-fixture.mjs && NODE_ENV=production vite build --config {projectRoot}/vite.config.ts" - } - }, - "test:unit": { - "executor": "nx:run-commands", - "dependsOn": ["build:client"], - "options": { - "command": "vitest run --config ./scenarios/hydration/react/vite.config.ts", - "cwd": "benchmarks/client-nav" - } - }, - "test:perf": { - "executor": "nx:run-commands", - "cache": false, - "dependsOn": ["build:client"], - "options": { - "command": "NODE_ENV=production vitest bench --mode benchmark --run --config ./scenarios/hydration/react/vite.config.ts", - "cwd": "benchmarks/client-nav" - } - }, - "test:types:client": { - "executor": "nx:run-commands", - "dependsOn": [ - { "projects": ["@tanstack/react-router"], "target": "build" } - ], - "options": { "command": "tsc -p {projectRoot}/tsconfig.json --noEmit" } - } - } -} diff --git a/benchmarks/client-nav/scenarios/hydration/react/settle.ts b/benchmarks/client-nav/scenarios/hydration/react/settle.ts deleted file mode 100644 index cc4c09a72d..0000000000 --- a/benchmarks/client-nav/scenarios/hydration/react/settle.ts +++ /dev/null @@ -1,35 +0,0 @@ -const turn = () => new Promise((resolve) => setImmediate(resolve)) - -export async function settleHydration( - committed: Promise, - isIdle: () => boolean, - describeProgress: () => string, - timeoutMs = 60_000, -) { - let timeoutError: Error | undefined - let watchdog: ReturnType | undefined - const timeout = new Promise((_, reject) => { - watchdog = setTimeout(() => { - timeoutError = new Error( - `Hydration did not settle within ${timeoutMs}ms: ${describeProgress()}`, - ) - reject(timeoutError) - }, timeoutMs) - }) - try { - // Concurrent hydration can need many more scheduler turns under CPU - // instrumentation. Await its commit instead of limiting successful work - // to an arbitrary number of event-loop polls. - await Promise.race([committed, timeout]) - let idleTurns = 0 - while (idleTurns < 2) { - await turn() - if (timeoutError) { - throw timeoutError - } - idleTurns = isIdle() ? idleTurns + 1 : 0 - } - } finally { - clearTimeout(watchdog) - } -} diff --git a/benchmarks/client-nav/scenarios/hydration/react/setup.ts b/benchmarks/client-nav/scenarios/hydration/react/setup.ts deleted file mode 100644 index 7c588af3fd..0000000000 --- a/benchmarks/client-nav/scenarios/hydration/react/setup.ts +++ /dev/null @@ -1,316 +0,0 @@ -import assert from 'node:assert/strict' -import { readFileSync } from 'node:fs' -import { fileURLToPath } from 'node:url' -import { Script } from 'node:vm' -import { JSDOM, VirtualConsole } from 'jsdom' -import { clientUrl, hashLinkCount, ordinaryLinkCount } from './fixture' -import { settleHydration } from './settle' -import type { FixtureArtifact } from './fixture' -import type * as Client from './src/client' - -type ClientApp = typeof Client -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. - const artifact: FixtureArtifact = JSON.parse( - readFileSync(new URL('./dist/fixture.json', import.meta.url), 'utf8'), - ) - const clientPath = new URL('./dist/client/client.js', import.meta.url) - const clientScript = new Script(readFileSync(clientPath, 'utf8'), { - filename: fileURLToPath(clientPath), - }) - const bootstrapScripts = artifact.scripts.map( - (source, index) => - new Script(source, { - filename: `hydration-bootstrap-${index}.js`, - }), - ) - let current: Awaited> | undefined - - async function prepare() { - const errors: Array = [] - const virtualConsole = new VirtualConsole() - virtualConsole.on('jsdomError', (error) => errors.push(String(error))) - virtualConsole.on('error', (...args) => - errors.push(args.map(String).join(' ')), - ) - const dom = new JSDOM(artifact.html, { - url: `http://localhost${clientUrl}`, - runScripts: 'outside-only', - virtualConsole, - }) - const immediates = new Set() - const scheduler = { tasks: 0 } - try { - Object.assign(dom.window, { - TextEncoder, - TextDecoder, - ReadableStream, - WritableStream, - TransformStream, - // Let React's production scheduler use the same task-turn primitive as - // the existing Node client benchmarks, without a real-delay timer. - setImmediate( - callback: (...args: Array) => void, - ...args: Array - ) { - scheduler.tasks++ - const handle = setImmediate(() => { - immediates.delete(handle) - callback(...args) - }) - immediates.add(handle) - return handle - }, - clearImmediate(handle: NodeJS.Immediate) { - immediates.delete(handle) - clearImmediate(handle) - }, - fetch() { - throw new Error('Hydration attempted a network request') - }, - 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 = () => {} - clientScript.runInContext(context) - const app = (dom.window as unknown as { HydrationBenchmark: ClientApp }) - .HydrationBenchmark - assert.equal(app.serverEnvironment, false) - const anchors = Array.from(dom.window.document.querySelectorAll('a')) - const scriptElements = Array.from( - dom.window.document.querySelectorAll('script'), - ) - const executingScript = { current: null as HTMLScriptElement | null } - Object.defineProperty(dom.window.document, 'currentScript', { - configurable: true, - get: () => executingScript.current, - }) - assert.equal(anchors.length, ordinaryLinkCount + hashLinkCount) - const content = dom.window.document.getElementById('hydration-content') - assert.ok(content) - // Finish jsdom's initial document lifecycle before opening the measure. - await turn() - assert.equal(dom.window.document.readyState, 'complete') - assert.equal(app.ready(), false) - return { - dom, - context, - app, - anchors, - content, - scriptElements, - executingScript, - immediates, - scheduler, - errors, - started: false, - completed: false, - failed: false, - } - } catch (error) { - for (const handle of immediates) { - clearImmediate(handle) - } - dom.window.close() - throw error - } - } - - async function before() { - if (current) { - throw new Error('Previous hydration sample was not disposed') - } - current = await prepare() - } - - async function run() { - const sample = current - if (!sample || sample.started) { - throw new Error('Hydration requires a newly prepared sample') - } - sample.started = true - try { - // HTML parsing/module evaluation are already done. Payload execution, - // router initialization/restoration and React hydration are measured. - for (let index = 0; index < bootstrapScripts.length; index++) { - // SSR bootstrap scripts remove their own script element after running. - sample.executingScript.current = sample.scriptElements[index]! - try { - bootstrapScripts[index]!.runInContext(sample.context) - } finally { - sample.executingScript.current = null - } - } - await settleHydration( - sample.app.start(countRenders), - () => sample.immediates.size === 0, - () => { - const progress = sample.app.snapshot() - return JSON.stringify({ - diagnostics: progress.diagnostics, - errors: [...sample.errors, ...progress.errors], - restoredMatches: progress.matches?.length, - pendingSchedulerCallbacks: sample.immediates.size, - }) - }, - ) - if (sample.errors.length) { - throw new Error(sample.errors.join('\n')) - } - assert.ok( - sample.app.ready(), - 'Hydration committed without the expected active links', - ) - sample.completed = true - } catch (error) { - sample.failed = true - throw error - } - } - - function snapshot() { - if (!current) { - throw new Error('No hydration sample') - } - // Normalize realm prototypes only for untimed assertions. - return JSON.parse(JSON.stringify(current.app.snapshot())) as ReturnType< - ClientApp['snapshot'] - > - } - - 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 - const doc = dom.window.document - const result = snapshot() - assert.deepEqual(errors, []) - assert.deepEqual(result.errors, []) - assert.equal(result.diagnostics.beforeLoads, 0) - assert.equal(result.diagnostics.loaders, 0) - assert.equal(result.diagnostics.mounted, true) - assert.equal(result.location, clientUrl) - assert.equal(result.matches?.length, 3) - for (const match of result.matches) { - assert.equal(match.status, 'success') - assert.deepEqual(match.context.viewer, { - id: 'viewer-3', - name: 'Ada', - role: 'editor', - }) - } - assert.deepEqual(result.matches[1]!.context.team, { - id: 'team-7', - member: 'viewer-3', - }) - assert.deepEqual(result.matches[2]!.context.permissions, { edit: true }) - assert.deepEqual(result.matches[1]!.loaderData, { - title: 'Team team-7', - categories: ['open', 'closed'], - }) - const data = result.matches[2]!.loaderData as { - owner: string - selected: string - rows: Array<{ - id: string - label: string - details: { score: number; open: boolean } - }> - } - assert.equal(data.owner, 'viewer-3') - assert.equal(data.selected, 'item-42') - assert.equal(data.rows.length, ordinaryLinkCount) - assert.equal(doc.getElementById('hydration-content'), content) - assert.equal(doc.querySelectorAll('a').length, anchors.length) - assert.equal(doc.getElementById('viewer')?.textContent, 'Ada') - assert.equal(doc.getElementById('permission')?.textContent, 'Editable') - for (const anchor of anchors) { - assert.equal(doc.getElementById(anchor.id), anchor) - } - for (let index = 0; index < ordinaryLinkCount; index++) { - const anchor = doc.getElementById(`ordinary-item-${index}`)! - assert.equal( - anchor.getAttribute('href'), - `/teams/team-7/items/item-${index}?view=summary`, - ) - assert.equal(anchor.textContent, `Item ${index}`) - assert.equal( - anchor.getAttribute('data-status'), - index === 42 ? 'active' : null, - ) - assert.deepEqual(data.rows[index], { - id: `item-${index}`, - label: `Item ${index}`, - details: { score: index * 3, open: index % 2 === 0 }, - }) - } - for (let index = 0; index < hashLinkCount; index++) { - assert.equal( - doc.getElementById(`hash-${index}`)?.getAttribute('data-status'), - index % 2 === 0 ? 'active' : null, - ) - } - doc - .getElementById('interactive')! - .dispatchEvent(new dom.window.MouseEvent('click', { bubbles: true })) - assert.equal( - current.app.snapshot().diagnostics.clicks, - result.diagnostics.clicks + 1, - ) - } - - async function after() { - const sample = current - if (!sample) { - return - } - try { - if (!sample.failed) { - assert.ok(sample.completed, 'Hydration sample was not completed') - validate() - } - } finally { - current = undefined - try { - sample.app.dispose() - // Unmount work and its scheduled effects stay outside the measure. - await turn() - await turn() - } finally { - for (const handle of sample.immediates) { - clearImmediate(handle) - } - sample.dom.window.close() - } - } - } - - return { - before, - run, - after, - snapshot, - schedulerTasks, - } -} diff --git a/benchmarks/client-nav/scenarios/hydration/react/speed.bench.ts b/benchmarks/client-nav/scenarios/hydration/react/speed.bench.ts deleted file mode 100644 index 643877760e..0000000000 --- a/benchmarks/client-nav/scenarios/hydration/react/speed.bench.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { test } from 'vitest' -import { setup } from './setup' - -test('client-hydration', async ({ bench }) => { - const scenario = setup() - - await bench( - 'hydrate restored route state and mixed Links (react)', - { beforeEach: scenario.before, afterEach: scenario.after }, - async () => { - await scenario.run() - }, - ).run({ - time: 5000, - warmupTime: 1000, - warmupIterations: 20, - throws: true, - }) -}) diff --git a/benchmarks/client-nav/scenarios/hydration/react/src/app.tsx b/benchmarks/client-nav/scenarios/hydration/react/src/app.tsx deleted file mode 100644 index e9797f71fa..0000000000 --- a/benchmarks/client-nav/scenarios/hydration/react/src/app.tsx +++ /dev/null @@ -1,216 +0,0 @@ -import { useEffect } from 'react' -import { - HeadContent, - Link, - Outlet, - Scripts, - createMemoryHistory, - createRootRoute, - createRoute, - createRouter, - useHydrated, -} from '@tanstack/react-router' -import { - clientUrl, - hashLinkCount, - ordinaryLinkCount, - serverUrl, -} from '../fixture' -import type { ReactNode } from 'react' -import type { Diagnostics } from '../fixture' - -export function createFixtureRouter( - server: boolean, - diagnostics: Diagnostics, - onHydrated: () => void = () => {}, -) { - function beforeLoad() { - diagnostics.beforeLoads++ - if (!server) { - throw new Error('Hydration reran beforeLoad instead of restoring context') - } - } - - function loader() { - diagnostics.loaders++ - if (!server) { - throw new Error('Hydration reran a loader instead of restoring data') - } - } - - const root = createRootRoute({ - beforeLoad: () => { - beforeLoad() - return { viewer: { id: 'viewer-3', name: 'Ada', role: 'editor' } } - }, - head: () => ({ - meta: [{ charSet: 'utf-8' }, { title: 'Hydration benchmark' }], - }), - shellComponent: Document, - }) - const team = createRoute({ - getParentRoute: () => root, - path: '/teams/$teamId', - beforeLoad: ({ context, params }) => { - beforeLoad() - return { team: { id: params.teamId, member: context.viewer.id } } - }, - loader: ({ context }) => { - loader() - return { - title: `Team ${context.team.id}`, - categories: ['open', 'closed'], - } - }, - component: Team, - }) - const items = createRoute({ - getParentRoute: () => team, - path: 'items/$itemId', - validateSearch: (search: Record) => ({ - view: search.view === 'details' ? 'details' : 'summary', - }), - beforeLoad: ({ context }) => { - beforeLoad() - return { permissions: { edit: context.viewer.role === 'editor' } } - }, - loader: ({ context, params }) => { - loader() - return { - selected: params.itemId, - owner: context.team.member, - rows: Array.from({ length: ordinaryLinkCount }, (_, index) => ({ - id: `item-${index}`, - label: `Item ${index}`, - details: { score: index * 3, open: index % 2 === 0 }, - })), - } - }, - component: Items, - }) - - function Document({ children }: { children: ReactNode }) { - return ( - - - - - - {children} - - - - ) - } - - function Team() { - const context = team.useRouteContext() - const data = team.useLoaderData() - return ( -
-

{data.title}

-

{context.viewer.name}

- -
- ) - } - - function Items() { - const data = items.useLoaderData() - const context = items.useRouteContext() - useEffect(() => { - diagnostics.mounted = true - }, []) - return ( - <> -

- {context.permissions.edit ? 'Editable' : 'Read only'} -

- - - - {data.rows.map((row) => ( - - - - - - ))} - -
{row.id}{row.details.score} - - {diagnostics.countRenders - ? () => { - diagnostics.ordinaryRenders++ - return row.label - } - : row.label} - -
- -
Details
- - - ) - } - - function HydrationComplete() { - const hydrated = useHydrated() - useEffect(() => { - if (hydrated) { - onHydrated() - } - }, [hydrated]) - return null - } - - return createRouter({ - routeTree: root.addChildren([team.addChildren([items])]), - history: createMemoryHistory({ - initialEntries: [server ? serverUrl : clientUrl], - }), - isServer: server, - scrollRestoration: false, - defaultHashScrollIntoView: false, - defaultPreload: false, - }) -} - -declare module '@tanstack/react-router' { - interface Register { - router: ReturnType - } -} diff --git a/benchmarks/client-nav/scenarios/hydration/react/src/client.tsx b/benchmarks/client-nav/scenarios/hydration/react/src/client.tsx deleted file mode 100644 index 42c5a5104e..0000000000 --- a/benchmarks/client-nav/scenarios/hydration/react/src/client.tsx +++ /dev/null @@ -1,83 +0,0 @@ -import { startTransition } from 'react' -import { hydrateRoot } from 'react-dom/client' -import { RouterProvider } from '@tanstack/react-router' -import { hydrate } from '@tanstack/react-router/ssr/client' -import { isServer } from '@tanstack/router-core/isServer' -import { createDiagnostics, hashLinkCount } from '../fixture' -import { createFixtureRouter } from './app' - -export const serverEnvironment = isServer -let router: ReturnType | undefined -let root: ReturnType | undefined -let diagnostics = createDiagnostics() -const errors: Array = [] - -export async function start(countRenders = false) { - if (router) { - throw new Error('A hydration sample must use a fresh client realm') - } - if (!window.$_TSR?.router) { - throw new Error('Missing SSR hydration payload') - } - diagnostics = createDiagnostics(countRenders) - let resolveHydrated!: () => void - let rejectHydrated!: (error: unknown) => void - const hydrated = new Promise((resolve, reject) => { - resolveHydrated = resolve - rejectHydrated = reject - }) - router = createFixtureRouter(false, diagnostics, resolveHydrated) - // This is the same restoration path used by Start, without a module-cached - // RouterClient/StartClient promise or a live server in the worker. - await hydrate(router) - window.$_TSR.h() - startTransition(() => { - root = hydrateRoot(document, , { - onRecoverableError: (error) => { - errors.push(String(error)) - rejectHydrated(error) - }, - onUncaughtError: (error) => { - errors.push(String(error)) - rejectHydrated(error) - }, - }) - }) - await hydrated -} - -export function ready() { - if (!diagnostics.mounted) { - return false - } - // Matching hash Links only become active in the follow-up hydration commit. - // Ending at the first mount effect would miss the work this scenario targets. - for (let index = 0; index < hashLinkCount; index += 2) { - if ( - document.getElementById(`hash-${index}`)?.getAttribute('data-status') !== - 'active' - ) { - return false - } - } - return true -} - -export function snapshot() { - const matches = router?.stores.matches.get() - return { - diagnostics: { ...diagnostics }, - errors: [...errors], - location: router?.stores.location.get().href, - matches: matches?.map((match) => ({ - status: match.status, - context: match.context, - loaderData: match.loaderData, - })), - } -} - -export function dispose() { - root?.unmount() - router?.history.destroy() -} diff --git a/benchmarks/client-nav/scenarios/hydration/react/src/server.tsx b/benchmarks/client-nav/scenarios/hydration/react/src/server.tsx deleted file mode 100644 index 713b0a77f2..0000000000 --- a/benchmarks/client-nav/scenarios/hydration/react/src/server.tsx +++ /dev/null @@ -1,29 +0,0 @@ -import { - createRequestHandler, - defaultStreamHandler, -} from '@tanstack/react-router/ssr/server' -import { isServer } from '@tanstack/router-core/isServer' -import { createDiagnostics, serverUrl } from '../fixture' -import { createFixtureRouter } from './app' - -export async function renderFixture() { - if ((isServer as boolean | undefined) !== true) { - throw new Error('Fixture generation requires the production server build') - } - const diagnostics = createDiagnostics() - const response = await createRequestHandler({ - createRouter: () => createFixtureRouter(true, diagnostics), - request: new Request(`http://localhost${serverUrl}`), - })(defaultStreamHandler) - const html = await response.text() - if ( - response.status !== 200 || - diagnostics.beforeLoads !== 3 || - diagnostics.loaders !== 2 - ) { - throw new Error( - 'SSR fixture did not execute its beforeLoad and loader functions', - ) - } - return html -} diff --git a/benchmarks/client-nav/scenarios/hydration/react/tsconfig.json b/benchmarks/client-nav/scenarios/hydration/react/tsconfig.json deleted file mode 100644 index 23dd08de8b..0000000000 --- a/benchmarks/client-nav/scenarios/hydration/react/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../../../../tsconfig.json", - "compilerOptions": { - "jsx": "react-jsx", - "jsxImportSource": "react", - "allowImportingTsExtensions": true, - "types": ["node", "vite/client", "vitest/globals"] - }, - "include": ["./*.ts", "./src/**/*"] -} diff --git a/benchmarks/client-nav/scenarios/hydration/react/vite.config.ts b/benchmarks/client-nav/scenarios/hydration/react/vite.config.ts deleted file mode 100644 index 62ab87115b..0000000000 --- a/benchmarks/client-nav/scenarios/hydration/react/vite.config.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { fileURLToPath } from 'node:url' -import { defineConfig } from 'vitest/config' -import react from '@vitejs/plugin-react' -import codspeedPlugin from '@codspeed/vitest-plugin' -import { cpuSimulationExecArgv } from '../../../../cpu-simulation' - -export default defineConfig({ - root: fileURLToPath(new URL('.', import.meta.url)), - define: { 'process.env.NODE_ENV': JSON.stringify('production') }, - plugins: [ - !!(process.env.VITEST && process.env.WITH_INSTRUMENTATION) && - codspeedPlugin(), - react(), - ], - resolve: { conditions: ['browser', 'production'] }, - build: { - outDir: './dist/client', - emptyOutDir: true, - minify: false, - lib: { - entry: './src/client.tsx', - name: 'HydrationBenchmark', - formats: ['iife'], - fileName: () => 'client.js', - }, - }, - test: { - execArgv: cpuSimulationExecArgv(), - name: '@benchmarks/client-nav hydration (react)', - watch: false, - environment: 'node', - isolate: true, - include: ['hydration.test.ts'], - benchmark: { include: ['speed.bench.ts'] }, - }, -}) diff --git a/benchmarks/client-nav/scenarios/hydration/react/vite.server.config.ts b/benchmarks/client-nav/scenarios/hydration/react/vite.server.config.ts deleted file mode 100644 index fbf6a149b9..0000000000 --- a/benchmarks/client-nav/scenarios/hydration/react/vite.server.config.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { fileURLToPath } from 'node:url' -import { defineConfig } from 'vite' -import react from '@vitejs/plugin-react' - -export default defineConfig({ - root: fileURLToPath(new URL('.', import.meta.url)), - define: { 'process.env.NODE_ENV': JSON.stringify('production') }, - plugins: [react()], - resolve: { conditions: ['node', 'production'] }, - ssr: { noExternal: true }, - build: { - ssr: true, - outDir: './dist/server', - emptyOutDir: true, - minify: false, - lib: { - entry: './src/server.tsx', - formats: ['es'], - fileName: () => 'server.js', - }, - rolldownOptions: { - platform: 'node', - external: [/^node:/, /^react(?:\/|$)/, /^react-dom(?:\/|$)/], - }, - }, -}) diff --git a/benchmarks/client-nav/scenarios/hydration/solid/fixture.ts b/benchmarks/client-nav/scenarios/hydration/solid/fixture.ts deleted file mode 100644 index 4c86d0e2f4..0000000000 --- a/benchmarks/client-nav/scenarios/hydration/solid/fixture.ts +++ /dev/null @@ -1,35 +0,0 @@ -export { - clientUrl, - hashLinkCount, - ordinaryLinkCount, - serverUrl, -} from '../react/fixture' -export type { FixtureArtifact } from '../react/fixture' - -export interface Diagnostics { - beforeLoads: number - loaders: number - mounted: boolean - rendered: number - clicks: number - countUpdates: boolean - ordinaryEvaluations: number - hashEvaluations: number - initialHashStates: Array - hashStates: Array -} - -export function createDiagnostics(countUpdates = false): Diagnostics { - return { - beforeLoads: 0, - loaders: 0, - mounted: false, - rendered: 0, - clicks: 0, - countUpdates, - ordinaryEvaluations: 0, - hashEvaluations: 0, - initialHashStates: [], - hashStates: [], - } -} diff --git a/benchmarks/client-nav/scenarios/hydration/solid/generate-fixture.mjs b/benchmarks/client-nav/scenarios/hydration/solid/generate-fixture.mjs deleted file mode 100644 index 63647e1be7..0000000000 --- a/benchmarks/client-nav/scenarios/hydration/solid/generate-fixture.mjs +++ /dev/null @@ -1,30 +0,0 @@ -import assert from 'node:assert/strict' -import { writeFile } from 'node:fs/promises' -import { JSDOM } from 'jsdom' - -if (process.env.NODE_ENV !== 'production') { - throw new Error('Generate the hydration fixture in production mode') -} -const { renderFixture } = await import('./dist/server/server.js') -const html = await renderFixture() -const dom = new JSDOM(html) -try { - const doc = dom.window.document - const scriptElements = [...doc.querySelectorAll('script')] - assert.ok(scriptElements.length > 0) - assert.ok(scriptElements.every((script) => !script.src)) - const scripts = scriptElements.map((script) => script.textContent) - assert.ok(scripts.some((script) => script.includes('$_TSR'))) - assert.ok(scripts.some((script) => script.includes('_$HY'))) - assert.ok(doc.documentElement.hasAttribute('data-hk')) - assert.ok(doc.getElementById('hydration-content')?.hasAttribute('data-hk')) - assert.ok( - [...doc.querySelectorAll('a')].every((a) => a.hasAttribute('data-hk')), - ) - await writeFile( - new URL('./dist/fixture.json', import.meta.url), - JSON.stringify({ html, scripts }), - ) -} finally { - dom.window.close() -} diff --git a/benchmarks/client-nav/scenarios/hydration/solid/hydration.test.ts b/benchmarks/client-nav/scenarios/hydration/solid/hydration.test.ts deleted file mode 100644 index 4e5f3208ca..0000000000 --- a/benchmarks/client-nav/scenarios/hydration/solid/hydration.test.ts +++ /dev/null @@ -1,81 +0,0 @@ -import { expect, test } from 'vitest' -import { hashLinkCount, ordinaryLinkCount } from './fixture' -import { setup } from './setup' - -const turn = () => new Promise((resolve) => setImmediate(resolve)) - -test('restores fresh DOMs and route state and completes hash-link reactivity', async () => { - const scenario = setup({ countUpdates: true }) - let previous: ReturnType | undefined - for (let iteration = 0; iteration < 3; iteration++) { - await scenario.before() - try { - const initial = scenario.snapshot() - expect(initial.matches).toBeUndefined() - expect(initial.diagnostics.mounted).toBe(false) - expect(initial.diagnostics.rendered).toBe(0) - expect(initial.diagnostics.clicks).toBe(0) - expect(initial.diagnostics.ordinaryEvaluations).toBe(0) - expect(initial.diagnostics.hashEvaluations).toBe(0) - expect(initial.diagnostics.initialHashStates).toEqual([]) - await scenario.run() - const completed = scenario.snapshot() - expect(completed.diagnostics.ordinaryEvaluations).toBeGreaterThanOrEqual( - ordinaryLinkCount, - ) - expect(completed.diagnostics.initialHashStates).toEqual( - Array.from({ length: hashLinkCount }, () => false), - ) - expect(completed.diagnostics.hashStates).toEqual( - Array.from({ length: hashLinkCount }, (_, index) => index % 2 === 0), - ) - expect(completed.diagnostics.hashEvaluations).toBeGreaterThanOrEqual( - hashLinkCount + hashLinkCount / 2, - ) - expect(completed.hydrating).toBe(false) - for (let index = 0; index < 4; index++) { - await turn() - } - expect(scenario.snapshot()).toEqual(completed) - if (previous) { - expect(completed).toEqual(previous) - } - previous = completed - await expect(scenario.run()).rejects.toThrow('newly prepared sample') - } finally { - // Untimed assertions include DOM identity, all restored data/context, - // native event handling, and the absence of hydration diagnostics. - await scenario.after() - } - } -}) - -test('prepares every sample without counting diagnostics', async () => { - const scenario = setup() - for (let iteration = 0; iteration < 2; iteration++) { - 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 scenario.after() - } - } -}) - -test('rejects an empty measurement and still releases its sample', async () => { - const scenario = setup() - await scenario.before() - await expect(scenario.after()).rejects.toThrow( - 'Hydration sample was not completed', - ) - await scenario.before() - try { - await expect(scenario.before()).rejects.toThrow('was not disposed') - await scenario.run() - } finally { - await scenario.after() - } -}) diff --git a/benchmarks/client-nav/scenarios/hydration/solid/project.json b/benchmarks/client-nav/scenarios/hydration/solid/project.json deleted file mode 100644 index 1fa162771b..0000000000 --- a/benchmarks/client-nav/scenarios/hydration/solid/project.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "@benchmarks/client-nav-hydration-solid", - "projectType": "application", - "targets": { - "build:client": { - "executor": "nx:run-commands", - "cache": false, - "dependsOn": [ - { "projects": ["@tanstack/solid-router"], "target": "build" } - ], - "options": { - "command": "NODE_ENV=production vite build --config {projectRoot}/vite.server.config.ts && NODE_ENV=production node {projectRoot}/generate-fixture.mjs && NODE_ENV=production vite build --config {projectRoot}/vite.config.ts" - } - }, - "test:unit": { - "executor": "nx:run-commands", - "dependsOn": ["build:client"], - "options": { - "command": "vitest run --config ./scenarios/hydration/solid/vite.config.ts", - "cwd": "benchmarks/client-nav" - } - }, - "test:perf": { - "executor": "nx:run-commands", - "cache": false, - "dependsOn": ["build:client"], - "options": { - "command": "NODE_ENV=production vitest bench --mode benchmark --run --config ./scenarios/hydration/solid/vite.config.ts", - "cwd": "benchmarks/client-nav" - } - }, - "test:types:client": { - "executor": "nx:run-commands", - "dependsOn": [ - { "projects": ["@tanstack/solid-router"], "target": "build" } - ], - "options": { "command": "tsc -p {projectRoot}/tsconfig.json --noEmit" } - } - } -} diff --git a/benchmarks/client-nav/scenarios/hydration/solid/setup.ts b/benchmarks/client-nav/scenarios/hydration/solid/setup.ts deleted file mode 100644 index ebdbc8e9b2..0000000000 --- a/benchmarks/client-nav/scenarios/hydration/solid/setup.ts +++ /dev/null @@ -1,326 +0,0 @@ -import assert from 'node:assert/strict' -import { readFileSync } from 'node:fs' -import { fileURLToPath } from 'node:url' -import { Script } from 'node:vm' -import { JSDOM, VirtualConsole } from 'jsdom' -import { clientUrl, hashLinkCount, ordinaryLinkCount } from './fixture' -import type { FixtureArtifact } from './fixture' -import type * as Client from './src/client' - -type ClientApp = typeof Client -const turn = () => new Promise((resolve) => setImmediate(resolve)) -const maxSettleTurns = 100 - -export function setup({ countUpdates = false } = {}) { - // Compile once, outside measurement; evaluate the entire production bundle - // anew in every window, including Solid's module-level hydration state. - const artifact: FixtureArtifact = JSON.parse( - readFileSync(new URL('./dist/fixture.json', import.meta.url), 'utf8'), - ) - const clientPath = new URL('./dist/client/client.js', import.meta.url) - const clientScript = new Script(readFileSync(clientPath, 'utf8'), { - filename: fileURLToPath(clientPath), - }) - const bootstrapScripts = artifact.scripts.map( - (source, index) => - new Script(source, { - filename: `solid-hydration-bootstrap-${index}.js`, - }), - ) - let current: Awaited> | undefined - - async function prepare() { - const errors: Array = [] - const virtualConsole = new VirtualConsole() - virtualConsole.on('jsdomError', (error) => errors.push(String(error))) - for (const event of ['error', 'warn'] as const) { - virtualConsole.on(event, (...args) => - errors.push(args.map(String).join(' ')), - ) - } - const dom = new JSDOM(artifact.html, { - url: `http://localhost${clientUrl}`, - runScripts: 'outside-only', - virtualConsole, - }) - const immediates = new Set() - try { - Object.assign(dom.window, { - TextEncoder, - TextDecoder, - ReadableStream, - WritableStream, - TransformStream, - setImmediate( - callback: (...args: Array) => void, - ...args: Array - ) { - const handle = setImmediate(() => { - immediates.delete(handle) - callback(...args) - }) - immediates.add(handle) - return handle - }, - clearImmediate(handle: NodeJS.Immediate) { - immediates.delete(handle) - clearImmediate(handle) - }, - fetch() { - throw new Error('Hydration attempted a network request') - }, - scrollTo() {}, - }) - dom.window.addEventListener('unhandledrejection', (event) => { - errors.push(String(event.reason)) - }) - dom.window.HTMLElement.prototype.scrollIntoView = () => {} - const context = dom.getInternalVMContext() - clientScript.runInContext(context) - const app = (dom.window as unknown as { HydrationBenchmark: ClientApp }) - .HydrationBenchmark - assert.equal(app.serverEnvironment, false) - assert.equal(app.solidServerEnvironment, false) - const doc = dom.window.document - const anchors = Array.from(doc.querySelectorAll('a')) - const scriptElements = Array.from(doc.querySelectorAll('script')) - assert.equal(scriptElements.length, bootstrapScripts.length) - const executingScript = { current: null as HTMLScriptElement | null } - Object.defineProperty(doc, 'currentScript', { - configurable: true, - get: () => executingScript.current, - }) - assert.equal(anchors.length, ordinaryLinkCount + hashLinkCount) - const content = doc.getElementById('hydration-content') - assert.ok(content) - assert.ok(content.hasAttribute('data-hk')) - assert.ok(anchors.every((anchor) => anchor.hasAttribute('data-hk'))) - for (let index = 0; index < hashLinkCount; index++) { - assert.equal( - doc.getElementById(`hash-${index}`)?.getAttribute('data-status'), - null, - ) - } - // Production Solid can fall back to templates for missing hydration keys. - // Retain every workload element, not only the parent and the anchors. - const elements = Array.from(content.querySelectorAll('*')) - const documentElement = doc.documentElement - await turn() - assert.equal(doc.readyState, 'complete') - assert.equal(app.ready(), false) - assert.deepEqual(errors, []) - return { - dom, - context, - app, - anchors, - content, - elements, - documentElement, - scriptElements, - executingScript, - immediates, - errors, - started: false, - completed: false, - failed: false, - } - } catch (error) { - for (const handle of immediates) { - clearImmediate(handle) - } - dom.window.close() - throw error - } - } - - async function before() { - if (current) { - throw new Error('Previous hydration sample was not disposed') - } - current = await prepare() - } - - async function run() { - const sample = current - if (!sample || sample.started) { - throw new Error('Hydration requires a newly prepared sample') - } - sample.started = true - try { - // Parsing/evaluation are done. Execute both native Solid bootstrap and - // Router payload, then create/restore the router and hydrate the DOM. - for (let index = 0; index < bootstrapScripts.length; index++) { - // Router scripts remove document.currentScript. Keep the original - // script nodes and order, including Solid's bootstrap and markers. - sample.executingScript.current = sample.scriptElements[index]! - try { - bootstrapScripts[index]!.runInContext(sample.context) - } finally { - sample.executingScript.current = null - } - } - await sample.app.start(countUpdates) - let idleTurns = 0 - for (let index = 0; index < maxSettleTurns; index++) { - await turn() - if (sample.errors.length) { - throw new Error(sample.errors.join('\n')) - } - if (sample.app.ready() && sample.immediates.size === 0) { - if (++idleTurns === 2) { - sample.completed = true - return - } - } else { - idleTurns = 0 - } - } - throw new Error( - `Hydration did not settle: ${JSON.stringify(sample.app.snapshot())}`, - ) - } catch (error) { - sample.failed = true - throw error - } - } - - function snapshot() { - if (!current) { - throw new Error('No hydration sample') - } - // Normalize realm prototypes only for untimed assertions. - return JSON.parse(JSON.stringify(current.app.snapshot())) as ReturnType< - ClientApp['snapshot'] - > - } - - function validate() { - assert.ok(current?.started) - const { dom, anchors, content, elements, documentElement, errors } = current - const doc = dom.window.document - const result = snapshot() - assert.deepEqual(errors, []) - assert.equal(result.diagnostics.beforeLoads, 0) - assert.equal(result.diagnostics.loaders, 0) - assert.equal(result.diagnostics.mounted, true) - assert.ok(result.diagnostics.rendered > 0) - assert.equal(result.hydrating, false) - assert.equal(result.location, clientUrl) - assert.equal(result.resolvedLocation, clientUrl) - assert.equal(result.matches?.length, 3) - for (const match of result.matches) { - assert.equal(match.status, 'success') - assert.deepEqual(match.context.viewer, { - id: 'viewer-3', - name: 'Ada', - role: 'editor', - }) - } - const teamContext = { id: 'team-7', member: 'viewer-3' } - assert.deepEqual(result.matches[1]!.context.team, teamContext) - assert.deepEqual(result.matches[2]!.context.team, teamContext) - assert.deepEqual(result.matches[2]!.context.permissions, { edit: true }) - assert.deepEqual(result.matches[1]!.loaderData, { - title: 'Team team-7', - categories: ['open', 'closed'], - }) - const data = result.matches[2]!.loaderData as { - owner: string - selected: string - rows: Array<{ - id: string - label: string - details: { score: number; open: boolean } - }> - } - assert.equal(data.owner, 'viewer-3') - assert.equal(data.selected, 'item-42') - assert.equal(data.rows.length, ordinaryLinkCount) - assert.equal(doc.documentElement, documentElement) - assert.equal(doc.getElementById('hydration-content'), content) - const hydratedElements = Array.from(content.querySelectorAll('*')) - assert.equal(hydratedElements.length, elements.length) - elements.forEach((element, index) => { - assert.equal(hydratedElements[index], element) - }) - assert.equal(doc.querySelectorAll('a').length, anchors.length) - assert.equal(doc.title, 'Hydration benchmark') - assert.equal(content.querySelector('h1')?.textContent, 'Team team-7') - assert.equal(doc.getElementById('viewer')?.textContent, 'Ada') - assert.equal(doc.getElementById('permission')?.textContent, 'Editable') - for (const anchor of anchors) { - assert.equal(doc.getElementById(anchor.id), anchor) - } - for (let index = 0; index < ordinaryLinkCount; index++) { - const anchor = doc.getElementById(`ordinary-item-${index}`)! - assert.equal( - anchor.getAttribute('href'), - `/teams/team-7/items/item-${index}?view=summary`, - ) - assert.equal(anchor.textContent, `Item ${index}`) - assert.equal( - anchor.getAttribute('data-status'), - index === 42 ? 'active' : null, - ) - assert.deepEqual(data.rows[index], { - id: `item-${index}`, - label: `Item ${index}`, - details: { score: index * 3, open: index % 2 === 0 }, - }) - } - for (let index = 0; index < hashLinkCount; index++) { - const anchor = doc.getElementById(`hash-${index}`)! - assert.equal( - anchor.getAttribute('data-status'), - index % 2 === 0 ? 'active' : null, - ) - assert.equal( - anchor.getAttribute('href'), - `/teams/team-7/items/item-42?view=summary#${index % 2 === 0 ? 'details' : 'other'}`, - ) - assert.equal(anchor.textContent, `Section ${index}`) - } - assert.equal(result.diagnostics.clicks, 0) - doc - .getElementById('interactive')! - .dispatchEvent(new dom.window.MouseEvent('click', { bubbles: true })) - assert.equal(current.app.snapshot().diagnostics.clicks, 1) - assert.deepEqual(errors, []) - } - - async function after() { - const sample = current - if (!sample) { - return - } - try { - if (!sample.failed) { - assert.ok(sample.completed, 'Hydration sample was not completed') - validate() - } - } finally { - current = undefined - try { - sample.app.dispose() - await turn() - await turn() - if (!sample.failed) { - assert.deepEqual(sample.errors, []) - } - } finally { - for (const handle of sample.immediates) { - clearImmediate(handle) - } - sample.dom.window.close() - } - } - } - - return { - before, - run, - after, - snapshot, - } -} diff --git a/benchmarks/client-nav/scenarios/hydration/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/hydration/solid/speed.bench.ts deleted file mode 100644 index b386cb8215..0000000000 --- a/benchmarks/client-nav/scenarios/hydration/solid/speed.bench.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { test } from 'vitest' -import { setup } from './setup' - -test('client-hydration', async ({ bench }) => { - const scenario = setup() - - await bench( - 'hydrate restored route state and mixed Links (solid)', - { beforeEach: scenario.before, afterEach: scenario.after }, - async () => { - await scenario.run() - }, - ).run({ - time: 5000, - warmupTime: 1000, - warmupIterations: 20, - throws: true, - }) -}) diff --git a/benchmarks/client-nav/scenarios/hydration/solid/src/app.tsx b/benchmarks/client-nav/scenarios/hydration/solid/src/app.tsx deleted file mode 100644 index cb772d6b5b..0000000000 --- a/benchmarks/client-nav/scenarios/hydration/solid/src/app.tsx +++ /dev/null @@ -1,213 +0,0 @@ -import { For, onMount } from 'solid-js' -import { HydrationScript } from 'solid-js/web' -import { - HeadContent, - Link, - Outlet, - Scripts, - createMemoryHistory, - createRootRoute, - createRoute, - createRouter, -} from '@tanstack/solid-router' -import { - clientUrl, - hashLinkCount, - ordinaryLinkCount, - serverUrl, -} from '../fixture' -import type { JSX } from 'solid-js' -import type { Diagnostics } from '../fixture' - -export function createFixtureRouter(server: boolean, diagnostics: Diagnostics) { - function beforeLoad() { - diagnostics.beforeLoads++ - if (!server) { - throw new Error('Hydration reran beforeLoad instead of restoring context') - } - } - - function loader() { - diagnostics.loaders++ - if (!server) { - throw new Error('Hydration reran a loader instead of restoring data') - } - } - - const root = createRootRoute({ - beforeLoad: () => { - beforeLoad() - return { viewer: { id: 'viewer-3', name: 'Ada', role: 'editor' } } - }, - head: () => ({ - meta: [{ charset: 'utf-8' }, { title: 'Hydration benchmark' }], - }), - shellComponent: Document, - }) - const team = createRoute({ - getParentRoute: () => root, - path: '/teams/$teamId', - beforeLoad: ({ context, params }) => { - beforeLoad() - return { team: { id: params.teamId, member: context.viewer.id } } - }, - loader: ({ context }) => { - loader() - return { - title: `Team ${context.team.id}`, - categories: ['open', 'closed'], - } - }, - component: Team, - }) - const items = createRoute({ - getParentRoute: () => team, - path: 'items/$itemId', - validateSearch: (search: Record) => ({ - view: search.view === 'details' ? 'details' : 'summary', - }), - beforeLoad: ({ context }) => { - beforeLoad() - return { permissions: { edit: context.viewer.role === 'editor' } } - }, - loader: ({ context, params }) => { - loader() - return { - selected: params.itemId, - owner: context.team.member, - rows: Array.from({ length: ordinaryLinkCount }, (_, index) => ({ - id: `item-${index}`, - label: `Item ${index}`, - details: { score: index * 3, open: index % 2 === 0 }, - })), - } - }, - component: Items, - }) - - function Document(props: { children: JSX.Element }) { - return ( - - - - - - - {props.children} - - - - ) - } - - function Team() { - const context = team.useRouteContext() - const data = team.useLoaderData() - return ( -
-

{data().title}

-

{context().viewer.name}

- -
- ) - } - - function Items() { - const data = items.useLoaderData() - const context = items.useRouteContext() - onMount(() => { - diagnostics.mounted = true - }) - return ( - <> -

- {context().permissions.edit ? 'Editable' : 'Read only'} -

- - - - - {(row) => ( - - - - - - )} - - -
{row.id}{row.details.score} - - {diagnostics.countUpdates - ? (state) => { - // Read the getter so this unit-only probe observes - // Link reactivity, rather than component execution. - void state.isActive - diagnostics.ordinaryEvaluations++ - return row.label - } - : row.label} - -
- -
Details
- - ) - } - - return createRouter({ - routeTree: root.addChildren([team.addChildren([items])]), - history: createMemoryHistory({ - initialEntries: [server ? serverUrl : clientUrl], - }), - isServer: server, - scrollRestoration: false, - defaultHashScrollIntoView: false, - defaultPreload: false, - }) -} - -declare module '@tanstack/solid-router' { - interface Register { - router: ReturnType - } -} diff --git a/benchmarks/client-nav/scenarios/hydration/solid/src/client.tsx b/benchmarks/client-nav/scenarios/hydration/solid/src/client.tsx deleted file mode 100644 index ef0f5268d6..0000000000 --- a/benchmarks/client-nav/scenarios/hydration/solid/src/client.tsx +++ /dev/null @@ -1,91 +0,0 @@ -import { sharedConfig } from 'solid-js' -import { hydrate as hydrateDOM, isServer as solidIsServer } from 'solid-js/web' -import { RouterProvider } from '@tanstack/solid-router' -import { hydrate } from '@tanstack/router-core/ssr/client' -import { isServer } from '@tanstack/router-core/isServer' -import { createDiagnostics, hashLinkCount } from '../fixture' -import { createFixtureRouter } from './app' - -export const serverEnvironment = isServer -export const solidServerEnvironment = solidIsServer -let router: ReturnType | undefined -let disposeRoot: (() => void) | undefined -let unsubscribe: (() => void) | undefined -let diagnostics = createDiagnostics() - -type HydrationWindow = Window & { - _$HY?: { done?: boolean; events?: Array; r: object } -} - -export async function start(countUpdates = false) { - if (router) { - throw new Error('A hydration sample must use a fresh client realm') - } - if (!window.$_TSR?.router) { - throw new Error('Missing SSR hydration payload') - } - const bootstrap = (window as HydrationWindow)._$HY - if (!bootstrap || bootstrap.done || sharedConfig.context) { - throw new Error('Missing or already consumed Solid hydration bootstrap') - } - diagnostics = createDiagnostics(countUpdates) - router = createFixtureRouter(false, diagnostics) - unsubscribe = router.subscribe('onRendered', () => { - diagnostics.rendered++ - }) - // Solid's RouterClient uses this core restoration API. Await it directly so - // the shell has the same component/key hierarchy as the server provider. - await hydrate(router) - window.$_TSR.h() - disposeRoot = hydrateDOM(() => , document) -} - -export function ready() { - if ( - !diagnostics.mounted || - !diagnostics.rendered || - sharedConfig.context || - router?.stores.status.get() === 'pending' - ) { - return false - } - // Each Link's onMount updates its hydration signal. Solid updates attributes - // through fine-grained effects, without rerendering the route components. - for (let index = 0; index < hashLinkCount; index++) { - const anchor = document.getElementById(`hash-${index}`) - if ( - !anchor || - anchor.getAttribute('data-status') !== (index % 2 === 0 ? 'active' : null) - ) { - return false - } - } - return true -} - -export function snapshot() { - return { - diagnostics: { - ...diagnostics, - initialHashStates: [...diagnostics.initialHashStates], - hashStates: [...diagnostics.hashStates], - }, - hydrating: !!sharedConfig.context, - location: router?.stores.location.get().href, - resolvedLocation: router?.stores.resolvedLocation.get()?.href, - matches: router?.stores.matches.get().map((match) => ({ - status: match.status, - context: match.context, - loaderData: match.loaderData, - })), - } -} - -export function dispose() { - try { - disposeRoot?.() - } finally { - unsubscribe?.() - router?.history.destroy() - } -} diff --git a/benchmarks/client-nav/scenarios/hydration/solid/src/server.tsx b/benchmarks/client-nav/scenarios/hydration/solid/src/server.tsx deleted file mode 100644 index 6052c48eac..0000000000 --- a/benchmarks/client-nav/scenarios/hydration/solid/src/server.tsx +++ /dev/null @@ -1,40 +0,0 @@ -import { RouterProvider } from '@tanstack/solid-router' -import { - createRequestHandler, - renderRouterToStream, -} from '@tanstack/solid-router/ssr/server' -import { isServer } from '@tanstack/router-core/isServer' -import { isServer as solidIsServer } from 'solid-js/web' -import { createDiagnostics, serverUrl } from '../fixture' -import { createFixtureRouter } from './app' - -export async function renderFixture() { - if ((isServer as boolean | undefined) !== true || !solidIsServer) { - throw new Error('Fixture generation requires the production server build') - } - const diagnostics = createDiagnostics() - const response = await createRequestHandler({ - createRouter: () => createFixtureRouter(true, diagnostics), - request: new Request(`http://localhost${serverUrl}`), - })(({ request, router, responseHeaders }) => - renderRouterToStream({ - request, - router, - responseHeaders, - // The route shell owns the document, as in Solid Start. Using the same - // provider tree on both sides preserves Solid's hydration key sequence. - children: () => , - }), - ) - const html = await response.text() - if ( - response.status !== 200 || - diagnostics.beforeLoads !== 3 || - diagnostics.loaders !== 2 - ) { - throw new Error( - 'SSR fixture did not execute its beforeLoad and loader functions', - ) - } - return html -} diff --git a/benchmarks/client-nav/scenarios/hydration/solid/tsconfig.json b/benchmarks/client-nav/scenarios/hydration/solid/tsconfig.json deleted file mode 100644 index daf27ddf12..0000000000 --- a/benchmarks/client-nav/scenarios/hydration/solid/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../../../../tsconfig.json", - "compilerOptions": { - "jsx": "preserve", - "jsxImportSource": "solid-js", - "allowImportingTsExtensions": true, - "types": ["node", "vite/client", "vitest/globals"] - }, - "include": ["./*.ts", "./src/**/*"] -} diff --git a/benchmarks/client-nav/scenarios/hydration/solid/vite.config.ts b/benchmarks/client-nav/scenarios/hydration/solid/vite.config.ts deleted file mode 100644 index 16e5ff95aa..0000000000 --- a/benchmarks/client-nav/scenarios/hydration/solid/vite.config.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { fileURLToPath } from 'node:url' -import { defineConfig } from 'vitest/config' -import solid from 'vite-plugin-solid' -import codspeedPlugin from '@codspeed/vitest-plugin' -import { cpuSimulationExecArgv } from '../../../../cpu-simulation' - -export default defineConfig({ - root: fileURLToPath(new URL('.', import.meta.url)), - define: { 'process.env.NODE_ENV': JSON.stringify('production') }, - plugins: [ - !!(process.env.VITEST && process.env.WITH_INSTRUMENTATION) && - codspeedPlugin(), - // The Node worker evaluates the prebuilt bundle and needs no JSX transform - // or browser test setup injected by vite-plugin-solid. - !process.env.VITEST && solid({ ssr: true, hot: false, dev: false }), - ], - resolve: { conditions: ['solid', 'browser', 'production'] }, - build: { - outDir: './dist/client', - emptyOutDir: true, - minify: false, - lib: { - entry: './src/client.tsx', - name: 'HydrationBenchmark', - formats: ['iife'], - fileName: () => 'client.js', - }, - }, - test: { - execArgv: cpuSimulationExecArgv(), - name: '@benchmarks/client-nav hydration (solid)', - watch: false, - environment: 'node', - isolate: true, - include: ['hydration.test.ts'], - benchmark: { include: ['speed.bench.ts'] }, - }, -}) diff --git a/benchmarks/client-nav/scenarios/hydration/solid/vite.server.config.ts b/benchmarks/client-nav/scenarios/hydration/solid/vite.server.config.ts deleted file mode 100644 index 9787cbb4e2..0000000000 --- a/benchmarks/client-nav/scenarios/hydration/solid/vite.server.config.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { fileURLToPath } from 'node:url' -import { defineConfig } from 'vite' -import solid from 'vite-plugin-solid' - -export default defineConfig({ - root: fileURLToPath(new URL('.', import.meta.url)), - define: { 'process.env.NODE_ENV': JSON.stringify('production') }, - plugins: [solid({ ssr: true, hot: false, dev: false })], - resolve: { conditions: ['solid', 'node', 'production'] }, - ssr: { - noExternal: true, - resolve: { conditions: ['solid', 'node', 'production'] }, - }, - build: { - ssr: true, - outDir: './dist/server', - emptyOutDir: true, - minify: false, - lib: { - entry: './src/server.tsx', - formats: ['es'], - fileName: () => 'server.js', - }, - rolldownOptions: { - platform: 'node', - external: [/^node:/], - }, - }, -}) diff --git a/benchmarks/client-nav/scenarios/link-churn/react/project.json b/benchmarks/client-nav/scenarios/link-churn/react/project.json deleted file mode 100644 index 1606b2c456..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/react/project.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "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 deleted file mode 100644 index 59221603da..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/react/setup.ts +++ /dev/null @@ -1,18 +0,0 @@ -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 deleted file mode 100644 index ca0b370528..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/react/speed.bench.ts +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index f4a0b4e6ff..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/react/speed.flame.ts +++ /dev/null @@ -1,18 +0,0 @@ -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 deleted file mode 100644 index 5febd6f795..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/react/src/main.tsx +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index 4535430b61..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/react/src/routeTree.gen.ts +++ /dev/null @@ -1,121 +0,0 @@ -/* 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 deleted file mode 100644 index 199cf1ff73..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/react/src/routes/__root.tsx +++ /dev/null @@ -1,39 +0,0 @@ -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 deleted file mode 100644 index 143cb39a7a..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/react/src/routes/hub.detail.$id.tsx +++ /dev/null @@ -1,21 +0,0 @@ -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 deleted file mode 100644 index 5aa37b20a7..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/react/src/routes/hub.list.tsx +++ /dev/null @@ -1,65 +0,0 @@ -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 deleted file mode 100644 index ac12eae2da..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/react/src/routes/hub.tsx +++ /dev/null @@ -1,64 +0,0 @@ -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 deleted file mode 100644 index 1f146b789f..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/react/src/routes/other.tsx +++ /dev/null @@ -1,14 +0,0 @@ -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 deleted file mode 100644 index 1d59cbb450..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/react/tsconfig.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "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 deleted file mode 100644 index 344974ebf9..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/react/vite.config.ts +++ /dev/null @@ -1,42 +0,0 @@ -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 deleted file mode 100644 index d936af35cc..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/shared.ts +++ /dev/null @@ -1,178 +0,0 @@ -/** - * 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 deleted file mode 100644 index 4e46143b32..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/solid/project.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "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 deleted file mode 100644 index a2a024341d..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/solid/setup.ts +++ /dev/null @@ -1,18 +0,0 @@ -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 deleted file mode 100644 index 80c4aaa6fd..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/solid/speed.bench.ts +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index f4a0b4e6ff..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/solid/speed.flame.ts +++ /dev/null @@ -1,18 +0,0 @@ -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 deleted file mode 100644 index fa9d239418..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/solid/src/main.tsx +++ /dev/null @@ -1,34 +0,0 @@ -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 deleted file mode 100644 index e3cb546963..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/solid/src/routeTree.gen.ts +++ /dev/null @@ -1,121 +0,0 @@ -/* 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 deleted file mode 100644 index a9de4ea356..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/solid/src/routes/__root.tsx +++ /dev/null @@ -1,39 +0,0 @@ -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 deleted file mode 100644 index 7aca4a9935..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/solid/src/routes/hub.detail.$id.tsx +++ /dev/null @@ -1,24 +0,0 @@ -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 deleted file mode 100644 index 5796a50b02..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/solid/src/routes/hub.list.tsx +++ /dev/null @@ -1,68 +0,0 @@ -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 deleted file mode 100644 index 4682f85aae..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/solid/src/routes/hub.tsx +++ /dev/null @@ -1,67 +0,0 @@ -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 deleted file mode 100644 index 2606089113..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/solid/src/routes/other.tsx +++ /dev/null @@ -1,14 +0,0 @@ -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 deleted file mode 100644 index 98d76ad6b8..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/solid/tsconfig.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "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 deleted file mode 100644 index 37718a2d6a..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/solid/vite.config.ts +++ /dev/null @@ -1,50 +0,0 @@ -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 deleted file mode 100644 index fb890ddfb8..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/vue/project.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "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 deleted file mode 100644 index 95cacb9ea8..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/vue/setup.ts +++ /dev/null @@ -1,18 +0,0 @@ -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 deleted file mode 100644 index dea511c24c..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/vue/speed.bench.ts +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index f4a0b4e6ff..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/vue/speed.flame.ts +++ /dev/null @@ -1,18 +0,0 @@ -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 deleted file mode 100644 index cae9b54f1d..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/vue/src/main.tsx +++ /dev/null @@ -1,41 +0,0 @@ -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 deleted file mode 100644 index 9327bbc01d..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/vue/src/routeTree.gen.ts +++ /dev/null @@ -1,121 +0,0 @@ -/* 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 deleted file mode 100644 index a4f7985c5a..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/vue/src/routes/__root.tsx +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index 4701ab44eb..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/vue/src/routes/hub.detail.$id.tsx +++ /dev/null @@ -1,27 +0,0 @@ -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 deleted file mode 100644 index 02abd6db1b..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/vue/src/routes/hub.list.tsx +++ /dev/null @@ -1,74 +0,0 @@ -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 deleted file mode 100644 index 5be17f3350..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/vue/src/routes/hub.tsx +++ /dev/null @@ -1,69 +0,0 @@ -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 deleted file mode 100644 index 08dec586fa..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/vue/src/routes/other.tsx +++ /dev/null @@ -1,17 +0,0 @@ -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 deleted file mode 100644 index 7786fc3da9..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/vue/tsconfig.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "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 deleted file mode 100644 index 8f56734e04..0000000000 --- a/benchmarks/client-nav/scenarios/link-churn/vue/vite.config.ts +++ /dev/null @@ -1,44 +0,0 @@ -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 75f5f725d4..0892308901 100644 --- a/benchmarks/client-nav/scenarios/links/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/links/react/speed.bench.ts @@ -1,19 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-links', async ({ bench }) => { - const scenario = setup() +describe('client-links', () => { + const test = setup() - await bench( + /** + * 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-links navigation loop (react)', - benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() + await test.tick() } - await scenario.finishBatch() + await test.finishBatch() }, - ).run(benchOptions) + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) }) diff --git a/benchmarks/client-nav/scenarios/links/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/links/solid/speed.bench.ts index fc7f3e71e7..a3d690b423 100644 --- a/benchmarks/client-nav/scenarios/links/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/links/solid/speed.bench.ts @@ -1,19 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-links', async ({ bench }) => { - const scenario = setup() +describe('client-links', () => { + const test = setup() - await bench( + /** + * 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-links navigation loop (solid)', - benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() + await test.tick() } - await scenario.finishBatch() + await test.finishBatch() }, - ).run(benchOptions) + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) }) 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 0da70513e8..b61431e40d 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 IndexRouteImport } from './routes/index' import { Route as AboutRouteImport } from './routes/about' +import { Route as IndexRouteImport } from './routes/index' import { Route as ItemsIdRouteImport } from './routes/items.$id' -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => rootRouteImport, -} as any) const AboutRoute = AboutRouteImport.update({ id: '/about', path: '/about', getParentRoute: () => rootRouteImport, } as any) +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', + 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 { - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport - parentRoute: typeof rootRouteImport - } '/about': { id: '/about' path: '/about' @@ -75,6 +68,13 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof AboutRouteImport parentRoute: typeof rootRouteImport } + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport + 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 2ace7a8409..e2d3f7c47a 100644 --- a/benchmarks/client-nav/scenarios/links/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/links/vue/speed.bench.ts @@ -1,19 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-links', async ({ bench }) => { - const scenario = setup() +describe('client-links', () => { + const test = setup() - await bench( + /** + * 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-links navigation loop (vue)', - benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() + await test.tick() } - await scenario.finishBatch() + await test.finishBatch() }, - ).run(benchOptions) + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) }) diff --git a/benchmarks/client-nav/scenarios/links/vue/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/links/vue/src/routeTree.gen.ts index 7d2b1e9bbb..cee64be43c 100644 --- a/benchmarks/client-nav/scenarios/links/vue/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/links/vue/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 IndexRouteImport } from './routes/index' import { Route as AboutRouteImport } from './routes/about' +import { Route as IndexRouteImport } from './routes/index' import { Route as ItemsIdRouteImport } from './routes/items.$id' -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => rootRouteImport, -} as any) const AboutRoute = AboutRouteImport.update({ id: '/about', path: '/about', getParentRoute: () => rootRouteImport, } as any) +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => rootRouteImport, +} as any) const ItemsIdRoute = ItemsIdRouteImport.update({ id: '/items/$id', path: '/items/$id', @@ -61,13 +61,6 @@ export interface RootRouteChildren { declare module '@tanstack/vue-router' { interface FileRoutesByPath { - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport - parentRoute: typeof rootRouteImport - } '/about': { id: '/about' path: '/about' @@ -75,6 +68,13 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof AboutRouteImport parentRoute: typeof rootRouteImport } + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport + parentRoute: typeof rootRouteImport + } '/items/$id': { id: '/items/$id' path: '/items/$id' diff --git a/benchmarks/client-nav/scenarios/loaders/react/speed.bench.ts b/benchmarks/client-nav/scenarios/loaders/react/speed.bench.ts index 8bcc53b88e..f5a51b29be 100644 --- a/benchmarks/client-nav/scenarios/loaders/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/loaders/react/speed.bench.ts @@ -1,19 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-loaders', async ({ bench }) => { - const scenario = setup() +describe('client-loaders', () => { + const test = setup() - await bench( + /** + * 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-loaders navigation loop (react)', - benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() + await test.tick() } - await scenario.finishBatch() + await test.finishBatch() }, - ).run(benchOptions) + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) }) diff --git a/benchmarks/client-nav/scenarios/loaders/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/loaders/solid/speed.bench.ts index 953a17b31a..9f3bd397db 100644 --- a/benchmarks/client-nav/scenarios/loaders/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/loaders/solid/speed.bench.ts @@ -1,19 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-loaders', async ({ bench }) => { - const scenario = setup() +describe('client-loaders', () => { + const test = setup() - await bench( + /** + * 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-loaders navigation loop (solid)', - benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() + await test.tick() } - await scenario.finishBatch() + await test.finishBatch() }, - ).run(benchOptions) + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) }) 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 fa5d032141..bdec400237 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 IndexRouteImport } from './routes/index' import { Route as DepsRouteImport } from './routes/deps' -import { Route as CachedIdRouteImport } from './routes/cached.$id' +import { Route as IndexRouteImport } from './routes/index' import { Route as FreshIdRouteImport } from './routes/fresh.$id' +import { Route as CachedIdRouteImport } from './routes/cached.$id' -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => rootRouteImport, -} as any) const DepsRoute = DepsRouteImport.update({ id: '/deps', path: '/deps', getParentRoute: () => rootRouteImport, } as any) -const CachedIdRoute = CachedIdRouteImport.update({ - id: '/cached/$id', - path: '/cached/$id', +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', getParentRoute: () => rootRouteImport, } as any) const FreshIdRoute = FreshIdRouteImport.update({ @@ -34,6 +29,11 @@ const FreshIdRoute = FreshIdRouteImport.update({ path: '/fresh/$id', getParentRoute: () => rootRouteImport, } as any) +const CachedIdRoute = CachedIdRouteImport.update({ + id: '/cached/$id', + path: '/cached/$id', + getParentRoute: () => rootRouteImport, +} as any) export interface FileRoutesByFullPath { '/': typeof IndexRoute @@ -71,13 +71,6 @@ export interface RootRouteChildren { declare module '@tanstack/solid-router' { interface FileRoutesByPath { - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport - parentRoute: typeof rootRouteImport - } '/deps': { id: '/deps' path: '/deps' @@ -85,11 +78,11 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof DepsRouteImport parentRoute: typeof rootRouteImport } - '/cached/$id': { - id: '/cached/$id' - path: '/cached/$id' - fullPath: '/cached/$id' - preLoaderRoute: typeof CachedIdRouteImport + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } '/fresh/$id': { @@ -99,6 +92,13 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof FreshIdRouteImport parentRoute: typeof rootRouteImport } + '/cached/$id': { + id: '/cached/$id' + path: '/cached/$id' + fullPath: '/cached/$id' + preLoaderRoute: typeof CachedIdRouteImport + 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 1ae2f89a56..819fe020b0 100644 --- a/benchmarks/client-nav/scenarios/loaders/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/loaders/vue/speed.bench.ts @@ -1,19 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-loaders', async ({ bench }) => { - const scenario = setup() +describe('client-loaders', () => { + const test = setup() - await bench( + /** + * 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-loaders navigation loop (vue)', - benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() + await test.tick() } - await scenario.finishBatch() + await test.finishBatch() }, - ).run(benchOptions) + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) }) diff --git a/benchmarks/client-nav/scenarios/loaders/vue/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/loaders/vue/src/routeTree.gen.ts index 10cb8f2aca..25a82df477 100644 --- a/benchmarks/client-nav/scenarios/loaders/vue/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/loaders/vue/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 IndexRouteImport } from './routes/index' import { Route as DepsRouteImport } from './routes/deps' -import { Route as CachedIdRouteImport } from './routes/cached.$id' +import { Route as IndexRouteImport } from './routes/index' import { Route as FreshIdRouteImport } from './routes/fresh.$id' +import { Route as CachedIdRouteImport } from './routes/cached.$id' -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => rootRouteImport, -} as any) const DepsRoute = DepsRouteImport.update({ id: '/deps', path: '/deps', getParentRoute: () => rootRouteImport, } as any) -const CachedIdRoute = CachedIdRouteImport.update({ - id: '/cached/$id', - path: '/cached/$id', +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', getParentRoute: () => rootRouteImport, } as any) const FreshIdRoute = FreshIdRouteImport.update({ @@ -34,6 +29,11 @@ const FreshIdRoute = FreshIdRouteImport.update({ path: '/fresh/$id', getParentRoute: () => rootRouteImport, } as any) +const CachedIdRoute = CachedIdRouteImport.update({ + id: '/cached/$id', + path: '/cached/$id', + getParentRoute: () => rootRouteImport, +} as any) export interface FileRoutesByFullPath { '/': typeof IndexRoute @@ -71,13 +71,6 @@ export interface RootRouteChildren { declare module '@tanstack/vue-router' { interface FileRoutesByPath { - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport - parentRoute: typeof rootRouteImport - } '/deps': { id: '/deps' path: '/deps' @@ -85,11 +78,11 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof DepsRouteImport parentRoute: typeof rootRouteImport } - '/cached/$id': { - id: '/cached/$id' - path: '/cached/$id' - fullPath: '/cached/$id' - preLoaderRoute: typeof CachedIdRouteImport + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } '/fresh/$id': { @@ -99,6 +92,13 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof FreshIdRouteImport parentRoute: typeof rootRouteImport } + '/cached/$id': { + id: '/cached/$id' + path: '/cached/$id' + fullPath: '/cached/$id' + preLoaderRoute: typeof CachedIdRouteImport + parentRoute: typeof rootRouteImport + } } } diff --git a/benchmarks/client-nav/scenarios/mount/react/speed.bench.ts b/benchmarks/client-nav/scenarios/mount/react/speed.bench.ts index 6c3a64b026..2d675ff259 100644 --- a/benchmarks/client-nav/scenarios/mount/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/mount/react/speed.bench.ts @@ -1,19 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-mount', async ({ bench }) => { - const scenario = setup() +describe('client-mount', () => { + const test = setup() - await bench( + /** + * 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 (react)', - benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() + await test.tick() } - await scenario.finishBatch() + await test.finishBatch() }, - ).run(benchOptions) + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) }) diff --git a/benchmarks/client-nav/scenarios/mount/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/mount/solid/speed.bench.ts index 236f875f57..eaf7f1ed34 100644 --- a/benchmarks/client-nav/scenarios/mount/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/mount/solid/speed.bench.ts @@ -1,19 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-mount', async ({ bench }) => { - const scenario = setup() +describe('client-mount', () => { + const test = setup() - await bench( + /** + * 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 (solid)', - benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() + await test.tick() } - await scenario.finishBatch() + await test.finishBatch() }, - ).run(benchOptions) + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) }) 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 30247636dd..dc0acc183d 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 IndexRouteImport } from './routes/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 BlogSlugRouteImport } from './routes/blog.$slug' +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 BlogIndexRouteImport } from './routes/blog.index' import { Route as ShopProductIdRouteImport } from './routes/shop.$productId' +import { Route as BlogSlugRouteImport } from './routes/blog.$slug' -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => rootRouteImport, -} as any) -const AboutRoute = AboutRouteImport.update({ - id: '/about', - path: '/about', - getParentRoute: () => rootRouteImport, -} as any) -const BlogRoute = BlogRouteImport.update({ - id: '/blog', - path: '/blog', - getParentRoute: () => rootRouteImport, -} as any) -const SearchRoute = SearchRouteImport.update({ - id: '/search', - path: '/search', +const ShopRoute = ShopRouteImport.update({ + id: '/shop', + path: '/shop', getParentRoute: () => rootRouteImport, } as any) const SettingsRoute = SettingsRouteImport.update({ @@ -45,31 +30,46 @@ const SettingsRoute = SettingsRouteImport.update({ path: '/settings', getParentRoute: () => rootRouteImport, } as any) -const ShopRoute = ShopRouteImport.update({ - id: '/shop', - path: '/shop', +const SearchRoute = SearchRouteImport.update({ + id: '/search', + path: '/search', getParentRoute: () => rootRouteImport, } as any) -const BlogIndexRoute = BlogIndexRouteImport.update({ +const BlogRoute = BlogRouteImport.update({ + id: '/blog', + path: '/blog', + getParentRoute: () => rootRouteImport, +} as any) +const AboutRoute = AboutRouteImport.update({ + id: '/about', + path: '/about', + getParentRoute: () => rootRouteImport, +} as any) +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', - getParentRoute: () => BlogRoute, -} as any) -const BlogSlugRoute = BlogSlugRouteImport.update({ - id: '/$slug', - path: '/$slug', - getParentRoute: () => BlogRoute, + getParentRoute: () => rootRouteImport, } as any) const ShopIndexRoute = ShopIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => ShopRoute, } 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) export interface FileRoutesByFullPath { '/': typeof IndexRoute @@ -154,32 +154,11 @@ export interface RootRouteChildren { declare module '@tanstack/solid-router' { interface FileRoutesByPath { - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport - parentRoute: typeof rootRouteImport - } - '/about': { - id: '/about' - path: '/about' - fullPath: '/about' - preLoaderRoute: typeof AboutRouteImport - parentRoute: typeof rootRouteImport - } - '/blog': { - id: '/blog' - path: '/blog' - fullPath: '/blog' - preLoaderRoute: typeof BlogRouteImport - parentRoute: typeof rootRouteImport - } - '/search': { - id: '/search' - path: '/search' - fullPath: '/search' - preLoaderRoute: typeof SearchRouteImport + '/shop': { + id: '/shop' + path: '/shop' + fullPath: '/shop' + preLoaderRoute: typeof ShopRouteImport parentRoute: typeof rootRouteImport } '/settings': { @@ -189,26 +168,33 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof SettingsRouteImport parentRoute: typeof rootRouteImport } - '/shop': { - id: '/shop' - path: '/shop' - fullPath: '/shop' - preLoaderRoute: typeof ShopRouteImport + '/search': { + id: '/search' + path: '/search' + fullPath: '/search' + preLoaderRoute: typeof SearchRouteImport parentRoute: typeof rootRouteImport } - '/blog/': { - id: '/blog/' - path: '/' - fullPath: '/blog/' - preLoaderRoute: typeof BlogIndexRouteImport - parentRoute: typeof BlogRoute + '/blog': { + id: '/blog' + path: '/blog' + fullPath: '/blog' + preLoaderRoute: typeof BlogRouteImport + parentRoute: typeof rootRouteImport } - '/blog/$slug': { - id: '/blog/$slug' - path: '/$slug' - fullPath: '/blog/$slug' - preLoaderRoute: typeof BlogSlugRouteImport - parentRoute: typeof BlogRoute + '/about': { + id: '/about' + path: '/about' + fullPath: '/about' + preLoaderRoute: typeof AboutRouteImport + parentRoute: typeof rootRouteImport + } + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport + parentRoute: typeof rootRouteImport } '/shop/': { id: '/shop/' @@ -217,6 +203,13 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof ShopIndexRouteImport parentRoute: typeof ShopRoute } + '/blog/': { + id: '/blog/' + path: '/' + fullPath: '/blog/' + preLoaderRoute: typeof BlogIndexRouteImport + parentRoute: typeof BlogRoute + } '/shop/$productId': { id: '/shop/$productId' path: '/$productId' @@ -224,6 +217,13 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof ShopProductIdRouteImport parentRoute: typeof ShopRoute } + '/blog/$slug': { + id: '/blog/$slug' + path: '/$slug' + fullPath: '/blog/$slug' + preLoaderRoute: typeof BlogSlugRouteImport + parentRoute: typeof BlogRoute + } } } diff --git a/benchmarks/client-nav/scenarios/mount/vue/speed.bench.ts b/benchmarks/client-nav/scenarios/mount/vue/speed.bench.ts index d9268ba91b..f5538dd49c 100644 --- a/benchmarks/client-nav/scenarios/mount/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/mount/vue/speed.bench.ts @@ -1,15 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-mount', async ({ bench }) => { - const scenario = setup() +describe('client-mount', () => { + const test = setup() - await bench('client-mount loop (vue)', benchLifecycle(scenario), async () => { - for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() - } - await scenario.finishBatch() - }).run(benchOptions) + /** + * 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, + }, + ) }) diff --git a/benchmarks/client-nav/scenarios/mount/vue/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/mount/vue/src/routeTree.gen.ts index cd27c917e1..98643d63c9 100644 --- a/benchmarks/client-nav/scenarios/mount/vue/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/mount/vue/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 IndexRouteImport } from './routes/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 BlogSlugRouteImport } from './routes/blog.$slug' +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 BlogIndexRouteImport } from './routes/blog.index' import { Route as ShopProductIdRouteImport } from './routes/shop.$productId' +import { Route as BlogSlugRouteImport } from './routes/blog.$slug' -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => rootRouteImport, -} as any) -const AboutRoute = AboutRouteImport.update({ - id: '/about', - path: '/about', - getParentRoute: () => rootRouteImport, -} as any) -const BlogRoute = BlogRouteImport.update({ - id: '/blog', - path: '/blog', - getParentRoute: () => rootRouteImport, -} as any) -const SearchRoute = SearchRouteImport.update({ - id: '/search', - path: '/search', +const ShopRoute = ShopRouteImport.update({ + id: '/shop', + path: '/shop', getParentRoute: () => rootRouteImport, } as any) const SettingsRoute = SettingsRouteImport.update({ @@ -45,31 +30,46 @@ const SettingsRoute = SettingsRouteImport.update({ path: '/settings', getParentRoute: () => rootRouteImport, } as any) -const ShopRoute = ShopRouteImport.update({ - id: '/shop', - path: '/shop', +const SearchRoute = SearchRouteImport.update({ + id: '/search', + path: '/search', getParentRoute: () => rootRouteImport, } as any) -const BlogIndexRoute = BlogIndexRouteImport.update({ +const BlogRoute = BlogRouteImport.update({ + id: '/blog', + path: '/blog', + getParentRoute: () => rootRouteImport, +} as any) +const AboutRoute = AboutRouteImport.update({ + id: '/about', + path: '/about', + getParentRoute: () => rootRouteImport, +} as any) +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', - getParentRoute: () => BlogRoute, -} as any) -const BlogSlugRoute = BlogSlugRouteImport.update({ - id: '/$slug', - path: '/$slug', - getParentRoute: () => BlogRoute, + getParentRoute: () => rootRouteImport, } as any) const ShopIndexRoute = ShopIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => ShopRoute, } 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) export interface FileRoutesByFullPath { '/': typeof IndexRoute @@ -154,32 +154,11 @@ export interface RootRouteChildren { declare module '@tanstack/vue-router' { interface FileRoutesByPath { - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport - parentRoute: typeof rootRouteImport - } - '/about': { - id: '/about' - path: '/about' - fullPath: '/about' - preLoaderRoute: typeof AboutRouteImport - parentRoute: typeof rootRouteImport - } - '/blog': { - id: '/blog' - path: '/blog' - fullPath: '/blog' - preLoaderRoute: typeof BlogRouteImport - parentRoute: typeof rootRouteImport - } - '/search': { - id: '/search' - path: '/search' - fullPath: '/search' - preLoaderRoute: typeof SearchRouteImport + '/shop': { + id: '/shop' + path: '/shop' + fullPath: '/shop' + preLoaderRoute: typeof ShopRouteImport parentRoute: typeof rootRouteImport } '/settings': { @@ -189,26 +168,33 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof SettingsRouteImport parentRoute: typeof rootRouteImport } - '/shop': { - id: '/shop' - path: '/shop' - fullPath: '/shop' - preLoaderRoute: typeof ShopRouteImport + '/search': { + id: '/search' + path: '/search' + fullPath: '/search' + preLoaderRoute: typeof SearchRouteImport parentRoute: typeof rootRouteImport } - '/blog/': { - id: '/blog/' - path: '/' - fullPath: '/blog/' - preLoaderRoute: typeof BlogIndexRouteImport - parentRoute: typeof BlogRoute + '/blog': { + id: '/blog' + path: '/blog' + fullPath: '/blog' + preLoaderRoute: typeof BlogRouteImport + parentRoute: typeof rootRouteImport } - '/blog/$slug': { - id: '/blog/$slug' - path: '/$slug' - fullPath: '/blog/$slug' - preLoaderRoute: typeof BlogSlugRouteImport - parentRoute: typeof BlogRoute + '/about': { + id: '/about' + path: '/about' + fullPath: '/about' + preLoaderRoute: typeof AboutRouteImport + parentRoute: typeof rootRouteImport + } + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport + parentRoute: typeof rootRouteImport } '/shop/': { id: '/shop/' @@ -217,6 +203,13 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof ShopIndexRouteImport parentRoute: typeof ShopRoute } + '/blog/': { + id: '/blog/' + path: '/' + fullPath: '/blog/' + preLoaderRoute: typeof BlogIndexRouteImport + parentRoute: typeof BlogRoute + } '/shop/$productId': { id: '/shop/$productId' path: '/$productId' @@ -224,6 +217,13 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof ShopProductIdRouteImport parentRoute: typeof ShopRoute } + '/blog/$slug': { + id: '/blog/$slug' + path: '/$slug' + fullPath: '/blog/$slug' + preLoaderRoute: typeof BlogSlugRouteImport + parentRoute: typeof BlogRoute + } } } 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 fa5809c1fd..3dfe93c117 100644 --- a/benchmarks/client-nav/scenarios/nested-params/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/nested-params/react/speed.bench.ts @@ -1,19 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-nested-params', async ({ bench }) => { - const scenario = setup() +describe('client-nested-params', () => { + const test = setup() - await bench( + /** + * 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-nested-params navigation loop (react)', - benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() + await test.tick() } - await scenario.finishBatch() + await test.finishBatch() }, - ).run(benchOptions) + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) }) 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 2c64d9a221..dc7ec11f6b 100644 --- a/benchmarks/client-nav/scenarios/nested-params/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/nested-params/solid/speed.bench.ts @@ -1,19 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-nested-params', async ({ bench }) => { - const scenario = setup() +describe('client-nested-params', () => { + const test = setup() - await bench( + /** + * 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-nested-params navigation loop (solid)', - benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() + await test.tick() } - await scenario.finishBatch() + await test.finishBatch() }, - ).run(benchOptions) + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) }) 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 bd3e82e070..fcb336d1db 100644 --- a/benchmarks/client-nav/scenarios/nested-params/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/nested-params/vue/speed.bench.ts @@ -1,19 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-nested-params', async ({ bench }) => { - const scenario = setup() +describe('client-nested-params', () => { + const test = setup() - await bench( + /** + * 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-nested-params navigation loop (vue)', - benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() + await test.tick() } - await scenario.finishBatch() + await test.finishBatch() }, - ).run(benchOptions) + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) }) diff --git a/benchmarks/client-nav/scenarios/preload/react/speed.bench.ts b/benchmarks/client-nav/scenarios/preload/react/speed.bench.ts index 5c210b2fd7..5b188a0a0b 100644 --- a/benchmarks/client-nav/scenarios/preload/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/preload/react/speed.bench.ts @@ -1,19 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-preload', async ({ bench }) => { - const scenario = setup() +describe('client-preload', () => { + const test = setup() - await bench( + /** + * 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-preload interaction loop (react)', - benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() + await test.tick() } - await scenario.finishBatch() + await test.finishBatch() }, - ).run(benchOptions) + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) }) diff --git a/benchmarks/client-nav/scenarios/preload/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/preload/solid/speed.bench.ts index f835b4a7b9..267c9fd41d 100644 --- a/benchmarks/client-nav/scenarios/preload/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/preload/solid/speed.bench.ts @@ -1,19 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-preload', async ({ bench }) => { - const scenario = setup() +describe('client-preload', () => { + const test = setup() - await bench( + /** + * 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-preload interaction loop (solid)', - benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() + await test.tick() } - await scenario.finishBatch() + await test.finishBatch() }, - ).run(benchOptions) + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) }) 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 97e215b6da..645d925238 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 IndexRouteImport } from './routes/index' import { Route as DocsRouteImport } from './routes/docs' +import { Route as IndexRouteImport } from './routes/index' import { Route as SectionsSectionRouteImport } from './routes/sections.$section' -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => rootRouteImport, -} as any) const DocsRoute = DocsRouteImport.update({ id: '/docs', path: '/docs', getParentRoute: () => rootRouteImport, } as any) +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', + 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 { - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport - parentRoute: typeof rootRouteImport - } '/docs': { id: '/docs' path: '/docs' @@ -75,6 +68,13 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof DocsRouteImport parentRoute: typeof rootRouteImport } + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport + 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 e0ec83619b..38a2e9e664 100644 --- a/benchmarks/client-nav/scenarios/preload/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/preload/vue/speed.bench.ts @@ -1,19 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-preload', async ({ bench }) => { - const scenario = setup() +describe('client-preload', () => { + const test = setup() - await bench( + /** + * 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-preload interaction loop (vue)', - benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() + await test.tick() } - await scenario.finishBatch() + await test.finishBatch() }, - ).run(benchOptions) + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) }) diff --git a/benchmarks/client-nav/scenarios/preload/vue/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/preload/vue/src/routeTree.gen.ts index 5f95d09da0..05a751060b 100644 --- a/benchmarks/client-nav/scenarios/preload/vue/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/preload/vue/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 IndexRouteImport } from './routes/index' import { Route as DocsRouteImport } from './routes/docs' +import { Route as IndexRouteImport } from './routes/index' import { Route as SectionsSectionRouteImport } from './routes/sections.$section' -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => rootRouteImport, -} as any) const DocsRoute = DocsRouteImport.update({ id: '/docs', path: '/docs', getParentRoute: () => rootRouteImport, } as any) +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => rootRouteImport, +} as any) const SectionsSectionRoute = SectionsSectionRouteImport.update({ id: '/sections/$section', path: '/sections/$section', @@ -61,13 +61,6 @@ export interface RootRouteChildren { declare module '@tanstack/vue-router' { interface FileRoutesByPath { - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport - parentRoute: typeof rootRouteImport - } '/docs': { id: '/docs' path: '/docs' @@ -75,6 +68,13 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof DocsRouteImport parentRoute: typeof rootRouteImport } + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport + parentRoute: typeof rootRouteImport + } '/sections/$section': { id: '/sections/$section' path: '/sections/$section' diff --git a/benchmarks/client-nav/scenarios/rewrites/react/speed.bench.ts b/benchmarks/client-nav/scenarios/rewrites/react/speed.bench.ts index dd1b6f3686..8e79c6db7e 100644 --- a/benchmarks/client-nav/scenarios/rewrites/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/rewrites/react/speed.bench.ts @@ -1,19 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-rewrites', async ({ bench }) => { - const scenario = setup() +describe('client-rewrites', () => { + const test = setup() - await bench( + /** + * 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-rewrites navigation loop (react)', - benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() + await test.tick() } - await scenario.finishBatch() + await test.finishBatch() }, - ).run(benchOptions) + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) }) diff --git a/benchmarks/client-nav/scenarios/rewrites/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/rewrites/solid/speed.bench.ts index 9c4313e2ff..cf70bcaa40 100644 --- a/benchmarks/client-nav/scenarios/rewrites/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/rewrites/solid/speed.bench.ts @@ -1,19 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-rewrites', async ({ bench }) => { - const scenario = setup() +describe('client-rewrites', () => { + const test = setup() - await bench( + /** + * 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-rewrites navigation loop (solid)', - benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() + await test.tick() } - await scenario.finishBatch() + await test.finishBatch() }, - ).run(benchOptions) + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) }) diff --git a/benchmarks/client-nav/scenarios/rewrites/vue/speed.bench.ts b/benchmarks/client-nav/scenarios/rewrites/vue/speed.bench.ts index e96aff39eb..2dc9eb2679 100644 --- a/benchmarks/client-nav/scenarios/rewrites/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/rewrites/vue/speed.bench.ts @@ -1,19 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-rewrites', async ({ bench }) => { - const scenario = setup() +describe('client-rewrites', () => { + const test = setup() - await bench( + /** + * 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-rewrites navigation loop (vue)', - benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() + await test.tick() } - await scenario.finishBatch() + await test.finishBatch() }, - ).run(benchOptions) + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) }) 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 6f4b448775..337ba35b73 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,19 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-route-tree-scale', async ({ bench }) => { - const scenario = setup() +describe('client-route-tree-scale', () => { + const test = setup() - await bench( + /** + * 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-route-tree-scale navigation loop (react)', - benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() + await test.tick() } - await scenario.finishBatch() + await test.finishBatch() }, - ).run(benchOptions) + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) }) 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 9244ef1350..545b501617 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,19 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-route-tree-scale', async ({ bench }) => { - const scenario = setup() +describe('client-route-tree-scale', () => { + const test = setup() - await bench( + /** + * 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-route-tree-scale navigation loop (solid)', - benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() + await test.tick() } - await scenario.finishBatch() + await test.finishBatch() }, - ).run(benchOptions) + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) }) 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 e6f3596562..20b4af6146 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,72 +9,48 @@ // 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 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 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 SecFIdRouteImport } from './routes/sec-f.$id' -import { Route as SecFAboutRouteImport } from './routes/sec-f.about' +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 marketingPricingRouteImport } from './routes/(marketing)/pricing' -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => rootRouteImport, -} as any) -const LayoutRoute = LayoutRouteImport.update({ - id: '/_layout', - getParentRoute: () => rootRouteImport, -} as any) -const SecARoute = SecARouteImport.update({ - id: '/sec-a', - path: '/sec-a', - getParentRoute: () => rootRouteImport, -} as any) -const SecBRoute = SecBRouteImport.update({ - id: '/sec-b', - path: '/sec-b', - getParentRoute: () => rootRouteImport, -} as any) -const SecCRoute = SecCRouteImport.update({ - id: '/sec-c', - path: '/sec-c', - getParentRoute: () => rootRouteImport, -} as any) -const SecDRoute = SecDRouteImport.update({ - id: '/sec-d', - path: '/sec-d', +const SecFRoute = SecFRouteImport.update({ + id: '/sec-f', + path: '/sec-f', getParentRoute: () => rootRouteImport, } as any) const SecERoute = SecERouteImport.update({ @@ -82,150 +58,68 @@ const SecERoute = SecERouteImport.update({ path: '/sec-e', getParentRoute: () => rootRouteImport, } as any) -const SecFRoute = SecFRouteImport.update({ - id: '/sec-f', - path: '/sec-f', +const SecDRoute = SecDRouteImport.update({ + id: '/sec-d', + path: '/sec-d', getParentRoute: () => rootRouteImport, } as any) -const marketingPricingRoute = marketingPricingRouteImport.update({ - id: '/(marketing)/pricing', - path: '/pricing', +const SecCRoute = SecCRouteImport.update({ + id: '/sec-c', + path: '/sec-c', getParentRoute: () => rootRouteImport, } as any) -const marketingPromoRoute = marketingPromoRouteImport.update({ - id: '/(marketing)/promo', - path: '/promo', +const SecBRoute = SecBRouteImport.update({ + id: '/sec-b', + path: '/sec-b', getParentRoute: () => rootRouteImport, } as any) -const LayoutAlphaRoute = LayoutAlphaRouteImport.update({ - id: '/alpha', - path: '/alpha', - getParentRoute: () => LayoutRoute, -} as any) -const LayoutBetaRoute = LayoutBetaRouteImport.update({ - id: '/beta', - path: '/beta', - getParentRoute: () => LayoutRoute, -} as any) -const FilesSplatRoute = FilesSplatRouteImport.update({ - id: '/files/$', - path: '/files/$', +const SecARoute = SecARouteImport.update({ + id: '/sec-a', + path: '/sec-a', getParentRoute: () => rootRouteImport, } as any) -const ReleaseVChar123versionChar125Route = - ReleaseVChar123versionChar125RouteImport.update({ - id: '/release/v{$version}', - path: '/release/v{$version}', - getParentRoute: () => rootRouteImport, - } as any) -const SecAIndexRoute = SecAIndexRouteImport.update({ +const LayoutRoute = LayoutRouteImport.update({ + id: '/_layout', + getParentRoute: () => rootRouteImport, +} as any) +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', - getParentRoute: () => SecARoute, -} as any) -const SecAIdRoute = SecAIdRouteImport.update({ - id: '/$id', - path: '/$id', - getParentRoute: () => SecARoute, -} as any) -const SecAAboutRoute = SecAAboutRouteImport.update({ - id: '/about', - path: '/about', - getParentRoute: () => SecARoute, -} as any) -const SecASettingsRoute = SecASettingsRouteImport.update({ - id: '/settings', - path: '/settings', - getParentRoute: () => SecARoute, -} as any) -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, + getParentRoute: () => rootRouteImport, } as any) const SecFIndexRoute = SecFIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => SecFRoute, } as any) -const SecFIdRoute = SecFIdRouteImport.update({ - id: '/$id', - path: '/$id', +const SecEIndexRoute = SecEIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => SecERoute, +} as any) +const SecDIndexRoute = SecDIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => SecDRoute, +} as any) +const SecCIndexRoute = SecCIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => SecCRoute, +} as any) +const SecBIndexRoute = SecBIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => SecBRoute, +} as any) +const SecAIndexRoute = SecAIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => SecARoute, +} as any) +const SecFSettingsRoute = SecFSettingsRouteImport.update({ + id: '/settings', + path: '/settings', getParentRoute: () => SecFRoute, } as any) const SecFAboutRoute = SecFAboutRouteImport.update({ @@ -233,10 +127,116 @@ const SecFAboutRoute = SecFAboutRouteImport.update({ path: '/about', getParentRoute: () => SecFRoute, } as any) -const SecFSettingsRoute = SecFSettingsRouteImport.update({ +const SecFIdRoute = SecFIdRouteImport.update({ + id: '/$id', + path: '/$id', + getParentRoute: () => SecFRoute, +} as any) +const SecESettingsRoute = SecESettingsRouteImport.update({ id: '/settings', path: '/settings', - getParentRoute: () => SecFRoute, + 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, +} as any) +const ReleaseVChar123versionChar125Route = + ReleaseVChar123versionChar125RouteImport.update({ + id: '/release/v{$version}', + path: '/release/v{$version}', + getParentRoute: () => rootRouteImport, + } as any) +const FilesSplatRoute = FilesSplatRouteImport.update({ + id: '/files/$', + path: '/files/$', + getParentRoute: () => rootRouteImport, +} as any) +const LayoutBetaRoute = LayoutBetaRouteImport.update({ + id: '/beta', + path: '/beta', + getParentRoute: () => LayoutRoute, +} as any) +const LayoutAlphaRoute = LayoutAlphaRouteImport.update({ + id: '/alpha', + path: '/alpha', + getParentRoute: () => LayoutRoute, +} as any) +const marketingPromoRoute = marketingPromoRouteImport.update({ + id: '/(marketing)/promo', + path: '/promo', + getParentRoute: () => rootRouteImport, +} as any) +const marketingPricingRoute = marketingPricingRouteImport.update({ + id: '/(marketing)/pricing', + path: '/pricing', + getParentRoute: () => rootRouteImport, } as any) export interface FileRoutesByFullPath { @@ -484,46 +484,11 @@ export interface RootRouteChildren { declare module '@tanstack/solid-router' { interface FileRoutesByPath { - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport - parentRoute: typeof rootRouteImport - } - '/_layout': { - id: '/_layout' - path: '' - fullPath: '/' - preLoaderRoute: typeof LayoutRouteImport - parentRoute: typeof rootRouteImport - } - '/sec-a': { - id: '/sec-a' - path: '/sec-a' - fullPath: '/sec-a' - preLoaderRoute: typeof SecARouteImport - parentRoute: typeof rootRouteImport - } - '/sec-b': { - id: '/sec-b' - path: '/sec-b' - fullPath: '/sec-b' - preLoaderRoute: typeof SecBRouteImport - parentRoute: typeof rootRouteImport - } - '/sec-c': { - id: '/sec-c' - path: '/sec-c' - fullPath: '/sec-c' - preLoaderRoute: typeof SecCRouteImport - parentRoute: typeof rootRouteImport - } - '/sec-d': { - id: '/sec-d' - path: '/sec-d' - fullPath: '/sec-d' - preLoaderRoute: typeof SecDRouteImport + '/sec-f': { + id: '/sec-f' + path: '/sec-f' + fullPath: '/sec-f' + preLoaderRoute: typeof SecFRouteImport parentRoute: typeof rootRouteImport } '/sec-e': { @@ -533,194 +498,47 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof SecERouteImport parentRoute: typeof rootRouteImport } - '/sec-f': { - id: '/sec-f' - path: '/sec-f' - fullPath: '/sec-f' - preLoaderRoute: typeof SecFRouteImport + '/sec-d': { + id: '/sec-d' + path: '/sec-d' + fullPath: '/sec-d' + preLoaderRoute: typeof SecDRouteImport parentRoute: typeof rootRouteImport } - '/(marketing)/pricing': { - id: '/(marketing)/pricing' - path: '/pricing' - fullPath: '/pricing' - preLoaderRoute: typeof marketingPricingRouteImport + '/sec-c': { + id: '/sec-c' + path: '/sec-c' + fullPath: '/sec-c' + preLoaderRoute: typeof SecCRouteImport parentRoute: typeof rootRouteImport } - '/(marketing)/promo': { - id: '/(marketing)/promo' - path: '/promo' - fullPath: '/promo' - preLoaderRoute: typeof marketingPromoRouteImport + '/sec-b': { + id: '/sec-b' + path: '/sec-b' + fullPath: '/sec-b' + preLoaderRoute: typeof SecBRouteImport 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 + '/sec-a': { + id: '/sec-a' + path: '/sec-a' + fullPath: '/sec-a' + preLoaderRoute: typeof SecARouteImport parentRoute: typeof rootRouteImport } - '/release/v{$version}': { - id: '/release/v{$version}' - path: '/release/v{$version}' - fullPath: '/release/v{$version}' - preLoaderRoute: typeof ReleaseVChar123versionChar125RouteImport + '/_layout': { + id: '/_layout' + path: '' + fullPath: '/' + preLoaderRoute: typeof LayoutRouteImport parentRoute: typeof rootRouteImport } - '/sec-a/': { - id: '/sec-a/' + '/': { + id: '/' path: '/' - fullPath: '/sec-a/' - preLoaderRoute: typeof SecAIndexRouteImport - parentRoute: typeof SecARoute - } - '/sec-a/$id': { - id: '/sec-a/$id' - path: '/$id' - fullPath: '/sec-a/$id' - preLoaderRoute: typeof SecAIdRouteImport - parentRoute: typeof SecARoute - } - '/sec-a/about': { - id: '/sec-a/about' - path: '/about' - fullPath: '/sec-a/about' - preLoaderRoute: typeof SecAAboutRouteImport - parentRoute: typeof SecARoute - } - '/sec-a/settings': { - id: '/sec-a/settings' - path: '/settings' - fullPath: '/sec-a/settings' - preLoaderRoute: typeof SecASettingsRouteImport - parentRoute: typeof SecARoute - } - '/sec-b/': { - id: '/sec-b/' - path: '/' - fullPath: '/sec-b/' - preLoaderRoute: typeof SecBIndexRouteImport - parentRoute: typeof SecBRoute - } - '/sec-b/$id': { - id: '/sec-b/$id' - path: '/$id' - fullPath: '/sec-b/$id' - preLoaderRoute: typeof SecBIdRouteImport - parentRoute: typeof SecBRoute - } - '/sec-b/about': { - id: '/sec-b/about' - path: '/about' - fullPath: '/sec-b/about' - preLoaderRoute: typeof SecBAboutRouteImport - parentRoute: typeof SecBRoute - } - '/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 + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport + parentRoute: typeof rootRouteImport } '/sec-f/': { id: '/sec-f/' @@ -729,11 +547,46 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof SecFIndexRouteImport parentRoute: typeof SecFRoute } - '/sec-f/$id': { - id: '/sec-f/$id' - path: '/$id' - fullPath: '/sec-f/$id' - preLoaderRoute: typeof SecFIdRouteImport + '/sec-e/': { + id: '/sec-e/' + path: '/' + fullPath: '/sec-e/' + preLoaderRoute: typeof SecEIndexRouteImport + parentRoute: typeof SecERoute + } + '/sec-d/': { + id: '/sec-d/' + path: '/' + fullPath: '/sec-d/' + preLoaderRoute: typeof SecDIndexRouteImport + parentRoute: typeof SecDRoute + } + '/sec-c/': { + id: '/sec-c/' + path: '/' + fullPath: '/sec-c/' + preLoaderRoute: typeof SecCIndexRouteImport + parentRoute: typeof SecCRoute + } + '/sec-b/': { + id: '/sec-b/' + path: '/' + fullPath: '/sec-b/' + preLoaderRoute: typeof SecBIndexRouteImport + parentRoute: typeof SecBRoute + } + '/sec-a/': { + id: '/sec-a/' + path: '/' + fullPath: '/sec-a/' + 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': { @@ -743,13 +596,160 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof SecFAboutRouteImport parentRoute: typeof SecFRoute } - '/sec-f/settings': { - id: '/sec-f/settings' - path: '/settings' - fullPath: '/sec-f/settings' - preLoaderRoute: typeof SecFSettingsRouteImport + '/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' + fullPath: '/sec-a/$id' + 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 + } + '/files/$': { + id: '/files/$' + path: '/files/$' + fullPath: '/files/$' + preLoaderRoute: typeof FilesSplatRouteImport + parentRoute: typeof rootRouteImport + } + '/_layout/beta': { + id: '/_layout/beta' + path: '/beta' + fullPath: '/beta' + preLoaderRoute: typeof LayoutBetaRouteImport + parentRoute: typeof LayoutRoute + } + '/_layout/alpha': { + id: '/_layout/alpha' + path: '/alpha' + fullPath: '/alpha' + preLoaderRoute: typeof LayoutAlphaRouteImport + parentRoute: typeof LayoutRoute + } + '/(marketing)/promo': { + id: '/(marketing)/promo' + path: '/promo' + fullPath: '/promo' + preLoaderRoute: typeof marketingPromoRouteImport + parentRoute: typeof rootRouteImport + } + '/(marketing)/pricing': { + id: '/(marketing)/pricing' + path: '/pricing' + fullPath: '/pricing' + preLoaderRoute: typeof marketingPricingRouteImport + parentRoute: typeof rootRouteImport + } } } 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 331e8e008f..9365231579 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,19 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-route-tree-scale', async ({ bench }) => { - const scenario = setup() +describe('client-route-tree-scale', () => { + const test = setup() - await bench( + /** + * 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-route-tree-scale navigation loop (vue)', - benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() + await test.tick() } - await scenario.finishBatch() + await test.finishBatch() }, - ).run(benchOptions) + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) }) diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routeTree.gen.ts index a12f981bb4..a03c051a79 100644 --- a/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/src/routeTree.gen.ts @@ -9,72 +9,48 @@ // 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 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 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 SecFIdRouteImport } from './routes/sec-f.$id' -import { Route as SecFAboutRouteImport } from './routes/sec-f.about' +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 marketingPricingRouteImport } from './routes/(marketing)/pricing' -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => rootRouteImport, -} as any) -const LayoutRoute = LayoutRouteImport.update({ - id: '/_layout', - getParentRoute: () => rootRouteImport, -} as any) -const SecARoute = SecARouteImport.update({ - id: '/sec-a', - path: '/sec-a', - getParentRoute: () => rootRouteImport, -} as any) -const SecBRoute = SecBRouteImport.update({ - id: '/sec-b', - path: '/sec-b', - getParentRoute: () => rootRouteImport, -} as any) -const SecCRoute = SecCRouteImport.update({ - id: '/sec-c', - path: '/sec-c', - getParentRoute: () => rootRouteImport, -} as any) -const SecDRoute = SecDRouteImport.update({ - id: '/sec-d', - path: '/sec-d', +const SecFRoute = SecFRouteImport.update({ + id: '/sec-f', + path: '/sec-f', getParentRoute: () => rootRouteImport, } as any) const SecERoute = SecERouteImport.update({ @@ -82,150 +58,68 @@ const SecERoute = SecERouteImport.update({ path: '/sec-e', getParentRoute: () => rootRouteImport, } as any) -const SecFRoute = SecFRouteImport.update({ - id: '/sec-f', - path: '/sec-f', +const SecDRoute = SecDRouteImport.update({ + id: '/sec-d', + path: '/sec-d', getParentRoute: () => rootRouteImport, } as any) -const marketingPricingRoute = marketingPricingRouteImport.update({ - id: '/(marketing)/pricing', - path: '/pricing', +const SecCRoute = SecCRouteImport.update({ + id: '/sec-c', + path: '/sec-c', getParentRoute: () => rootRouteImport, } as any) -const marketingPromoRoute = marketingPromoRouteImport.update({ - id: '/(marketing)/promo', - path: '/promo', +const SecBRoute = SecBRouteImport.update({ + id: '/sec-b', + path: '/sec-b', getParentRoute: () => rootRouteImport, } as any) -const LayoutAlphaRoute = LayoutAlphaRouteImport.update({ - id: '/alpha', - path: '/alpha', - getParentRoute: () => LayoutRoute, -} as any) -const LayoutBetaRoute = LayoutBetaRouteImport.update({ - id: '/beta', - path: '/beta', - getParentRoute: () => LayoutRoute, -} as any) -const FilesSplatRoute = FilesSplatRouteImport.update({ - id: '/files/$', - path: '/files/$', +const SecARoute = SecARouteImport.update({ + id: '/sec-a', + path: '/sec-a', getParentRoute: () => rootRouteImport, } as any) -const ReleaseVChar123versionChar125Route = - ReleaseVChar123versionChar125RouteImport.update({ - id: '/release/v{$version}', - path: '/release/v{$version}', - getParentRoute: () => rootRouteImport, - } as any) -const SecAIndexRoute = SecAIndexRouteImport.update({ +const LayoutRoute = LayoutRouteImport.update({ + id: '/_layout', + getParentRoute: () => rootRouteImport, +} as any) +const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', - getParentRoute: () => SecARoute, -} as any) -const SecAIdRoute = SecAIdRouteImport.update({ - id: '/$id', - path: '/$id', - getParentRoute: () => SecARoute, -} as any) -const SecAAboutRoute = SecAAboutRouteImport.update({ - id: '/about', - path: '/about', - getParentRoute: () => SecARoute, -} as any) -const SecASettingsRoute = SecASettingsRouteImport.update({ - id: '/settings', - path: '/settings', - getParentRoute: () => SecARoute, -} as any) -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, + getParentRoute: () => rootRouteImport, } as any) const SecFIndexRoute = SecFIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => SecFRoute, } as any) -const SecFIdRoute = SecFIdRouteImport.update({ - id: '/$id', - path: '/$id', +const SecEIndexRoute = SecEIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => SecERoute, +} as any) +const SecDIndexRoute = SecDIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => SecDRoute, +} as any) +const SecCIndexRoute = SecCIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => SecCRoute, +} as any) +const SecBIndexRoute = SecBIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => SecBRoute, +} as any) +const SecAIndexRoute = SecAIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => SecARoute, +} as any) +const SecFSettingsRoute = SecFSettingsRouteImport.update({ + id: '/settings', + path: '/settings', getParentRoute: () => SecFRoute, } as any) const SecFAboutRoute = SecFAboutRouteImport.update({ @@ -233,10 +127,116 @@ const SecFAboutRoute = SecFAboutRouteImport.update({ path: '/about', getParentRoute: () => SecFRoute, } as any) -const SecFSettingsRoute = SecFSettingsRouteImport.update({ +const SecFIdRoute = SecFIdRouteImport.update({ + id: '/$id', + path: '/$id', + getParentRoute: () => SecFRoute, +} as any) +const SecESettingsRoute = SecESettingsRouteImport.update({ id: '/settings', path: '/settings', - getParentRoute: () => SecFRoute, + 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, +} as any) +const ReleaseVChar123versionChar125Route = + ReleaseVChar123versionChar125RouteImport.update({ + id: '/release/v{$version}', + path: '/release/v{$version}', + getParentRoute: () => rootRouteImport, + } as any) +const FilesSplatRoute = FilesSplatRouteImport.update({ + id: '/files/$', + path: '/files/$', + getParentRoute: () => rootRouteImport, +} as any) +const LayoutBetaRoute = LayoutBetaRouteImport.update({ + id: '/beta', + path: '/beta', + getParentRoute: () => LayoutRoute, +} as any) +const LayoutAlphaRoute = LayoutAlphaRouteImport.update({ + id: '/alpha', + path: '/alpha', + getParentRoute: () => LayoutRoute, +} as any) +const marketingPromoRoute = marketingPromoRouteImport.update({ + id: '/(marketing)/promo', + path: '/promo', + getParentRoute: () => rootRouteImport, +} as any) +const marketingPricingRoute = marketingPricingRouteImport.update({ + id: '/(marketing)/pricing', + path: '/pricing', + getParentRoute: () => rootRouteImport, } as any) export interface FileRoutesByFullPath { @@ -484,46 +484,11 @@ export interface RootRouteChildren { declare module '@tanstack/vue-router' { interface FileRoutesByPath { - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport - parentRoute: typeof rootRouteImport - } - '/_layout': { - id: '/_layout' - path: '' - fullPath: '/' - preLoaderRoute: typeof LayoutRouteImport - parentRoute: typeof rootRouteImport - } - '/sec-a': { - id: '/sec-a' - path: '/sec-a' - fullPath: '/sec-a' - preLoaderRoute: typeof SecARouteImport - parentRoute: typeof rootRouteImport - } - '/sec-b': { - id: '/sec-b' - path: '/sec-b' - fullPath: '/sec-b' - preLoaderRoute: typeof SecBRouteImport - parentRoute: typeof rootRouteImport - } - '/sec-c': { - id: '/sec-c' - path: '/sec-c' - fullPath: '/sec-c' - preLoaderRoute: typeof SecCRouteImport - parentRoute: typeof rootRouteImport - } - '/sec-d': { - id: '/sec-d' - path: '/sec-d' - fullPath: '/sec-d' - preLoaderRoute: typeof SecDRouteImport + '/sec-f': { + id: '/sec-f' + path: '/sec-f' + fullPath: '/sec-f' + preLoaderRoute: typeof SecFRouteImport parentRoute: typeof rootRouteImport } '/sec-e': { @@ -533,194 +498,47 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof SecERouteImport parentRoute: typeof rootRouteImport } - '/sec-f': { - id: '/sec-f' - path: '/sec-f' - fullPath: '/sec-f' - preLoaderRoute: typeof SecFRouteImport + '/sec-d': { + id: '/sec-d' + path: '/sec-d' + fullPath: '/sec-d' + preLoaderRoute: typeof SecDRouteImport parentRoute: typeof rootRouteImport } - '/(marketing)/pricing': { - id: '/(marketing)/pricing' - path: '/pricing' - fullPath: '/pricing' - preLoaderRoute: typeof marketingPricingRouteImport + '/sec-c': { + id: '/sec-c' + path: '/sec-c' + fullPath: '/sec-c' + preLoaderRoute: typeof SecCRouteImport parentRoute: typeof rootRouteImport } - '/(marketing)/promo': { - id: '/(marketing)/promo' - path: '/promo' - fullPath: '/promo' - preLoaderRoute: typeof marketingPromoRouteImport + '/sec-b': { + id: '/sec-b' + path: '/sec-b' + fullPath: '/sec-b' + preLoaderRoute: typeof SecBRouteImport 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 + '/sec-a': { + id: '/sec-a' + path: '/sec-a' + fullPath: '/sec-a' + preLoaderRoute: typeof SecARouteImport parentRoute: typeof rootRouteImport } - '/release/v{$version}': { - id: '/release/v{$version}' - path: '/release/v{$version}' - fullPath: '/release/v{$version}' - preLoaderRoute: typeof ReleaseVChar123versionChar125RouteImport + '/_layout': { + id: '/_layout' + path: '' + fullPath: '/' + preLoaderRoute: typeof LayoutRouteImport parentRoute: typeof rootRouteImport } - '/sec-a/': { - id: '/sec-a/' + '/': { + id: '/' path: '/' - fullPath: '/sec-a/' - preLoaderRoute: typeof SecAIndexRouteImport - parentRoute: typeof SecARoute - } - '/sec-a/$id': { - id: '/sec-a/$id' - path: '/$id' - fullPath: '/sec-a/$id' - preLoaderRoute: typeof SecAIdRouteImport - parentRoute: typeof SecARoute - } - '/sec-a/about': { - id: '/sec-a/about' - path: '/about' - fullPath: '/sec-a/about' - preLoaderRoute: typeof SecAAboutRouteImport - parentRoute: typeof SecARoute - } - '/sec-a/settings': { - id: '/sec-a/settings' - path: '/settings' - fullPath: '/sec-a/settings' - preLoaderRoute: typeof SecASettingsRouteImport - parentRoute: typeof SecARoute - } - '/sec-b/': { - id: '/sec-b/' - path: '/' - fullPath: '/sec-b/' - preLoaderRoute: typeof SecBIndexRouteImport - parentRoute: typeof SecBRoute - } - '/sec-b/$id': { - id: '/sec-b/$id' - path: '/$id' - fullPath: '/sec-b/$id' - preLoaderRoute: typeof SecBIdRouteImport - parentRoute: typeof SecBRoute - } - '/sec-b/about': { - id: '/sec-b/about' - path: '/about' - fullPath: '/sec-b/about' - preLoaderRoute: typeof SecBAboutRouteImport - parentRoute: typeof SecBRoute - } - '/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 + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport + parentRoute: typeof rootRouteImport } '/sec-f/': { id: '/sec-f/' @@ -729,11 +547,46 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof SecFIndexRouteImport parentRoute: typeof SecFRoute } - '/sec-f/$id': { - id: '/sec-f/$id' - path: '/$id' - fullPath: '/sec-f/$id' - preLoaderRoute: typeof SecFIdRouteImport + '/sec-e/': { + id: '/sec-e/' + path: '/' + fullPath: '/sec-e/' + preLoaderRoute: typeof SecEIndexRouteImport + parentRoute: typeof SecERoute + } + '/sec-d/': { + id: '/sec-d/' + path: '/' + fullPath: '/sec-d/' + preLoaderRoute: typeof SecDIndexRouteImport + parentRoute: typeof SecDRoute + } + '/sec-c/': { + id: '/sec-c/' + path: '/' + fullPath: '/sec-c/' + preLoaderRoute: typeof SecCIndexRouteImport + parentRoute: typeof SecCRoute + } + '/sec-b/': { + id: '/sec-b/' + path: '/' + fullPath: '/sec-b/' + preLoaderRoute: typeof SecBIndexRouteImport + parentRoute: typeof SecBRoute + } + '/sec-a/': { + id: '/sec-a/' + path: '/' + fullPath: '/sec-a/' + 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': { @@ -743,13 +596,160 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof SecFAboutRouteImport parentRoute: typeof SecFRoute } - '/sec-f/settings': { - id: '/sec-f/settings' - path: '/settings' - fullPath: '/sec-f/settings' - preLoaderRoute: typeof SecFSettingsRouteImport + '/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' + fullPath: '/sec-a/$id' + 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 + } + '/files/$': { + id: '/files/$' + path: '/files/$' + fullPath: '/files/$' + preLoaderRoute: typeof FilesSplatRouteImport + parentRoute: typeof rootRouteImport + } + '/_layout/beta': { + id: '/_layout/beta' + path: '/beta' + fullPath: '/beta' + preLoaderRoute: typeof LayoutBetaRouteImport + parentRoute: typeof LayoutRoute + } + '/_layout/alpha': { + id: '/_layout/alpha' + path: '/alpha' + fullPath: '/alpha' + preLoaderRoute: typeof LayoutAlphaRouteImport + parentRoute: typeof LayoutRoute + } + '/(marketing)/promo': { + id: '/(marketing)/promo' + path: '/promo' + fullPath: '/promo' + preLoaderRoute: typeof marketingPromoRouteImport + parentRoute: typeof rootRouteImport + } + '/(marketing)/pricing': { + id: '/(marketing)/pricing' + path: '/pricing' + fullPath: '/pricing' + preLoaderRoute: typeof marketingPricingRouteImport + parentRoute: typeof rootRouteImport + } } } 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 0b38f7bddb..5bdd994e32 100644 --- a/benchmarks/client-nav/scenarios/search-params/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/search-params/react/speed.bench.ts @@ -1,19 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-search-params', async ({ bench }) => { - const scenario = setup() +describe('client-search-params', () => { + const test = setup() - await bench( + /** + * 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-search-params navigation loop (react)', - benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() + await test.tick() } - await scenario.finishBatch() + await test.finishBatch() }, - ).run(benchOptions) + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) }) 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 caa626c596..ea0baa1098 100644 --- a/benchmarks/client-nav/scenarios/search-params/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/search-params/solid/speed.bench.ts @@ -1,19 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-search-params', async ({ bench }) => { - const scenario = setup() +describe('client-search-params', () => { + const test = setup() - await bench( + /** + * 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-search-params navigation loop (solid)', - benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() + await test.tick() } - await scenario.finishBatch() + await test.finishBatch() }, - ).run(benchOptions) + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) }) 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 b15beed09b..96d211d64c 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 IndexRouteImport } from './routes/index' -import { Route as CatalogRouteImport } from './routes/catalog' import { Route as ProductsRouteImport } from './routes/products' +import { Route as CatalogRouteImport } from './routes/catalog' +import { Route as IndexRouteImport } from './routes/index' -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', +const ProductsRoute = ProductsRouteImport.update({ + id: '/products', + path: '/products', getParentRoute: () => rootRouteImport, } as any) const CatalogRoute = CatalogRouteImport.update({ @@ -23,9 +23,9 @@ const CatalogRoute = CatalogRouteImport.update({ path: '/catalog', getParentRoute: () => rootRouteImport, } as any) -const ProductsRoute = ProductsRouteImport.update({ - id: '/products', - path: '/products', +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', getParentRoute: () => rootRouteImport, } as any) @@ -61,11 +61,11 @@ export interface RootRouteChildren { declare module '@tanstack/solid-router' { interface FileRoutesByPath { - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport + '/products': { + id: '/products' + path: '/products' + fullPath: '/products' + preLoaderRoute: typeof ProductsRouteImport parentRoute: typeof rootRouteImport } '/catalog': { @@ -75,11 +75,11 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof CatalogRouteImport parentRoute: typeof rootRouteImport } - '/products': { - id: '/products' - path: '/products' - fullPath: '/products' - preLoaderRoute: typeof ProductsRouteImport + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport 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 728d2779e8..c82efd49c9 100644 --- a/benchmarks/client-nav/scenarios/search-params/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/search-params/vue/speed.bench.ts @@ -1,19 +1,32 @@ -import { test } from 'vitest' -import { benchLifecycle } from '../../../../cpu-simulation' +import { afterEach, beforeEach, bench, describe } from 'vitest' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -test('client-search-params', async ({ bench }) => { - const scenario = setup() +describe('client-search-params', () => { + const test = setup() - await bench( + /** + * 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-search-params navigation loop (vue)', - benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await scenario.tick() + await test.tick() } - await scenario.finishBatch() + await test.finishBatch() }, - ).run(benchOptions) + { + ...benchOptions, + setup: test.before, + teardown: test.after, + }, + ) }) diff --git a/benchmarks/client-nav/scenarios/search-params/vue/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/search-params/vue/src/routeTree.gen.ts index f73b84ebe7..b95b667803 100644 --- a/benchmarks/client-nav/scenarios/search-params/vue/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/search-params/vue/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 IndexRouteImport } from './routes/index' -import { Route as CatalogRouteImport } from './routes/catalog' import { Route as ProductsRouteImport } from './routes/products' +import { Route as CatalogRouteImport } from './routes/catalog' +import { Route as IndexRouteImport } from './routes/index' -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', +const ProductsRoute = ProductsRouteImport.update({ + id: '/products', + path: '/products', getParentRoute: () => rootRouteImport, } as any) const CatalogRoute = CatalogRouteImport.update({ @@ -23,9 +23,9 @@ const CatalogRoute = CatalogRouteImport.update({ path: '/catalog', getParentRoute: () => rootRouteImport, } as any) -const ProductsRoute = ProductsRouteImport.update({ - id: '/products', - path: '/products', +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', getParentRoute: () => rootRouteImport, } as any) @@ -61,11 +61,11 @@ export interface RootRouteChildren { declare module '@tanstack/vue-router' { interface FileRoutesByPath { - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport + '/products': { + id: '/products' + path: '/products' + fullPath: '/products' + preLoaderRoute: typeof ProductsRouteImport parentRoute: typeof rootRouteImport } '/catalog': { @@ -75,11 +75,11 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof CatalogRouteImport parentRoute: typeof rootRouteImport } - '/products': { - id: '/products' - path: '/products' - fullPath: '/products' - preLoaderRoute: typeof ProductsRouteImport + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } } diff --git a/benchmarks/client-nav/solid/speed.bench.ts b/benchmarks/client-nav/solid/speed.bench.ts index d629da17a8..34791180ce 100644 --- a/benchmarks/client-nav/solid/speed.bench.ts +++ b/benchmarks/client-nav/solid/speed.bench.ts @@ -1,19 +1,34 @@ -import { test } from 'vitest' +import { afterAll, beforeAll, bench, describe } from 'vitest' import { setup } from './setup' -test('client-nav', async ({ bench }) => { - const scenario = setup() +describe('client-nav', () => { + const test = setup() - await bench( + /** + * 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( 'client-side navigation loop (solid)', - { beforeAll: scenario.before, afterAll: scenario.after }, async () => { for (let i = 0; i < 10; i++) { - await scenario.tick() + await test.tick() } }, - ).run({ - warmupIterations: 100, - time: 10_000, - }) + { + warmupIterations: 100, + time: 10_000, + setup: test.before, + teardown: test.after, + }, + ) }) diff --git a/benchmarks/client-nav/solid/vite.config.ts b/benchmarks/client-nav/solid/vite.config.ts index 0c26b32f5f..1dd8e1e15c 100644 --- a/benchmarks/client-nav/solid/vite.config.ts +++ b/benchmarks/client-nav/solid/vite.config.ts @@ -37,7 +37,6 @@ 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 503e91e7b7..f9e532f5ba 100644 --- a/benchmarks/client-nav/vue/speed.bench.ts +++ b/benchmarks/client-nav/vue/speed.bench.ts @@ -1,19 +1,34 @@ -import { test } from 'vitest' +import { afterAll, beforeAll, bench, describe } from 'vitest' import { setup } from './setup' -test('client-nav', async ({ bench }) => { - const scenario = setup() +describe('client-nav', () => { + const test = setup() - await bench( + /** + * 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( 'client-side navigation loop (vue)', - { beforeAll: scenario.before, afterAll: scenario.after }, async () => { for (let i = 0; i < 10; i++) { - await scenario.tick() + await test.tick() } }, - ).run({ - warmupIterations: 100, - time: 10_000, - }) + { + warmupIterations: 100, + time: 10_000, + setup: test.before, + teardown: test.after, + }, + ) }) diff --git a/benchmarks/client-nav/vue/vite.config.ts b/benchmarks/client-nav/vue/vite.config.ts index 78d8ae5638..7abe24b455 100644 --- a/benchmarks/client-nav/vue/vite.config.ts +++ b/benchmarks/client-nav/vue/vite.config.ts @@ -36,6 +36,5 @@ 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 9b8859f74d..7e16bf4c5a 100644 --- a/benchmarks/cpu-simulation.ts +++ b/benchmarks/cpu-simulation.ts @@ -1,23 +1,9 @@ -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 = codspeedRunnerMode() + const mode = + process.env.CODSPEED_ENV === undefined + ? undefined + : process.env.CODSPEED_RUNNER_MODE 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. @@ -36,18 +22,3 @@ 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 18b68768f9..d93e77e70b 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/benchmarks.yml`). The workflow runs on every +`.github/workflows/client-nav-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 it with Vitest's `bench` test fixture, and -`memory.flame.ts` runs the same workload through the Flame profiler. +`memory.bench.ts` registers `bench(...)` directly, and `memory.flame.ts` runs the +same workload through the Flame profiler. ## How the memory instrument executes a bench @@ -43,21 +43,19 @@ continuity). Never grow an existing scenario for a new case — add a scenario. 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. 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. + 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. - 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, the `beforeEach` hook yields to the event - loop, outside the measurement marker and before CodSpeed forces GC. Promise-only +- Before each CodSpeed invocation, a setup 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 @@ -74,14 +72,13 @@ continuity). Never grow an existing scenario for a new case — add a scenario. 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 the last four flags kept all 48 peak-memory results within 1% +repetitions with these 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%, @@ -104,19 +101,6 @@ 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 @@ -258,7 +242,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 benchmarks.yml --ref +gh workflow run client-nav-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 785e8fac7f..0cbaedbd71 100644 --- a/benchmarks/memory/client/bench-utils.ts +++ b/benchmarks/memory/client/bench-utils.ts @@ -1,5 +1,3 @@ -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 463047f4d9..8b877b0740 100644 --- a/benchmarks/memory/client/benchmark.ts +++ b/benchmarks/memory/client/benchmark.ts @@ -1,10 +1,6 @@ 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 4dc6246183..af1770ba0d 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": "^6.0.1", + "@codspeed/vitest-plugin": "^5.5.0", "@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 --mode benchmark --config ./vitest.react.config.ts", + "command": "NODE_ENV=production vitest bench --config ./vitest.react.config.ts", "cwd": "benchmarks/memory/client" } }, @@ -214,7 +214,7 @@ "build:solid" ], "options": { - "command": "NODE_ENV=production vitest bench --mode benchmark --config ./vitest.solid.config.ts", + "command": "NODE_ENV=production vitest bench --config ./vitest.solid.config.ts", "cwd": "benchmarks/memory/client" } }, @@ -226,7 +226,7 @@ "build:vue" ], "options": { - "command": "NODE_ENV=production vitest bench --mode benchmark --config ./vitest.vue.config.ts", + "command": "NODE_ENV=production vitest bench --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 43ab822de3..85a1f11ee6 100644 --- a/benchmarks/memory/client/scenarios/interrupted-navigations/react/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/interrupted-navigations/react/memory.bench.ts @@ -1,14 +1,21 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-client/bench-utils' +import { afterEach, beforeEach, bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -test('memory', async ({ bench }) => { - await bench(workload.name, memoryBenchHooks(workload), workload.run).run( - memoryBenchOptions, - ) +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) }) 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 43ab822de3..85a1f11ee6 100644 --- a/benchmarks/memory/client/scenarios/interrupted-navigations/solid/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/interrupted-navigations/solid/memory.bench.ts @@ -1,14 +1,21 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-client/bench-utils' +import { afterEach, beforeEach, bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -test('memory', async ({ bench }) => { - await bench(workload.name, memoryBenchHooks(workload), workload.run).run( - memoryBenchOptions, - ) +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) }) 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 43ab822de3..85a1f11ee6 100644 --- a/benchmarks/memory/client/scenarios/interrupted-navigations/vue/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/interrupted-navigations/vue/memory.bench.ts @@ -1,14 +1,21 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-client/bench-utils' +import { afterEach, beforeEach, bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -test('memory', async ({ bench }) => { - await bench(workload.name, memoryBenchHooks(workload), workload.run).run( - memoryBenchOptions, - ) +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) }) diff --git a/benchmarks/memory/client/scenarios/interrupted-navigations/vue/src/routes/fast.$id.tsx b/benchmarks/memory/client/scenarios/interrupted-navigations/vue/src/routes/fast.$id.tsx index f6dc9ac3bd..3bd820bd07 100644 --- a/benchmarks/memory/client/scenarios/interrupted-navigations/vue/src/routes/fast.$id.tsx +++ b/benchmarks/memory/client/scenarios/interrupted-navigations/vue/src/routes/fast.$id.tsx @@ -1,19 +1,6 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' import { fixedTimestamp } from '../../../slow-loaders' -const FastComponent = defineComponent({ - setup() { - const data = Route.useLoaderData() - - return () => ( -
- {`${data.value.kind}:${data.value.id}:${data.value.ts}`} -
- ) - }, -}) - export const Route = createFileRoute('/fast/$id')({ loader: ({ params }: { params: { id: string } }) => ({ id: params.id, @@ -22,3 +9,13 @@ export const Route = createFileRoute('/fast/$id')({ }), component: FastComponent, }) + +function FastComponent() { + const data = Route.useLoaderData() + + return ( +
+ {`${data.value.kind}:${data.value.id}:${data.value.ts}`} +
+ ) +} diff --git a/benchmarks/memory/client/scenarios/interrupted-navigations/vue/src/routes/slow.$id.tsx b/benchmarks/memory/client/scenarios/interrupted-navigations/vue/src/routes/slow.$id.tsx index 3b5bb75ede..68885fb918 100644 --- a/benchmarks/memory/client/scenarios/interrupted-navigations/vue/src/routes/slow.$id.tsx +++ b/benchmarks/memory/client/scenarios/interrupted-navigations/vue/src/routes/slow.$id.tsx @@ -1,19 +1,6 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' import { getSlowLoaderDeferred } from '../../../slow-loaders' -const SlowComponent = defineComponent({ - setup() { - const data = Route.useLoaderData() - - return () => ( -
- {`${data.value.kind}:${data.value.id}:${data.value.ts}`} -
- ) - }, -}) - export const Route = createFileRoute('/slow/$id')({ loader: async ({ params }: { params: { id: string } }) => { const deferred = getSlowLoaderDeferred(params.id) @@ -22,3 +9,13 @@ export const Route = createFileRoute('/slow/$id')({ }, component: SlowComponent, }) + +function SlowComponent() { + const data = Route.useLoaderData() + + return ( +
+ {`${data.value.kind}:${data.value.id}:${data.value.ts}`} +
+ ) +} 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 43ab822de3..85a1f11ee6 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,14 +1,21 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-client/bench-utils' +import { afterEach, beforeEach, bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -test('memory', async ({ bench }) => { - await bench(workload.name, memoryBenchHooks(workload), workload.run).run( - memoryBenchOptions, - ) +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) }) 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 43ab822de3..85a1f11ee6 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,14 +1,21 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-client/bench-utils' +import { afterEach, beforeEach, bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -test('memory', async ({ bench }) => { - await bench(workload.name, memoryBenchHooks(workload), workload.run).run( - memoryBenchOptions, - ) +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) }) 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 43ab822de3..85a1f11ee6 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,14 +1,21 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-client/bench-utils' +import { afterEach, beforeEach, bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -test('memory', async ({ bench }) => { - await bench(workload.name, memoryBenchHooks(workload), workload.run).run( - memoryBenchOptions, - ) +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) }) diff --git a/benchmarks/memory/client/scenarios/loader-data-retention/vue/src/routes/page.$id.tsx b/benchmarks/memory/client/scenarios/loader-data-retention/vue/src/routes/page.$id.tsx index 38f1d2614c..9f4b3c4470 100644 --- a/benchmarks/memory/client/scenarios/loader-data-retention/vue/src/routes/page.$id.tsx +++ b/benchmarks/memory/client/scenarios/loader-data-retention/vue/src/routes/page.$id.tsx @@ -1,25 +1,22 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' import { createLoaderData } from '../../../loader-data' -const PageComponent = defineComponent({ - setup() { - const data = Route.useLoaderData() - - return () => ( -
- {`${data.value.id}:${data.value.records.length}`} -
- ) - }, -}) - export const Route = createFileRoute('/page/$id')({ loader: ({ params }: { params: { id: string } }) => createLoaderData(params.id), component: PageComponent, }) + +function PageComponent() { + const data = Route.useLoaderData() + + return ( +
+ {`${data.value.id}:${data.value.records.length}`} +
+ ) +} 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 43ab822de3..85a1f11ee6 100644 --- a/benchmarks/memory/client/scenarios/mount-unmount/react/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/mount-unmount/react/memory.bench.ts @@ -1,14 +1,21 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-client/bench-utils' +import { afterEach, beforeEach, bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -test('memory', async ({ bench }) => { - await bench(workload.name, memoryBenchHooks(workload), workload.run).run( - memoryBenchOptions, - ) +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) }) 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 43ab822de3..85a1f11ee6 100644 --- a/benchmarks/memory/client/scenarios/mount-unmount/solid/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/mount-unmount/solid/memory.bench.ts @@ -1,14 +1,21 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-client/bench-utils' +import { afterEach, beforeEach, bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -test('memory', async ({ bench }) => { - await bench(workload.name, memoryBenchHooks(workload), workload.run).run( - memoryBenchOptions, - ) +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) }) 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 43ab822de3..85a1f11ee6 100644 --- a/benchmarks/memory/client/scenarios/mount-unmount/vue/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/mount-unmount/vue/memory.bench.ts @@ -1,14 +1,21 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-client/bench-utils' +import { afterEach, beforeEach, bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -test('memory', async ({ bench }) => { - await bench(workload.name, memoryBenchHooks(workload), workload.run).run( - memoryBenchOptions, - ) +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) }) diff --git a/benchmarks/memory/client/scenarios/mount-unmount/vue/src/routes/a.tsx b/benchmarks/memory/client/scenarios/mount-unmount/vue/src/routes/a.tsx index 0dd650e1dd..cbcd543ce5 100644 --- a/benchmarks/memory/client/scenarios/mount-unmount/vue/src/routes/a.tsx +++ b/benchmarks/memory/client/scenarios/mount-unmount/vue/src/routes/a.tsx @@ -1,15 +1,12 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' -const AComponent = defineComponent({ - setup() { - const data = Route.useLoaderData() - - return () =>
{data.value.id}
- }, -}) - export const Route = createFileRoute('/a')({ loader: () => ({ id: 'a' }), component: AComponent, }) + +function AComponent() { + const data = Route.useLoaderData() + + return
{data.value.id}
+} 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 43ab822de3..85a1f11ee6 100644 --- a/benchmarks/memory/client/scenarios/navigation-churn/react/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/navigation-churn/react/memory.bench.ts @@ -1,14 +1,21 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-client/bench-utils' +import { afterEach, beforeEach, bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -test('memory', async ({ bench }) => { - await bench(workload.name, memoryBenchHooks(workload), workload.run).run( - memoryBenchOptions, - ) +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) }) 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 43ab822de3..85a1f11ee6 100644 --- a/benchmarks/memory/client/scenarios/navigation-churn/solid/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/navigation-churn/solid/memory.bench.ts @@ -1,14 +1,21 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-client/bench-utils' +import { afterEach, beforeEach, bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -test('memory', async ({ bench }) => { - await bench(workload.name, memoryBenchHooks(workload), workload.run).run( - memoryBenchOptions, - ) +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) }) 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 43ab822de3..85a1f11ee6 100644 --- a/benchmarks/memory/client/scenarios/navigation-churn/vue/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/navigation-churn/vue/memory.bench.ts @@ -1,14 +1,21 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-client/bench-utils' +import { afterEach, beforeEach, bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -test('memory', async ({ bench }) => { - await bench(workload.name, memoryBenchHooks(workload), workload.run).run( - memoryBenchOptions, - ) +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) }) diff --git a/benchmarks/memory/client/scenarios/navigation-churn/vue/src/routes/a.tsx b/benchmarks/memory/client/scenarios/navigation-churn/vue/src/routes/a.tsx index c1a9cfb244..183228e748 100644 --- a/benchmarks/memory/client/scenarios/navigation-churn/vue/src/routes/a.tsx +++ b/benchmarks/memory/client/scenarios/navigation-churn/vue/src/routes/a.tsx @@ -1,19 +1,16 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' const fixedTimestamp = 1_700_000_000_000 -const AComponent = defineComponent({ - setup() { - const data = Route.useLoaderData() - - return () => ( -
{`${data.value.name}:${data.value.ts}`}
- ) - }, -}) - export const Route = createFileRoute('/a')({ loader: () => ({ name: 'a', ts: fixedTimestamp }), component: AComponent, }) + +function AComponent() { + const data = Route.useLoaderData() + + return ( +
{`${data.value.name}:${data.value.ts}`}
+ ) +} diff --git a/benchmarks/memory/client/scenarios/navigation-churn/vue/src/routes/b.tsx b/benchmarks/memory/client/scenarios/navigation-churn/vue/src/routes/b.tsx index 3a20799f3b..3a18ec97a9 100644 --- a/benchmarks/memory/client/scenarios/navigation-churn/vue/src/routes/b.tsx +++ b/benchmarks/memory/client/scenarios/navigation-churn/vue/src/routes/b.tsx @@ -1,19 +1,16 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' const fixedTimestamp = 1_700_000_000_000 -const BComponent = defineComponent({ - setup() { - const data = Route.useLoaderData() - - return () => ( -
{`${data.value.name}:${data.value.ts}`}
- ) - }, -}) - export const Route = createFileRoute('/b')({ loader: () => ({ name: 'b', ts: fixedTimestamp }), component: BComponent, }) + +function BComponent() { + const data = Route.useLoaderData() + + return ( +
{`${data.value.name}:${data.value.ts}`}
+ ) +} 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 43ab822de3..85a1f11ee6 100644 --- a/benchmarks/memory/client/scenarios/preload-churn/react/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/preload-churn/react/memory.bench.ts @@ -1,14 +1,21 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-client/bench-utils' +import { afterEach, beforeEach, bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -test('memory', async ({ bench }) => { - await bench(workload.name, memoryBenchHooks(workload), workload.run).run( - memoryBenchOptions, - ) +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) }) 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 43ab822de3..85a1f11ee6 100644 --- a/benchmarks/memory/client/scenarios/preload-churn/solid/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/preload-churn/solid/memory.bench.ts @@ -1,14 +1,21 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-client/bench-utils' +import { afterEach, beforeEach, bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -test('memory', async ({ bench }) => { - await bench(workload.name, memoryBenchHooks(workload), workload.run).run( - memoryBenchOptions, - ) +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) }) 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 43ab822de3..85a1f11ee6 100644 --- a/benchmarks/memory/client/scenarios/preload-churn/vue/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/preload-churn/vue/memory.bench.ts @@ -1,14 +1,21 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-client/bench-utils' +import { afterEach, beforeEach, bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -test('memory', async ({ bench }) => { - await bench(workload.name, memoryBenchHooks(workload), workload.run).run( - memoryBenchOptions, - ) +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) }) diff --git a/benchmarks/memory/client/scenarios/preload-churn/vue/src/routes/items.$id.tsx b/benchmarks/memory/client/scenarios/preload-churn/vue/src/routes/items.$id.tsx index 08254e173e..2a29245926 100644 --- a/benchmarks/memory/client/scenarios/preload-churn/vue/src/routes/items.$id.tsx +++ b/benchmarks/memory/client/scenarios/preload-churn/vue/src/routes/items.$id.tsx @@ -1,19 +1,6 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' import { createItemPayload, trackItemLoaderCall } from '../../../item-payload' -const ItemComponent = defineComponent({ - setup() { - const data = Route.useLoaderData() - - return () => ( -
- {`${data.value.id}:${data.value.byteLength}`} -
- ) - }, -}) - export const Route = createFileRoute('/items/$id')({ loader: ({ params }: { params: { id: string } }) => { trackItemLoaderCall(params.id) @@ -21,3 +8,13 @@ export const Route = createFileRoute('/items/$id')({ }, component: ItemComponent, }) + +function ItemComponent() { + const data = Route.useLoaderData() + + return ( +
+ {`${data.value.id}:${data.value.byteLength}`} +
+ ) +} 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 43ab822de3..85a1f11ee6 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,14 +1,21 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-client/bench-utils' +import { afterEach, beforeEach, bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -test('memory', async ({ bench }) => { - await bench(workload.name, memoryBenchHooks(workload), workload.run).run( - memoryBenchOptions, - ) +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) }) 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 43ab822de3..85a1f11ee6 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,14 +1,21 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-client/bench-utils' +import { afterEach, beforeEach, bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -test('memory', async ({ bench }) => { - await bench(workload.name, memoryBenchHooks(workload), workload.run).run( - memoryBenchOptions, - ) +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) }) 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 43ab822de3..85a1f11ee6 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,14 +1,21 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-client/bench-utils' +import { afterEach, beforeEach, bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -test('memory', async ({ bench }) => { - await bench(workload.name, memoryBenchHooks(workload), workload.run).run( - memoryBenchOptions, - ) +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) }) diff --git a/benchmarks/memory/client/scenarios/unique-location-churn/vue/src/routes/items.$id.tsx b/benchmarks/memory/client/scenarios/unique-location-churn/vue/src/routes/items.$id.tsx index e796ee14d1..1854367142 100644 --- a/benchmarks/memory/client/scenarios/unique-location-churn/vue/src/routes/items.$id.tsx +++ b/benchmarks/memory/client/scenarios/unique-location-churn/vue/src/routes/items.$id.tsx @@ -1,22 +1,9 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' type ItemSearch = { q: string } -const ItemComponent = defineComponent({ - setup() { - const data = Route.useLoaderData() - - return () => ( -
{`${data.value.id}:${data.value.q}:${data.value.checksum}`}
- ) - }, -}) - export const Route = createFileRoute('/items/$id')({ validateSearch: (search: Record): ItemSearch => ({ q: typeof search.q === 'string' ? search.q : '', @@ -35,3 +22,13 @@ export const Route = createFileRoute('/items/$id')({ }), component: ItemComponent, }) + +function ItemComponent() { + const data = Route.useLoaderData() + + return ( +
{`${data.value.id}:${data.value.q}:${data.value.checksum}`}
+ ) +} diff --git a/benchmarks/memory/client/vitest.setup.ts b/benchmarks/memory/client/vitest.setup.ts index ce3127275a..5f78f1a7d1 100644 --- a/benchmarks/memory/client/vitest.setup.ts +++ b/benchmarks/memory/client/vitest.setup.ts @@ -1,3 +1,6 @@ +import { beforeEach } from 'vitest' +import { endMemoryTurn, isMemoryInstrumented } from '../turn' + // @ts-expect-error global.IS_REACT_ACT_ENVIRONMENT = true @@ -7,3 +10,7 @@ window.scrollTo = scrollTo globalThis.scrollTo = scrollTo export {} + +if (isMemoryInstrumented()) { + beforeEach(endMemoryTurn) +} diff --git a/benchmarks/memory/runtime.ts b/benchmarks/memory/runtime.ts index 010149b4df..2aded74582 100644 --- a/benchmarks/memory/runtime.ts +++ b/benchmarks/memory/runtime.ts @@ -7,16 +7,9 @@ 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', @@ -29,8 +22,8 @@ export function memoryConfig(side: 'client' | 'server') { return { execArgv, setupFiles: - side === 'client' - ? [fileURLToPath(new URL('./client/vitest.setup.ts', import.meta.url))] + side === 'client' || isMemoryInstrumented() + ? [fileURLToPath(new URL(`./${side}/vitest.setup.ts`, import.meta.url))] : [], } } diff --git a/benchmarks/memory/server/bench-utils.ts b/benchmarks/memory/server/bench-utils.ts index 9caaf63384..8893d5be4b 100644 --- a/benchmarks/memory/server/bench-utils.ts +++ b/benchmarks/memory/server/bench-utils.ts @@ -1,5 +1,3 @@ -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 9b8dc2c76f..301a9f956d 100644 --- a/benchmarks/memory/server/benchmark.ts +++ b/benchmarks/memory/server/benchmark.ts @@ -1,9 +1,5 @@ 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 d09343c7b6..4688384061 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": "^6.0.1", + "@codspeed/vitest-plugin": "^5.5.0", "@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 --mode benchmark --config ./vitest.react.config.ts", + "command": "NODE_ENV=production vitest bench --config ./vitest.react.config.ts", "cwd": "benchmarks/memory/server" } }, @@ -220,7 +220,7 @@ "build:solid" ], "options": { - "command": "NODE_ENV=production vitest bench --mode benchmark --config ./vitest.solid.config.ts", + "command": "NODE_ENV=production vitest bench --config ./vitest.solid.config.ts", "cwd": "benchmarks/memory/server" } }, @@ -232,7 +232,7 @@ "build:vue" ], "options": { - "command": "NODE_ENV=production vitest bench --mode benchmark --config ./vitest.vue.config.ts", + "command": "NODE_ENV=production vitest bench --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 8b5f16ad63..9a5c211fee 100644 --- a/benchmarks/memory/server/scenarios/aborted-requests/react/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/aborted-requests/react/memory.bench.ts @@ -1,16 +1,11 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-server/bench-utils' +import { bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -test('memory', async ({ bench }) => { +describe('memory', () => { for (const workload of workloadGroup.workloads) { - await bench(workload.name, memoryBenchHooks(), workload.run).run( - memoryBenchOptions, - ) + bench(workload.name, workload.run, memoryBenchOptions) } }) diff --git a/benchmarks/memory/server/scenarios/aborted-requests/shared.ts b/benchmarks/memory/server/scenarios/aborted-requests/shared.ts index 29eca99e00..b5a61594ba 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 = async () => runAbortedRequestLoop(handler, mode) + const run = () => 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 8b5f16ad63..9a5c211fee 100644 --- a/benchmarks/memory/server/scenarios/aborted-requests/solid/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/aborted-requests/solid/memory.bench.ts @@ -1,16 +1,11 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-server/bench-utils' +import { bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -test('memory', async ({ bench }) => { +describe('memory', () => { for (const workload of workloadGroup.workloads) { - await bench(workload.name, memoryBenchHooks(), workload.run).run( - memoryBenchOptions, - ) + bench(workload.name, workload.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 8b5f16ad63..9a5c211fee 100644 --- a/benchmarks/memory/server/scenarios/aborted-requests/vue/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/aborted-requests/vue/memory.bench.ts @@ -1,16 +1,11 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-server/bench-utils' +import { bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -test('memory', async ({ bench }) => { +describe('memory', () => { for (const workload of workloadGroup.workloads) { - await bench(workload.name, memoryBenchHooks(), workload.run).run( - memoryBenchOptions, - ) + bench(workload.name, workload.run, memoryBenchOptions) } }) diff --git a/benchmarks/memory/server/scenarios/aborted-requests/vue/src/routes/stream.$id.tsx b/benchmarks/memory/server/scenarios/aborted-requests/vue/src/routes/stream.$id.tsx index e41af03c16..448355b122 100644 --- a/benchmarks/memory/server/scenarios/aborted-requests/vue/src/routes/stream.$id.tsx +++ b/benchmarks/memory/server/scenarios/aborted-requests/vue/src/routes/stream.$id.tsx @@ -1,60 +1,12 @@ import { createServerOnlyFn } from '@tanstack/vue-start' import { getRequest } from '@tanstack/vue-start/server' import { Await, createFileRoute } from '@tanstack/vue-router' -import { Suspense, defineComponent } from 'vue' +import { Suspense } from 'vue' import { makeDeferredRecords } from '../../../deferred-records' import type { DeferredRecord } from '../../../deferred-records' const getRequestSignal = createServerOnlyFn(() => getRequest().signal) -const StreamComponent = defineComponent({ - setup() { - const data = Route.useLoaderData() - - return () => ( -
-

{data.value.eager}

-

loading-alpha

-

loading-beta

- - {{ - default: () => ( - ) => ( -
    - {records.map((record) => ( -
  • {record.label}
  • - ))} -
- )} - /> - ), - fallback: () => null, - }} -
- - {{ - default: () => ( - ) => ( -
    - {records.map((record) => ( -
  • {record.label}
  • - ))} -
- )} - /> - ), - fallback: () => null, - }} -
-
- ) - }, -}) - export const Route = createFileRoute('/stream/$id')({ loader: ({ params }) => ({ eager: `eager-${params.id}`, @@ -63,3 +15,49 @@ export const Route = createFileRoute('/stream/$id')({ }), component: StreamComponent, }) + +function StreamComponent() { + const data = Route.useLoaderData() + + return ( +
+

{data.value.eager}

+

loading-alpha

+

loading-beta

+ + {{ + default: () => ( + ) => ( +
    + {records.map((record) => ( +
  • {record.label}
  • + ))} +
+ )} + /> + ), + fallback: () => null, + }} +
+ + {{ + default: () => ( + ) => ( +
    + {records.map((record) => ( +
  • {record.label}
  • + ))} +
+ )} + /> + ), + fallback: () => null, + }} +
+
+ ) +} 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 a6f07b97be..2780830cb2 100644 --- a/benchmarks/memory/server/scenarios/error-paths/react/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/error-paths/react/memory.bench.ts @@ -1,16 +1,11 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-server/bench-utils' +import { bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[0]! -test('memory', async ({ bench }) => { - await bench(workload.name, memoryBenchHooks(), workload.run).run( - memoryBenchOptions, - ) +describe('memory', () => { + bench(workload.name, workload.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 89071137c3..d41877e6ce 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,16 +1,11 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-server/bench-utils' +import { bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[2]! -test('memory', async ({ bench }) => { - await bench(workload.name, memoryBenchHooks(), workload.run).run( - memoryBenchOptions, - ) +describe('memory', () => { + bench(workload.name, workload.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 fa6a6693ed..42d67b1164 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,16 +1,11 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-server/bench-utils' +import { bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[1]! -test('memory', async ({ bench }) => { - await bench(workload.name, memoryBenchHooks(), workload.run).run( - memoryBenchOptions, - ) +describe('memory', () => { + bench(workload.name, workload.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 b2c3d24200..6179e469dd 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,16 +1,11 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-server/bench-utils' +import { bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[3]! -test('memory', async ({ bench }) => { - await bench(workload.name, memoryBenchHooks(), workload.run).run( - memoryBenchOptions, - ) +describe('memory', () => { + bench(workload.name, workload.run, memoryBenchOptions) }) diff --git a/benchmarks/memory/server/scenarios/error-paths/shared.ts b/benchmarks/memory/server/scenarios/error-paths/shared.ts index 11ed293d22..966505f3a0 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 = async () => + const runRedirect = () => runSequentialRequestLoop(handler, { random: redirectRandom, iterations: errorPathsIterations, @@ -144,7 +144,7 @@ export function createWorkloadGroup( validateResponse: validateRedirectResponse, }) - const runNotFound = async () => + const runNotFound = () => runSequentialRequestLoop(handler, { random: notFoundRandom, iterations: errorPathsIterations, @@ -152,7 +152,7 @@ export function createWorkloadGroup( validateResponse: validateNotFoundResponse, }) - const runError = async () => + const runError = () => runSequentialRequestLoop(handler, { random: errorRandom, iterations: errorPathsIterations, @@ -160,7 +160,7 @@ export function createWorkloadGroup( validateResponse: validateErrorResponse, }) - const runUnmatched = async () => + const runUnmatched = () => 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 a6f07b97be..2780830cb2 100644 --- a/benchmarks/memory/server/scenarios/error-paths/solid/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/error-paths/solid/memory.bench.ts @@ -1,16 +1,11 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-server/bench-utils' +import { bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[0]! -test('memory', async ({ bench }) => { - await bench(workload.name, memoryBenchHooks(), workload.run).run( - memoryBenchOptions, - ) +describe('memory', () => { + bench(workload.name, workload.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 89071137c3..d41877e6ce 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,16 +1,11 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-server/bench-utils' +import { bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[2]! -test('memory', async ({ bench }) => { - await bench(workload.name, memoryBenchHooks(), workload.run).run( - memoryBenchOptions, - ) +describe('memory', () => { + bench(workload.name, workload.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 fa6a6693ed..42d67b1164 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,16 +1,11 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-server/bench-utils' +import { bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[1]! -test('memory', async ({ bench }) => { - await bench(workload.name, memoryBenchHooks(), workload.run).run( - memoryBenchOptions, - ) +describe('memory', () => { + bench(workload.name, workload.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 b2c3d24200..6179e469dd 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,16 +1,11 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-server/bench-utils' +import { bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[3]! -test('memory', async ({ bench }) => { - await bench(workload.name, memoryBenchHooks(), workload.run).run( - memoryBenchOptions, - ) +describe('memory', () => { + bench(workload.name, workload.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 a6f07b97be..2780830cb2 100644 --- a/benchmarks/memory/server/scenarios/error-paths/vue/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/error-paths/vue/memory.bench.ts @@ -1,16 +1,11 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-server/bench-utils' +import { bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[0]! -test('memory', async ({ bench }) => { - await bench(workload.name, memoryBenchHooks(), workload.run).run( - memoryBenchOptions, - ) +describe('memory', () => { + bench(workload.name, workload.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 89071137c3..d41877e6ce 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,16 +1,11 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-server/bench-utils' +import { bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[2]! -test('memory', async ({ bench }) => { - await bench(workload.name, memoryBenchHooks(), workload.run).run( - memoryBenchOptions, - ) +describe('memory', () => { + bench(workload.name, workload.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 fa6a6693ed..42d67b1164 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,16 +1,11 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-server/bench-utils' +import { bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[1]! -test('memory', async ({ bench }) => { - await bench(workload.name, memoryBenchHooks(), workload.run).run( - memoryBenchOptions, - ) +describe('memory', () => { + bench(workload.name, workload.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 b2c3d24200..6179e469dd 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,16 +1,11 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-server/bench-utils' +import { bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[3]! -test('memory', async ({ bench }) => { - await bench(workload.name, memoryBenchHooks(), workload.run).run( - memoryBenchOptions, - ) +describe('memory', () => { + bench(workload.name, workload.run, memoryBenchOptions) }) diff --git a/benchmarks/memory/server/scenarios/error-paths/vue/src/routes/target.$id.tsx b/benchmarks/memory/server/scenarios/error-paths/vue/src/routes/target.$id.tsx index 0bbf4a3dc6..17ade6bf5b 100644 --- a/benchmarks/memory/server/scenarios/error-paths/vue/src/routes/target.$id.tsx +++ b/benchmarks/memory/server/scenarios/error-paths/vue/src/routes/target.$id.tsx @@ -1,14 +1,11 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' -const TargetComponent = defineComponent({ - setup() { - const params = Route.useParams() - - return () =>
{`target-${params.value.id}`}
- }, -}) - export const Route = createFileRoute('/target/$id')({ component: TargetComponent, }) + +function TargetComponent() { + const params = Route.useParams() + + return
{`target-${params.value.id}`}
+} 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 8b5f16ad63..9a5c211fee 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,16 +1,11 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-server/bench-utils' +import { bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -test('memory', async ({ bench }) => { +describe('memory', () => { for (const workload of workloadGroup.workloads) { - await bench(workload.name, memoryBenchHooks(), workload.run).run( - memoryBenchOptions, - ) + bench(workload.name, workload.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 085e576244..486c025f5a 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 = async () => + const run = () => 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 8b5f16ad63..9a5c211fee 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,16 +1,11 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-server/bench-utils' +import { bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -test('memory', async ({ bench }) => { +describe('memory', () => { for (const workload of workloadGroup.workloads) { - await bench(workload.name, memoryBenchHooks(), workload.run).run( - memoryBenchOptions, - ) + bench(workload.name, workload.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 8b5f16ad63..9a5c211fee 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,16 +1,11 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-server/bench-utils' +import { bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -test('memory', async ({ bench }) => { +describe('memory', () => { for (const workload of workloadGroup.workloads) { - await bench(workload.name, memoryBenchHooks(), workload.run).run( - memoryBenchOptions, - ) + bench(workload.name, workload.run, memoryBenchOptions) } }) diff --git a/benchmarks/memory/server/scenarios/peak-large-page/vue/src/routes/l1.l2.l3.l4.l5.l6.l7.l8.tsx b/benchmarks/memory/server/scenarios/peak-large-page/vue/src/routes/l1.l2.l3.l4.l5.l6.l7.l8.tsx index 7f7a42d645..bd079aa1a0 100644 --- a/benchmarks/memory/server/scenarios/peak-large-page/vue/src/routes/l1.l2.l3.l4.l5.l6.l7.l8.tsx +++ b/benchmarks/memory/server/scenarios/peak-large-page/vue/src/routes/l1.l2.l3.l4.l5.l6.l7.l8.tsx @@ -1,34 +1,28 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' import { makeLargePageHead, makeLargePageLevelData, } from '../../../large-page-data' -const LevelEightComponent = defineComponent({ - setup() { - const data = Route.useLoaderData() - - return () => { - const first = data.value.records[0]! - - return ( -
-

{data.value.marker}

-

records: {data.value.records.length}

-
-

{first.name}

-

{first.id}

-

{first.description}

-
-
- ) - } - }, -}) - export const Route = createFileRoute('/l1/l2/l3/l4/l5/l6/l7/l8')({ loader: () => makeLargePageLevelData(8, 0x5eed_1008), head: ({ loaderData }) => makeLargePageHead(loaderData), component: LevelEightComponent, }) + +function LevelEightComponent() { + const data = Route.useLoaderData() + const first = data.value.records[0]! + + return ( +
+

{data.value.marker}

+

records: {data.value.records.length}

+
+

{first.name}

+

{first.id}

+

{first.description}

+
+
+ ) +} diff --git a/benchmarks/memory/server/scenarios/peak-large-page/vue/src/routes/l1.l2.l3.l4.l5.l6.l7.tsx b/benchmarks/memory/server/scenarios/peak-large-page/vue/src/routes/l1.l2.l3.l4.l5.l6.l7.tsx index a99c56e529..7f69f6f438 100644 --- a/benchmarks/memory/server/scenarios/peak-large-page/vue/src/routes/l1.l2.l3.l4.l5.l6.l7.tsx +++ b/benchmarks/memory/server/scenarios/peak-large-page/vue/src/routes/l1.l2.l3.l4.l5.l6.l7.tsx @@ -1,35 +1,29 @@ -import { defineComponent } from 'vue' import { Outlet, createFileRoute } from '@tanstack/vue-router' import { makeLargePageHead, makeLargePageLevelData, } from '../../../large-page-data' -const LevelSevenComponent = defineComponent({ - setup() { - const data = Route.useLoaderData() - - return () => { - const first = data.value.records[0]! - - return ( -
-

{data.value.marker}

-

records: {data.value.records.length}

-
-

{first.name}

-

{first.id}

-

{first.description}

-
- -
- ) - } - }, -}) - export const Route = createFileRoute('/l1/l2/l3/l4/l5/l6/l7')({ loader: () => makeLargePageLevelData(7, 0x5eed_1007), head: ({ loaderData }) => makeLargePageHead(loaderData), component: LevelSevenComponent, }) + +function LevelSevenComponent() { + const data = Route.useLoaderData() + const first = data.value.records[0]! + + return ( +
+

{data.value.marker}

+

records: {data.value.records.length}

+
+

{first.name}

+

{first.id}

+

{first.description}

+
+ +
+ ) +} diff --git a/benchmarks/memory/server/scenarios/peak-large-page/vue/src/routes/l1.l2.l3.l4.l5.l6.tsx b/benchmarks/memory/server/scenarios/peak-large-page/vue/src/routes/l1.l2.l3.l4.l5.l6.tsx index 3de3f03427..75a7c717e3 100644 --- a/benchmarks/memory/server/scenarios/peak-large-page/vue/src/routes/l1.l2.l3.l4.l5.l6.tsx +++ b/benchmarks/memory/server/scenarios/peak-large-page/vue/src/routes/l1.l2.l3.l4.l5.l6.tsx @@ -1,35 +1,29 @@ -import { defineComponent } from 'vue' import { Outlet, createFileRoute } from '@tanstack/vue-router' import { makeLargePageHead, makeLargePageLevelData, } from '../../../large-page-data' -const LevelSixComponent = defineComponent({ - setup() { - const data = Route.useLoaderData() - - return () => { - const first = data.value.records[0]! - - return ( -
-

{data.value.marker}

-

records: {data.value.records.length}

-
-

{first.name}

-

{first.id}

-

{first.description}

-
- -
- ) - } - }, -}) - export const Route = createFileRoute('/l1/l2/l3/l4/l5/l6')({ loader: () => makeLargePageLevelData(6, 0x5eed_1006), head: ({ loaderData }) => makeLargePageHead(loaderData), component: LevelSixComponent, }) + +function LevelSixComponent() { + const data = Route.useLoaderData() + const first = data.value.records[0]! + + return ( +
+

{data.value.marker}

+

records: {data.value.records.length}

+
+

{first.name}

+

{first.id}

+

{first.description}

+
+ +
+ ) +} diff --git a/benchmarks/memory/server/scenarios/peak-large-page/vue/src/routes/l1.l2.l3.l4.l5.tsx b/benchmarks/memory/server/scenarios/peak-large-page/vue/src/routes/l1.l2.l3.l4.l5.tsx index 5d936f83b5..f390ae3db3 100644 --- a/benchmarks/memory/server/scenarios/peak-large-page/vue/src/routes/l1.l2.l3.l4.l5.tsx +++ b/benchmarks/memory/server/scenarios/peak-large-page/vue/src/routes/l1.l2.l3.l4.l5.tsx @@ -1,35 +1,29 @@ -import { defineComponent } from 'vue' import { Outlet, createFileRoute } from '@tanstack/vue-router' import { makeLargePageHead, makeLargePageLevelData, } from '../../../large-page-data' -const LevelFiveComponent = defineComponent({ - setup() { - const data = Route.useLoaderData() - - return () => { - const first = data.value.records[0]! - - return ( -
-

{data.value.marker}

-

records: {data.value.records.length}

-
-

{first.name}

-

{first.id}

-

{first.description}

-
- -
- ) - } - }, -}) - export const Route = createFileRoute('/l1/l2/l3/l4/l5')({ loader: () => makeLargePageLevelData(5, 0x5eed_1005), head: ({ loaderData }) => makeLargePageHead(loaderData), component: LevelFiveComponent, }) + +function LevelFiveComponent() { + const data = Route.useLoaderData() + const first = data.value.records[0]! + + return ( +
+

{data.value.marker}

+

records: {data.value.records.length}

+
+

{first.name}

+

{first.id}

+

{first.description}

+
+ +
+ ) +} diff --git a/benchmarks/memory/server/scenarios/peak-large-page/vue/src/routes/l1.l2.l3.l4.tsx b/benchmarks/memory/server/scenarios/peak-large-page/vue/src/routes/l1.l2.l3.l4.tsx index 8e10331f2d..6b30bd50dc 100644 --- a/benchmarks/memory/server/scenarios/peak-large-page/vue/src/routes/l1.l2.l3.l4.tsx +++ b/benchmarks/memory/server/scenarios/peak-large-page/vue/src/routes/l1.l2.l3.l4.tsx @@ -1,35 +1,29 @@ -import { defineComponent } from 'vue' import { Outlet, createFileRoute } from '@tanstack/vue-router' import { makeLargePageHead, makeLargePageLevelData, } from '../../../large-page-data' -const LevelFourComponent = defineComponent({ - setup() { - const data = Route.useLoaderData() - - return () => { - const first = data.value.records[0]! - - return ( -
-

{data.value.marker}

-

records: {data.value.records.length}

-
-

{first.name}

-

{first.id}

-

{first.description}

-
- -
- ) - } - }, -}) - export const Route = createFileRoute('/l1/l2/l3/l4')({ loader: () => makeLargePageLevelData(4, 0x5eed_1004), head: ({ loaderData }) => makeLargePageHead(loaderData), component: LevelFourComponent, }) + +function LevelFourComponent() { + const data = Route.useLoaderData() + const first = data.value.records[0]! + + return ( +
+

{data.value.marker}

+

records: {data.value.records.length}

+
+

{first.name}

+

{first.id}

+

{first.description}

+
+ +
+ ) +} diff --git a/benchmarks/memory/server/scenarios/peak-large-page/vue/src/routes/l1.l2.l3.tsx b/benchmarks/memory/server/scenarios/peak-large-page/vue/src/routes/l1.l2.l3.tsx index d69529c50c..6ec6f32fea 100644 --- a/benchmarks/memory/server/scenarios/peak-large-page/vue/src/routes/l1.l2.l3.tsx +++ b/benchmarks/memory/server/scenarios/peak-large-page/vue/src/routes/l1.l2.l3.tsx @@ -1,35 +1,29 @@ -import { defineComponent } from 'vue' import { Outlet, createFileRoute } from '@tanstack/vue-router' import { makeLargePageHead, makeLargePageLevelData, } from '../../../large-page-data' -const LevelThreeComponent = defineComponent({ - setup() { - const data = Route.useLoaderData() - - return () => { - const first = data.value.records[0]! - - return ( -
-

{data.value.marker}

-

records: {data.value.records.length}

-
-

{first.name}

-

{first.id}

-

{first.description}

-
- -
- ) - } - }, -}) - export const Route = createFileRoute('/l1/l2/l3')({ loader: () => makeLargePageLevelData(3, 0x5eed_1003), head: ({ loaderData }) => makeLargePageHead(loaderData), component: LevelThreeComponent, }) + +function LevelThreeComponent() { + const data = Route.useLoaderData() + const first = data.value.records[0]! + + return ( +
+

{data.value.marker}

+

records: {data.value.records.length}

+
+

{first.name}

+

{first.id}

+

{first.description}

+
+ +
+ ) +} diff --git a/benchmarks/memory/server/scenarios/peak-large-page/vue/src/routes/l1.l2.tsx b/benchmarks/memory/server/scenarios/peak-large-page/vue/src/routes/l1.l2.tsx index d04bc7f827..e5b4cf0de1 100644 --- a/benchmarks/memory/server/scenarios/peak-large-page/vue/src/routes/l1.l2.tsx +++ b/benchmarks/memory/server/scenarios/peak-large-page/vue/src/routes/l1.l2.tsx @@ -1,35 +1,29 @@ -import { defineComponent } from 'vue' import { Outlet, createFileRoute } from '@tanstack/vue-router' import { makeLargePageHead, makeLargePageLevelData, } from '../../../large-page-data' -const LevelTwoComponent = defineComponent({ - setup() { - const data = Route.useLoaderData() - - return () => { - const first = data.value.records[0]! - - return ( -
-

{data.value.marker}

-

records: {data.value.records.length}

-
-

{first.name}

-

{first.id}

-

{first.description}

-
- -
- ) - } - }, -}) - export const Route = createFileRoute('/l1/l2')({ loader: () => makeLargePageLevelData(2, 0x5eed_1002), head: ({ loaderData }) => makeLargePageHead(loaderData), component: LevelTwoComponent, }) + +function LevelTwoComponent() { + const data = Route.useLoaderData() + const first = data.value.records[0]! + + return ( +
+

{data.value.marker}

+

records: {data.value.records.length}

+
+

{first.name}

+

{first.id}

+

{first.description}

+
+ +
+ ) +} diff --git a/benchmarks/memory/server/scenarios/peak-large-page/vue/src/routes/l1.tsx b/benchmarks/memory/server/scenarios/peak-large-page/vue/src/routes/l1.tsx index a95ae7f9b0..a29e465cd4 100644 --- a/benchmarks/memory/server/scenarios/peak-large-page/vue/src/routes/l1.tsx +++ b/benchmarks/memory/server/scenarios/peak-large-page/vue/src/routes/l1.tsx @@ -1,35 +1,29 @@ -import { defineComponent } from 'vue' import { Outlet, createFileRoute } from '@tanstack/vue-router' import { makeLargePageHead, makeLargePageLevelData, } from '../../../large-page-data' -const LevelOneComponent = defineComponent({ - setup() { - const data = Route.useLoaderData() - - return () => { - const first = data.value.records[0]! - - return ( -
-

{data.value.marker}

-

records: {data.value.records.length}

-
-

{first.name}

-

{first.id}

-

{first.description}

-
- -
- ) - } - }, -}) - export const Route = createFileRoute('/l1')({ loader: () => makeLargePageLevelData(1, 0x5eed_1001), head: ({ loaderData }) => makeLargePageHead(loaderData), component: LevelOneComponent, }) + +function LevelOneComponent() { + const data = Route.useLoaderData() + const first = data.value.records[0]! + + return ( +
+

{data.value.marker}

+

records: {data.value.records.length}

+
+

{first.name}

+

{first.id}

+

{first.description}

+
+ +
+ ) +} 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 8b5f16ad63..9a5c211fee 100644 --- a/benchmarks/memory/server/scenarios/request-churn/react/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/request-churn/react/memory.bench.ts @@ -1,16 +1,11 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-server/bench-utils' +import { bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -test('memory', async ({ bench }) => { +describe('memory', () => { for (const workload of workloadGroup.workloads) { - await bench(workload.name, memoryBenchHooks(), workload.run).run( - memoryBenchOptions, - ) + bench(workload.name, workload.run, memoryBenchOptions) } }) diff --git a/benchmarks/memory/server/scenarios/request-churn/shared.ts b/benchmarks/memory/server/scenarios/request-churn/shared.ts index b200c96ed6..32125148cd 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 = async () => + const run = () => 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 8b5f16ad63..9a5c211fee 100644 --- a/benchmarks/memory/server/scenarios/request-churn/solid/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/request-churn/solid/memory.bench.ts @@ -1,16 +1,11 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-server/bench-utils' +import { bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -test('memory', async ({ bench }) => { +describe('memory', () => { for (const workload of workloadGroup.workloads) { - await bench(workload.name, memoryBenchHooks(), workload.run).run( - memoryBenchOptions, - ) + bench(workload.name, workload.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 8b5f16ad63..9a5c211fee 100644 --- a/benchmarks/memory/server/scenarios/request-churn/vue/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/request-churn/vue/memory.bench.ts @@ -1,16 +1,11 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-server/bench-utils' +import { bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -test('memory', async ({ bench }) => { +describe('memory', () => { for (const workload of workloadGroup.workloads) { - await bench(workload.name, memoryBenchHooks(), workload.run).run( - memoryBenchOptions, - ) + bench(workload.name, workload.run, memoryBenchOptions) } }) diff --git a/benchmarks/memory/server/scenarios/request-churn/vue/src/routes/items.$id.tsx b/benchmarks/memory/server/scenarios/request-churn/vue/src/routes/items.$id.tsx index 570561f2a8..a98d036565 100644 --- a/benchmarks/memory/server/scenarios/request-churn/vue/src/routes/items.$id.tsx +++ b/benchmarks/memory/server/scenarios/request-churn/vue/src/routes/items.$id.tsx @@ -1,4 +1,3 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' const itemIndexes = Array.from({ length: 5 }, (_, index) => index) @@ -7,24 +6,6 @@ type ItemSearch = { q: string } -const ItemComponent = defineComponent({ - setup() { - const data = Route.useLoaderData() - - return () => ( -
-

{data.value.title}

-

{data.value.q}

-
    - {data.value.items.map((item) => ( -
  • {item.label}
  • - ))} -
-
- ) - }, -}) - export const Route = createFileRoute('/items/$id')({ validateSearch: (search: Record): ItemSearch => ({ q: typeof search.q === 'string' ? search.q : '', @@ -41,3 +22,19 @@ export const Route = createFileRoute('/items/$id')({ }), component: ItemComponent, }) + +function ItemComponent() { + const data = Route.useLoaderData() + + return ( +
+

{data.value.title}

+

{data.value.q}

+
    + {data.value.items.map((item) => ( +
  • {item.label}
  • + ))} +
+
+ ) +} 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 8b5f16ad63..9a5c211fee 100644 --- a/benchmarks/memory/server/scenarios/serialization-payload/react/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/serialization-payload/react/memory.bench.ts @@ -1,16 +1,11 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-server/bench-utils' +import { bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -test('memory', async ({ bench }) => { +describe('memory', () => { for (const workload of workloadGroup.workloads) { - await bench(workload.name, memoryBenchHooks(), workload.run).run( - memoryBenchOptions, - ) + bench(workload.name, workload.run, memoryBenchOptions) } }) diff --git a/benchmarks/memory/server/scenarios/serialization-payload/shared.ts b/benchmarks/memory/server/scenarios/serialization-payload/shared.ts index 14ec8f7e0a..7f40aeb9d2 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 = async () => + const run = () => 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 8b5f16ad63..9a5c211fee 100644 --- a/benchmarks/memory/server/scenarios/serialization-payload/solid/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/serialization-payload/solid/memory.bench.ts @@ -1,16 +1,11 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-server/bench-utils' +import { bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -test('memory', async ({ bench }) => { +describe('memory', () => { for (const workload of workloadGroup.workloads) { - await bench(workload.name, memoryBenchHooks(), workload.run).run( - memoryBenchOptions, - ) + bench(workload.name, workload.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 8b5f16ad63..9a5c211fee 100644 --- a/benchmarks/memory/server/scenarios/serialization-payload/vue/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/serialization-payload/vue/memory.bench.ts @@ -1,16 +1,11 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-server/bench-utils' +import { bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -test('memory', async ({ bench }) => { +describe('memory', () => { for (const workload of workloadGroup.workloads) { - await bench(workload.name, memoryBenchHooks(), workload.run).run( - memoryBenchOptions, - ) + bench(workload.name, workload.run, memoryBenchOptions) } }) diff --git a/benchmarks/memory/server/scenarios/serialization-payload/vue/src/routes/data.$id.tsx b/benchmarks/memory/server/scenarios/serialization-payload/vue/src/routes/data.$id.tsx index 37b1a590e4..e6b4cfadfb 100644 --- a/benchmarks/memory/server/scenarios/serialization-payload/vue/src/routes/data.$id.tsx +++ b/benchmarks/memory/server/scenarios/serialization-payload/vue/src/routes/data.$id.tsx @@ -1,20 +1,17 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' import { makeSerializationPayload } from '../../../serialization-payload' -const DataComponent = defineComponent({ - setup() { - const data = Route.useLoaderData() - - return () => ( -
- Map size: {data.value.lookup.size} -
- ) - }, -}) - export const Route = createFileRoute('/data/$id')({ loader: ({ params }) => makeSerializationPayload(params.id), component: DataComponent, }) + +function DataComponent() { + const data = Route.useLoaderData() + + return ( +
+ Map size: {data.value.lookup.size} +
+ ) +} 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 8b5f16ad63..9a5c211fee 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,16 +1,11 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-server/bench-utils' +import { bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -test('memory', async ({ bench }) => { +describe('memory', () => { for (const workload of workloadGroup.workloads) { - await bench(workload.name, memoryBenchHooks(), workload.run).run( - memoryBenchOptions, - ) + bench(workload.name, workload.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 167b24d3b6..5fd1e22632 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 = async () => + const run = () => 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 8b5f16ad63..9a5c211fee 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,16 +1,11 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-server/bench-utils' +import { bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -test('memory', async ({ bench }) => { +describe('memory', () => { for (const workload of workloadGroup.workloads) { - await bench(workload.name, memoryBenchHooks(), workload.run).run( - memoryBenchOptions, - ) + bench(workload.name, workload.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 8b5f16ad63..9a5c211fee 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,16 +1,11 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-server/bench-utils' +import { bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -test('memory', async ({ bench }) => { +describe('memory', () => { for (const workload of workloadGroup.workloads) { - await bench(workload.name, memoryBenchHooks(), workload.run).run( - memoryBenchOptions, - ) + bench(workload.name, workload.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 8b5f16ad63..9a5c211fee 100644 --- a/benchmarks/memory/server/scenarios/streaming-peak/react/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/streaming-peak/react/memory.bench.ts @@ -1,16 +1,11 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-server/bench-utils' +import { bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -test('memory', async ({ bench }) => { +describe('memory', () => { for (const workload of workloadGroup.workloads) { - await bench(workload.name, memoryBenchHooks(), workload.run).run( - memoryBenchOptions, - ) + bench(workload.name, workload.run, memoryBenchOptions) } }) diff --git a/benchmarks/memory/server/scenarios/streaming-peak/shared.ts b/benchmarks/memory/server/scenarios/streaming-peak/shared.ts index c027047408..01917c4743 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 = async () => + const run = () => 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 8b5f16ad63..9a5c211fee 100644 --- a/benchmarks/memory/server/scenarios/streaming-peak/solid/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/streaming-peak/solid/memory.bench.ts @@ -1,16 +1,11 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-server/bench-utils' +import { bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -test('memory', async ({ bench }) => { +describe('memory', () => { for (const workload of workloadGroup.workloads) { - await bench(workload.name, memoryBenchHooks(), workload.run).run( - memoryBenchOptions, - ) + bench(workload.name, workload.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 8b5f16ad63..9a5c211fee 100644 --- a/benchmarks/memory/server/scenarios/streaming-peak/vue/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/streaming-peak/vue/memory.bench.ts @@ -1,16 +1,11 @@ -import { test } from 'vitest' -import { - memoryBenchHooks, - memoryBenchOptions, -} from '#memory-server/bench-utils' +import { bench, describe } from 'vitest' +import { memoryBenchOptions } from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -test('memory', async ({ bench }) => { +describe('memory', () => { for (const workload of workloadGroup.workloads) { - await bench(workload.name, memoryBenchHooks(), workload.run).run( - memoryBenchOptions, - ) + bench(workload.name, workload.run, memoryBenchOptions) } }) diff --git a/benchmarks/memory/server/scenarios/streaming-peak/vue/src/routes/stream.$id.tsx b/benchmarks/memory/server/scenarios/streaming-peak/vue/src/routes/stream.$id.tsx index 750d1cb47d..0c71a8d3a0 100644 --- a/benchmarks/memory/server/scenarios/streaming-peak/vue/src/routes/stream.$id.tsx +++ b/benchmarks/memory/server/scenarios/streaming-peak/vue/src/routes/stream.$id.tsx @@ -1,5 +1,5 @@ import { Await, createFileRoute } from '@tanstack/vue-router' -import { Suspense, defineComponent } from 'vue' +import { Suspense } from 'vue' import { makeDeferredSectionPayload, type DeferredSectionPayload, @@ -7,47 +7,6 @@ import { const fallbackFlushTicks = 20 -const StreamComponent = defineComponent({ - setup() { - const data = Route.useLoaderData() - - return () => { - const deferredSections = [ - { index: 0, promise: data.value.deferred0 }, - { index: 1, promise: data.value.deferred1 }, - { index: 2, promise: data.value.deferred2 }, - { index: 3, promise: data.value.deferred3 }, - ] as const - - return ( -
-

{data.value.eager}

- {deferredSections.map(({ index, promise }) => ( - <> -

- streaming-peak-fallback-{index} -

- - {{ - default: () => ( - ( - - )} - /> - ), - fallback: () => null, - }} - - - ))} -
- ) - } - }, -}) - export const Route = createFileRoute('/stream/$id')({ loader: ({ params }) => ({ eager: `streaming-peak-eager-${params.id}`, @@ -89,6 +48,42 @@ function makeDeferredSection(id: string, sectionIndex: number) { ) } +function StreamComponent() { + const data = Route.useLoaderData() + const deferredSections = [ + { index: 0, promise: data.value.deferred0 }, + { index: 1, promise: data.value.deferred1 }, + { index: 2, promise: data.value.deferred2 }, + { index: 3, promise: data.value.deferred3 }, + ] as const + + return ( +
+

{data.value.eager}

+ {deferredSections.map(({ index, promise }) => ( + <> +

+ streaming-peak-fallback-{index} +

+ + {{ + default: () => ( + ( + + )} + /> + ), + fallback: () => null, + }} + + + ))} +
+ ) +} + function DeferredSection({ section }: { section: DeferredSectionPayload }) { const marker = `streaming-peak-deferred-${section.index}` diff --git a/benchmarks/memory/server/vitest.setup.ts b/benchmarks/memory/server/vitest.setup.ts new file mode 100644 index 0000000000..be96c0067a --- /dev/null +++ b/benchmarks/memory/server/vitest.setup.ts @@ -0,0 +1,4 @@ +import { beforeEach } from 'vitest' +import { endMemoryTurn } from '../turn' + +beforeEach(endMemoryTurn) diff --git a/benchmarks/memory/turn.ts b/benchmarks/memory/turn.ts index 08729685fe..3ee6d53833 100644 --- a/benchmarks/memory/turn.ts +++ b/benchmarks/memory/turn.ts @@ -10,25 +10,3 @@ 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/README.md b/benchmarks/ssr/README.md index 3d90af1598..625e1006c5 100644 --- a/benchmarks/ssr/README.md +++ b/benchmarks/ssr/README.md @@ -98,18 +98,3 @@ Use `react`, `solid`, or `vue` for ``. The baseline projects use `@be - Server-function loops must include `sec-fetch-site: same-origin` so the default CSRF middleware accepts the request. - Loops that expect non-200 responses pass a custom `validateResponse` to `runRequestLoop`. - Bench loops must build deterministic requests from the seeded random helper and consume response bodies through `runRequestLoop` or `runSsrRequestLoop`. - -## Optional React Link workloads - -The [opt-in Link suite](../client-nav/README.md#opt-in-react-link-performance-suite) -adds focused standalone React Router SSR coverage for params/updaters, -inheritance, search middlewares, optional/splat segments, encoding, masks, -rewrites, and active props. Each timed batch creates four fresh routers and -renders their Links to HTML; it does not measure Start HTTP/streaming overhead. - -```bash -CI=1 NX_DAEMON=false pnpm nx run @benchmarks/react-link-performance:test:perf:ssr --outputStyle=stream --skipRemoteCache -- --run -``` - -These cases are excluded from this directory's aggregate projects and normal -CodSpeed dependency graph; they only run through the dedicated target above. diff --git a/benchmarks/ssr/package.json b/benchmarks/ssr/package.json index 20c1837468..07fbd92849 100644 --- a/benchmarks/ssr/package.json +++ b/benchmarks/ssr/package.json @@ -15,11 +15,11 @@ "vue": "^3.5.16" }, "devDependencies": { - "@codspeed/vitest-plugin": "^6.0.1", + "@codspeed/vitest-plugin": "^5.5.0", "@vitejs/plugin-react": "^6.0.1", "@vitejs/plugin-vue-jsx": "^5.1.5", "@types/react": "catalog:", - "seroval": "^1.6.7", + "seroval": "^1.6.2", "@typescript/native": "npm:typescript@^7.0.2", "jsdom": "29.1.1", "typescript": "npm:@typescript/typescript6@^6.0.2", @@ -116,7 +116,7 @@ "build:vue" ], "options": { - "command": "NODE_ENV=production vitest bench --mode benchmark", + "command": "NODE_ENV=production vitest bench", "cwd": "benchmarks/ssr" } }, @@ -134,7 +134,7 @@ "build:react" ], "options": { - "command": "NODE_ENV=production vitest bench --mode benchmark --config ./vitest.react.config.ts", + "command": "NODE_ENV=production vitest bench --config ./vitest.react.config.ts", "cwd": "benchmarks/ssr" } }, @@ -145,7 +145,7 @@ "build:solid" ], "options": { - "command": "NODE_ENV=production vitest bench --mode benchmark --config ./vitest.solid.config.ts", + "command": "NODE_ENV=production vitest bench --config ./vitest.solid.config.ts", "cwd": "benchmarks/ssr" } }, @@ -156,7 +156,7 @@ "build:vue" ], "options": { - "command": "NODE_ENV=production vitest bench --mode benchmark --config ./vitest.vue.config.ts", + "command": "NODE_ENV=production vitest bench --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 6825a7ddfb..419b1ccb36 100644 --- a/benchmarks/ssr/react/speed.bench.ts +++ b/benchmarks/ssr/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { test } from 'vitest' +import { bench, describe } from 'vitest' import { runSsrRequestLoop } from '../bench-utils' import type { StartRequestHandler } from '../bench-utils' @@ -11,12 +11,14 @@ const { default: handler } = (await import( default: StartRequestHandler } -test('ssr', async ({ bench }) => { - await bench('ssr request loop (react)', async () => - runSsrRequestLoop(handler, { seed: benchmarkSeed }), - ).run({ - warmupIterations: 100, - time: 10_000, - throws: true, - }) +describe('ssr', () => { + bench( + 'ssr request loop (react)', + () => runSsrRequestLoop(handler, { seed: benchmarkSeed }), + { + 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 0496613afb..6413559b92 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertAssetsScenario, assetsBenchOptions, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertAssetsScenario(handler) -test('ssr', async ({ bench }) => { - await bench('ssr assets linked-css control (react)', async () => - runAssetsLinkedControlLoop(handler), - ).run(assetsBenchOptions) +describe('ssr', () => { + bench( + 'ssr assets linked-css control (react)', + () => runAssetsLinkedControlLoop(handler), + assetsBenchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/assets/react/speed.bench.ts b/benchmarks/ssr/scenarios/assets/react/speed.bench.ts index 7dc57d89f1..5970b88f0b 100644 --- a/benchmarks/ssr/scenarios/assets/react/speed.bench.ts +++ b/benchmarks/ssr/scenarios/assets/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertAssetsScenario, assetsBenchOptions, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertAssetsScenario(handler) -test('ssr', async ({ bench }) => { - await bench('ssr assets inline-css cdn (react)', async () => - runAssetsInlineLoop(handler), - ).run(assetsBenchOptions) +describe('ssr', () => { + bench( + 'ssr assets inline-css cdn (react)', + () => runAssetsInlineLoop(handler), + 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 d159124a04..63fa209ac3 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertAssetsScenario, assetsBenchOptions, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertAssetsScenario(handler) -test('ssr', async ({ bench }) => { - await bench('ssr assets linked-css control (solid)', async () => - runAssetsLinkedControlLoop(handler), - ).run(assetsBenchOptions) +describe('ssr', () => { + bench( + 'ssr assets linked-css control (solid)', + () => runAssetsLinkedControlLoop(handler), + assetsBenchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/assets/solid/speed.bench.ts b/benchmarks/ssr/scenarios/assets/solid/speed.bench.ts index 47f483df11..fb5631a50e 100644 --- a/benchmarks/ssr/scenarios/assets/solid/speed.bench.ts +++ b/benchmarks/ssr/scenarios/assets/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertAssetsScenario, assetsBenchOptions, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertAssetsScenario(handler) -test('ssr', async ({ bench }) => { - await bench('ssr assets inline-css cdn (solid)', async () => - runAssetsInlineLoop(handler), - ).run(assetsBenchOptions) +describe('ssr', () => { + bench( + 'ssr assets inline-css cdn (solid)', + () => runAssetsInlineLoop(handler), + 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 e56d41df6b..ae8712da75 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertAssetsScenario, assetsBenchOptions, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertAssetsScenario(handler) -test('ssr', async ({ bench }) => { - await bench('ssr assets linked-css control (vue)', async () => - runAssetsLinkedControlLoop(handler), - ).run(assetsBenchOptions) +describe('ssr', () => { + bench( + 'ssr assets linked-css control (vue)', + () => runAssetsLinkedControlLoop(handler), + assetsBenchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/assets/vue/speed.bench.ts b/benchmarks/ssr/scenarios/assets/vue/speed.bench.ts index 3f77a0dcc1..5225e3dc66 100644 --- a/benchmarks/ssr/scenarios/assets/vue/speed.bench.ts +++ b/benchmarks/ssr/scenarios/assets/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertAssetsScenario, assetsBenchOptions, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertAssetsScenario(handler) -test('ssr', async ({ bench }) => { - await bench('ssr assets inline-css cdn (vue)', async () => - runAssetsInlineLoop(handler), - ).run(assetsBenchOptions) +describe('ssr', () => { + bench( + 'ssr assets inline-css cdn (vue)', + () => runAssetsInlineLoop(handler), + assetsBenchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/assets/vue/src/routes/a.$x.$y.tsx b/benchmarks/ssr/scenarios/assets/vue/src/routes/a.$x.$y.tsx index a29fe59f22..a20e292938 100644 --- a/benchmarks/ssr/scenarios/assets/vue/src/routes/a.$x.$y.tsx +++ b/benchmarks/ssr/scenarios/assets/vue/src/routes/a.$x.$y.tsx @@ -1,21 +1,6 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' import '../styles/assets-leaf.css' -const LeafComponent = defineComponent({ - setup() { - const params = Route.useParams() - - return () => ( -
-

- assets-leaf-{params.value.x}-{params.value.y} -

-
- ) - }, -}) - export const Route = createFileRoute('/a/$x/$y')({ head: ({ params }) => ({ meta: [{ title: `SSR Assets ${params.x} ${params.y}` }], @@ -27,3 +12,15 @@ export const Route = createFileRoute('/a/$x/$y')({ }), component: LeafComponent, }) + +function LeafComponent() { + const params = Route.useParams() + + return ( +
+

+ assets-leaf-{params.value.x}-{params.value.y} +

+
+ ) +} diff --git a/benchmarks/ssr/scenarios/assets/vue/src/routes/a.$x.tsx b/benchmarks/ssr/scenarios/assets/vue/src/routes/a.$x.tsx index e1fe0418e4..f8038f6f28 100644 --- a/benchmarks/ssr/scenarios/assets/vue/src/routes/a.$x.tsx +++ b/benchmarks/ssr/scenarios/assets/vue/src/routes/a.$x.tsx @@ -1,20 +1,6 @@ -import { defineComponent } from 'vue' import { Outlet, createFileRoute } from '@tanstack/vue-router' import '../styles/assets-a.css' -const LevelAComponent = defineComponent({ - setup() { - const params = Route.useParams() - - return () => ( -
-

assets-level-a-{params.value.x}

- -
- ) - }, -}) - export const Route = createFileRoute('/a/$x')({ head: ({ params }) => ({ meta: [{ title: `SSR Assets ${params.x}` }], @@ -26,3 +12,14 @@ export const Route = createFileRoute('/a/$x')({ }), component: LevelAComponent, }) + +function LevelAComponent() { + const params = Route.useParams() + + return ( +
+

assets-level-a-{params.value.x}

+ +
+ ) +} diff --git a/benchmarks/ssr/scenarios/before-load/react/speed.bench.ts b/benchmarks/ssr/scenarios/before-load/react/speed.bench.ts index 8a4355a168..09073687c0 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertBeforeLoadScenario, beforeLoadBenchOptions, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertBeforeLoadScenario(handler) -test('ssr', async ({ bench }) => { - await bench('ssr before-load chain (react)', async () => - runBeforeLoadLoop(handler), - ).run(beforeLoadBenchOptions) +describe('ssr', () => { + bench( + 'ssr before-load chain (react)', + () => runBeforeLoadLoop(handler), + beforeLoadBenchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/before-load/solid/speed.bench.ts b/benchmarks/ssr/scenarios/before-load/solid/speed.bench.ts index 27e0d3a64c..5f6e8baf8a 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertBeforeLoadScenario, beforeLoadBenchOptions, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertBeforeLoadScenario(handler) -test('ssr', async ({ bench }) => { - await bench('ssr before-load chain (solid)', async () => - runBeforeLoadLoop(handler), - ).run(beforeLoadBenchOptions) +describe('ssr', () => { + bench( + 'ssr before-load chain (solid)', + () => runBeforeLoadLoop(handler), + beforeLoadBenchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/before-load/vue/speed.bench.ts b/benchmarks/ssr/scenarios/before-load/vue/speed.bench.ts index 8684c159eb..d2cfd6814b 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertBeforeLoadScenario, beforeLoadBenchOptions, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertBeforeLoadScenario(handler) -test('ssr', async ({ bench }) => { - await bench('ssr before-load chain (vue)', async () => - runBeforeLoadLoop(handler), - ).run(beforeLoadBenchOptions) +describe('ssr', () => { + bench( + 'ssr before-load chain (vue)', + () => runBeforeLoadLoop(handler), + beforeLoadBenchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/before-load/vue/src/routes/$a.$b.$c.tsx b/benchmarks/ssr/scenarios/before-load/vue/src/routes/$a.$b.$c.tsx index 178d4071eb..118e16553b 100644 --- a/benchmarks/ssr/scenarios/before-load/vue/src/routes/$a.$b.$c.tsx +++ b/benchmarks/ssr/scenarios/before-load/vue/src/routes/$a.$b.$c.tsx @@ -1,15 +1,6 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' import { makeBeforeLoadMarker, type BeforeLoadContext } from '../../../shared' -const LevelCComponent = defineComponent({ - setup() { - const data = Route.useLoaderData() - - return () =>
{data.value.marker}
- }, -}) - export const Route = createFileRoute('/$a/$b/$c')({ beforeLoad: ({ params, context }) => { const parent = context as BeforeLoadContext @@ -24,3 +15,9 @@ export const Route = createFileRoute('/$a/$b/$c')({ }), component: LevelCComponent, }) + +function LevelCComponent() { + const data = Route.useLoaderData() + + return
{data.value.marker}
+} diff --git a/benchmarks/ssr/scenarios/control-flow/react/speed.bench.ts b/benchmarks/ssr/scenarios/control-flow/react/speed.bench.ts index 899f400799..3c0a3f502e 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -test('ssr', async ({ bench }) => { - await bench('ssr redirect (react)', async () => runRedirectLoop(handler)).run( +describe('ssr', () => { + bench( + 'ssr redirect (react)', + () => runRedirectLoop(handler), 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 0a93c5eac3..3e117895d8 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -test('ssr', async ({ bench }) => { - await bench('ssr control-flow error 500 (react)', async () => - runErrorLoop(handler), - ).run(controlFlowBenchOptions) +describe('ssr', () => { + bench( + 'ssr control-flow error 500 (react)', + () => runErrorLoop(handler), + 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 53e09fd34e..566748735e 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -test('ssr', async ({ bench }) => { - await bench('ssr control-flow route headers (react)', async () => - runRouteHeadersLoop(handler), - ).run(controlFlowBenchOptions) +describe('ssr', () => { + bench( + 'ssr control-flow route headers (react)', + () => runRouteHeadersLoop(handler), + 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 1cd7c1044c..b7c25a0bb2 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -test('ssr', async ({ bench }) => { - await bench('ssr control-flow unmatched 404 (react)', async () => - runUnmatchedLoop(handler), - ).run(controlFlowBenchOptions) +describe('ssr', () => { + bench( + 'ssr control-flow unmatched 404 (react)', + () => runUnmatchedLoop(handler), + 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 1e8abfd318..e56335c602 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -test('ssr', async ({ bench }) => { - await bench('ssr not-found (react)', async () => - runNotFoundLoop(handler), - ).run(controlFlowBenchOptions) +describe('ssr', () => { + bench( + 'ssr not-found (react)', + () => runNotFoundLoop(handler), + controlFlowBenchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/control-flow/solid/speed.bench.ts b/benchmarks/ssr/scenarios/control-flow/solid/speed.bench.ts index 904b693e25..b76cd741df 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -test('ssr', async ({ bench }) => { - await bench('ssr redirect (solid)', async () => runRedirectLoop(handler)).run( +describe('ssr', () => { + bench( + 'ssr redirect (solid)', + () => runRedirectLoop(handler), 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 57a2f0fbe9..119f65c9ee 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -test('ssr', async ({ bench }) => { - await bench('ssr control-flow error 500 (solid)', async () => - runErrorLoop(handler), - ).run(controlFlowBenchOptions) +describe('ssr', () => { + bench( + 'ssr control-flow error 500 (solid)', + () => runErrorLoop(handler), + 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 6581e92b39..8954e67986 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -test('ssr', async ({ bench }) => { - await bench('ssr control-flow route headers (solid)', async () => - runRouteHeadersLoop(handler), - ).run(controlFlowBenchOptions) +describe('ssr', () => { + bench( + 'ssr control-flow route headers (solid)', + () => runRouteHeadersLoop(handler), + 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 40f1679320..d59282def9 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -test('ssr', async ({ bench }) => { - await bench('ssr control-flow unmatched 404 (solid)', async () => - runUnmatchedLoop(handler), - ).run(controlFlowBenchOptions) +describe('ssr', () => { + bench( + 'ssr control-flow unmatched 404 (solid)', + () => runUnmatchedLoop(handler), + 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 efcb7cc229..66cf63fe79 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -test('ssr', async ({ bench }) => { - await bench('ssr not-found (solid)', async () => - runNotFoundLoop(handler), - ).run(controlFlowBenchOptions) +describe('ssr', () => { + bench( + 'ssr not-found (solid)', + () => runNotFoundLoop(handler), + 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 3cec17d9c8..5e7342c172 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 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' +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' const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRouteImport, } as any) -const BoomIdRoute = BoomIdRouteImport.update({ - id: '/boom/$id', - path: '/boom/$id', - getParentRoute: () => rootRouteImport, -} as any) -const FromIdRoute = FromIdRouteImport.update({ - id: '/from/$id', - path: '/from/$id', - getParentRoute: () => rootRouteImport, -} as any) -const HeadersIdRoute = HeadersIdRouteImport.update({ - id: '/headers/$id', - path: '/headers/$id', +const TargetIdRoute = TargetIdRouteImport.update({ + id: '/target/$id', + path: '/target/$id', getParentRoute: () => rootRouteImport, } as any) const MissingIdRoute = MissingIdRouteImport.update({ @@ -41,9 +31,19 @@ const MissingIdRoute = MissingIdRouteImport.update({ path: '/missing/$id', getParentRoute: () => rootRouteImport, } as any) -const TargetIdRoute = TargetIdRouteImport.update({ - id: '/target/$id', - path: '/target/$id', +const HeadersIdRoute = HeadersIdRouteImport.update({ + id: '/headers/$id', + path: '/headers/$id', + getParentRoute: () => rootRouteImport, +} as any) +const FromIdRoute = FromIdRouteImport.update({ + id: '/from/$id', + path: '/from/$id', + getParentRoute: () => rootRouteImport, +} as any) +const BoomIdRoute = BoomIdRouteImport.update({ + id: '/boom/$id', + path: '/boom/$id', getParentRoute: () => rootRouteImport, } as any) @@ -117,25 +117,11 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } - '/boom/$id': { - id: '/boom/$id' - path: '/boom/$id' - fullPath: '/boom/$id' - preLoaderRoute: typeof BoomIdRouteImport - parentRoute: typeof rootRouteImport - } - '/from/$id': { - id: '/from/$id' - path: '/from/$id' - fullPath: '/from/$id' - preLoaderRoute: typeof FromIdRouteImport - parentRoute: typeof rootRouteImport - } - '/headers/$id': { - id: '/headers/$id' - path: '/headers/$id' - fullPath: '/headers/$id' - preLoaderRoute: typeof HeadersIdRouteImport + '/target/$id': { + id: '/target/$id' + path: '/target/$id' + fullPath: '/target/$id' + preLoaderRoute: typeof TargetIdRouteImport parentRoute: typeof rootRouteImport } '/missing/$id': { @@ -145,11 +131,25 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof MissingIdRouteImport parentRoute: typeof rootRouteImport } - '/target/$id': { - id: '/target/$id' - path: '/target/$id' - fullPath: '/target/$id' - preLoaderRoute: typeof TargetIdRouteImport + '/headers/$id': { + id: '/headers/$id' + path: '/headers/$id' + fullPath: '/headers/$id' + preLoaderRoute: typeof HeadersIdRouteImport + parentRoute: typeof rootRouteImport + } + '/from/$id': { + id: '/from/$id' + path: '/from/$id' + fullPath: '/from/$id' + preLoaderRoute: typeof FromIdRouteImport + parentRoute: typeof rootRouteImport + } + '/boom/$id': { + id: '/boom/$id' + path: '/boom/$id' + fullPath: '/boom/$id' + preLoaderRoute: typeof BoomIdRouteImport 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 0b95f426f2..e57ec26b52 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -test('ssr', async ({ bench }) => { - await bench('ssr redirect (vue)', async () => runRedirectLoop(handler)).run( +describe('ssr', () => { + bench( + 'ssr redirect (vue)', + () => runRedirectLoop(handler), 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 262ca951af..e118e1dd28 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -test('ssr', async ({ bench }) => { - await bench('ssr control-flow error 500 (vue)', async () => - runErrorLoop(handler), - ).run(controlFlowBenchOptions) +describe('ssr', () => { + bench( + 'ssr control-flow error 500 (vue)', + () => runErrorLoop(handler), + 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 bf8c90a8a1..0bef524eaf 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -test('ssr', async ({ bench }) => { - await bench('ssr control-flow route headers (vue)', async () => - runRouteHeadersLoop(handler), - ).run(controlFlowBenchOptions) +describe('ssr', () => { + bench( + 'ssr control-flow route headers (vue)', + () => runRouteHeadersLoop(handler), + 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 d7f8ebeb9e..e29919dc56 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -test('ssr', async ({ bench }) => { - await bench('ssr control-flow unmatched 404 (vue)', async () => - runUnmatchedLoop(handler), - ).run(controlFlowBenchOptions) +describe('ssr', () => { + bench( + 'ssr control-flow unmatched 404 (vue)', + () => runUnmatchedLoop(handler), + 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 4b84fb594c..b2ab3af3c7 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -test('ssr', async ({ bench }) => { - await bench('ssr not-found (vue)', async () => runNotFoundLoop(handler)).run( +describe('ssr', () => { + bench( + 'ssr not-found (vue)', + () => runNotFoundLoop(handler), controlFlowBenchOptions, ) }) diff --git a/benchmarks/ssr/scenarios/control-flow/vue/src/routeTree.gen.ts b/benchmarks/ssr/scenarios/control-flow/vue/src/routeTree.gen.ts index 6dcf0d095e..f5063d1c09 100644 --- a/benchmarks/ssr/scenarios/control-flow/vue/src/routeTree.gen.ts +++ b/benchmarks/ssr/scenarios/control-flow/vue/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 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' +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' const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRouteImport, } as any) -const BoomIdRoute = BoomIdRouteImport.update({ - id: '/boom/$id', - path: '/boom/$id', - getParentRoute: () => rootRouteImport, -} as any) -const FromIdRoute = FromIdRouteImport.update({ - id: '/from/$id', - path: '/from/$id', - getParentRoute: () => rootRouteImport, -} as any) -const HeadersIdRoute = HeadersIdRouteImport.update({ - id: '/headers/$id', - path: '/headers/$id', +const TargetIdRoute = TargetIdRouteImport.update({ + id: '/target/$id', + path: '/target/$id', getParentRoute: () => rootRouteImport, } as any) const MissingIdRoute = MissingIdRouteImport.update({ @@ -41,9 +31,19 @@ const MissingIdRoute = MissingIdRouteImport.update({ path: '/missing/$id', getParentRoute: () => rootRouteImport, } as any) -const TargetIdRoute = TargetIdRouteImport.update({ - id: '/target/$id', - path: '/target/$id', +const HeadersIdRoute = HeadersIdRouteImport.update({ + id: '/headers/$id', + path: '/headers/$id', + getParentRoute: () => rootRouteImport, +} as any) +const FromIdRoute = FromIdRouteImport.update({ + id: '/from/$id', + path: '/from/$id', + getParentRoute: () => rootRouteImport, +} as any) +const BoomIdRoute = BoomIdRouteImport.update({ + id: '/boom/$id', + path: '/boom/$id', getParentRoute: () => rootRouteImport, } as any) @@ -117,25 +117,11 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } - '/boom/$id': { - id: '/boom/$id' - path: '/boom/$id' - fullPath: '/boom/$id' - preLoaderRoute: typeof BoomIdRouteImport - parentRoute: typeof rootRouteImport - } - '/from/$id': { - id: '/from/$id' - path: '/from/$id' - fullPath: '/from/$id' - preLoaderRoute: typeof FromIdRouteImport - parentRoute: typeof rootRouteImport - } - '/headers/$id': { - id: '/headers/$id' - path: '/headers/$id' - fullPath: '/headers/$id' - preLoaderRoute: typeof HeadersIdRouteImport + '/target/$id': { + id: '/target/$id' + path: '/target/$id' + fullPath: '/target/$id' + preLoaderRoute: typeof TargetIdRouteImport parentRoute: typeof rootRouteImport } '/missing/$id': { @@ -145,11 +131,25 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof MissingIdRouteImport parentRoute: typeof rootRouteImport } - '/target/$id': { - id: '/target/$id' - path: '/target/$id' - fullPath: '/target/$id' - preLoaderRoute: typeof TargetIdRouteImport + '/headers/$id': { + id: '/headers/$id' + path: '/headers/$id' + fullPath: '/headers/$id' + preLoaderRoute: typeof HeadersIdRouteImport + parentRoute: typeof rootRouteImport + } + '/from/$id': { + id: '/from/$id' + path: '/from/$id' + fullPath: '/from/$id' + preLoaderRoute: typeof FromIdRouteImport + parentRoute: typeof rootRouteImport + } + '/boom/$id': { + id: '/boom/$id' + path: '/boom/$id' + fullPath: '/boom/$id' + preLoaderRoute: typeof BoomIdRouteImport parentRoute: typeof rootRouteImport } } diff --git a/benchmarks/ssr/scenarios/control-flow/vue/src/routes/headers.$id.tsx b/benchmarks/ssr/scenarios/control-flow/vue/src/routes/headers.$id.tsx index 20c1bbe5ac..ac2ec01b52 100644 --- a/benchmarks/ssr/scenarios/control-flow/vue/src/routes/headers.$id.tsx +++ b/benchmarks/ssr/scenarios/control-flow/vue/src/routes/headers.$id.tsx @@ -1,14 +1,5 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' -const HeadersComponent = defineComponent({ - setup() { - const params = Route.useParams() - - return () =>
{`headers-${params.value.id}`}
- }, -}) - export const Route = createFileRoute('/headers/$id')({ headers: ({ params }) => ({ 'x-bench-route-header': `route-header-${params.id}`, @@ -16,3 +7,9 @@ export const Route = createFileRoute('/headers/$id')({ }), component: HeadersComponent, }) + +function HeadersComponent() { + const params = Route.useParams() + + return
{`headers-${params.value.id}`}
+} diff --git a/benchmarks/ssr/scenarios/control-flow/vue/src/routes/target.$id.tsx b/benchmarks/ssr/scenarios/control-flow/vue/src/routes/target.$id.tsx index 0bbf4a3dc6..17ade6bf5b 100644 --- a/benchmarks/ssr/scenarios/control-flow/vue/src/routes/target.$id.tsx +++ b/benchmarks/ssr/scenarios/control-flow/vue/src/routes/target.$id.tsx @@ -1,14 +1,11 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' -const TargetComponent = defineComponent({ - setup() { - const params = Route.useParams() - - return () =>
{`target-${params.value.id}`}
- }, -}) - export const Route = createFileRoute('/target/$id')({ component: TargetComponent, }) + +function TargetComponent() { + const params = Route.useParams() + + return
{`target-${params.value.id}`}
+} diff --git a/benchmarks/ssr/scenarios/global-middleware/bench.ts b/benchmarks/ssr/scenarios/global-middleware/bench.ts index d2784aed38..a89d03cabb 100644 --- a/benchmarks/ssr/scenarios/global-middleware/bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/bench.ts @@ -7,13 +7,10 @@ import { import { expectedFunctionTotal, expectedRequestTotal, - getExpectedRequestContext, makeDocumentMarker, makeServerFnMarker, makeServerRouteMarker, - setRequestMiddlewareCount, } from './shared' -import type { RequestMiddlewareCount } from './shared' import type { StartRequestHandler } from '../../bench-utils' export type { StartRequestHandler } @@ -143,7 +140,6 @@ function buildPostRequest(urls: FnUrls, bodies: Array, index: number) { export async function setupGlobalMiddlewareBench( handler: StartRequestHandler, ): Promise { - setRequestMiddlewareCount(3) const urls = await discoverUrls(handler) const payloads = createPayloads() const bodies = await createBodies(payloads) @@ -158,7 +154,6 @@ export async function setupGlobalMiddlewareBench( } async function assertDocumentResponse(handler: StartRequestHandler) { - setRequestMiddlewareCount(3) const id = 'page-sanity' const response = await handler.fetch( new Request(`${origin}/page/${id}`, documentRequestInit), @@ -180,11 +175,7 @@ async function assertDocumentResponse(handler: StartRequestHandler) { } } -async function assertServerRouteResponseForCount( - handler: StartRequestHandler, - count: RequestMiddlewareCount, -) { - setRequestMiddlewareCount(count) +async function assertServerRouteResponse(handler: StartRequestHandler) { const id = 'route-sanity' const response = await handler.fetch( new Request(`${origin}/api/ping/${id}`, apiRequestInit), @@ -208,8 +199,10 @@ async function assertServerRouteResponseForCount( marker?: string requestTotal?: number } - const expectedContext = getExpectedRequestContext(count) - const expectedMarker = makeServerRouteMarker(id, expectedContext) + const expectedMarker = makeServerRouteMarker(id, { + requestTrace: 'req.r1.r2.r3', + requestTotal: expectedRequestTotal, + }) if (body.marker !== expectedMarker) { throw new Error( @@ -217,9 +210,9 @@ async function assertServerRouteResponseForCount( ) } - if (body.requestTotal !== expectedContext.requestTotal) { + if (body.requestTotal !== expectedRequestTotal) { throw new Error( - `Expected server route requestTotal ${expectedContext.requestTotal}, received ${body.requestTotal}`, + `Expected server route requestTotal ${expectedRequestTotal}, received ${body.requestTotal}`, ) } } @@ -228,7 +221,6 @@ async function assertServerFnResponse( handler: StartRequestHandler, context: GlobalMiddlewareBenchContext, ) { - setRequestMiddlewareCount(3) const response = await handler.fetch( buildPostRequest(context.urls, context.bodies, 0), ) @@ -265,14 +257,10 @@ export async function assertGlobalMiddlewareScenario( ) { await assertDocumentResponse(handler) await assertServerFnResponse(handler, context) - for (const count of [0, 1, 2, 3] as const) { - await assertServerRouteResponseForCount(handler, count) - } - setRequestMiddlewareCount(3) + await assertServerRouteResponse(handler) } export function runGlobalMiddlewareDocumentLoop(handler: StartRequestHandler) { - setRequestMiddlewareCount(3) return runRequestLoop(handler, { seed: benchmarkSeed, concurrency: 16, @@ -285,7 +273,6 @@ export function runGlobalMiddlewareServerFnLoop( handler: StartRequestHandler, context: GlobalMiddlewareBenchContext, ) { - setRequestMiddlewareCount(3) return runRequestLoop(handler, { seed: benchmarkSeed, concurrency: 16, @@ -297,9 +284,7 @@ export function runGlobalMiddlewareServerFnLoop( export function runGlobalMiddlewareServerRouteLoop( handler: StartRequestHandler, - count: RequestMiddlewareCount = 3, ) { - setRequestMiddlewareCount(count) return runRequestLoop(handler, { seed: benchmarkSeed, concurrency: 16, diff --git a/benchmarks/ssr/scenarios/global-middleware/react/speed.bench.ts b/benchmarks/ssr/scenarios/global-middleware/react/speed.bench.ts index cb3f9f427c..c68d718262 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,8 +18,10 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr global-mw document (react)', async () => - runGlobalMiddlewareDocumentLoop(handler), - ).run(globalMiddlewareBenchOptions) +describe('ssr', () => { + bench( + 'ssr global-mw document (react)', + () => runGlobalMiddlewareDocumentLoop(handler), + 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 48c444de77..2655ef2f49 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,8 +18,10 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr global-mw server-fn (react)', async () => - runGlobalMiddlewareServerFnLoop(handler, context), - ).run(globalMiddlewareBenchOptions) +describe('ssr', () => { + bench( + 'ssr global-mw server-fn (react)', + () => runGlobalMiddlewareServerFnLoop(handler, context), + 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 deleted file mode 100644 index 22f53883ee..0000000000 --- a/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-0-middleware.bench.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { test } from 'vitest' -import { - assertGlobalMiddlewareScenario, - globalMiddlewareBenchOptions, - runGlobalMiddlewareServerRouteLoop, - setupGlobalMiddlewareBench, -} from '../bench' -import type { StartRequestHandler } from '../bench' - -const appModuleUrl = new URL('./dist/server/server.js', import.meta.url).href - -const { default: handler } = (await import( - /* @vite-ignore */ appModuleUrl -)) as { - default: StartRequestHandler -} -const context = await setupGlobalMiddlewareBench(handler) - -await assertGlobalMiddlewareScenario(handler, context) - -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 deleted file mode 100644 index f01b48d66e..0000000000 --- a/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-1-middleware.bench.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { test } from 'vitest' -import { - assertGlobalMiddlewareScenario, - globalMiddlewareBenchOptions, - runGlobalMiddlewareServerRouteLoop, - setupGlobalMiddlewareBench, -} from '../bench' -import type { StartRequestHandler } from '../bench' - -const appModuleUrl = new URL('./dist/server/server.js', import.meta.url).href - -const { default: handler } = (await import( - /* @vite-ignore */ appModuleUrl -)) as { - default: StartRequestHandler -} -const context = await setupGlobalMiddlewareBench(handler) - -await assertGlobalMiddlewareScenario(handler, context) - -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 deleted file mode 100644 index b01957f806..0000000000 --- a/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-2-middleware.bench.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { test } from 'vitest' -import { - assertGlobalMiddlewareScenario, - globalMiddlewareBenchOptions, - runGlobalMiddlewareServerRouteLoop, - setupGlobalMiddlewareBench, -} from '../bench' -import type { StartRequestHandler } from '../bench' - -const appModuleUrl = new URL('./dist/server/server.js', import.meta.url).href - -const { default: handler } = (await import( - /* @vite-ignore */ appModuleUrl -)) as { - default: StartRequestHandler -} -const context = await setupGlobalMiddlewareBench(handler) - -await assertGlobalMiddlewareScenario(handler, context) - -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 08d97fcaf6..9dc19cf943 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,8 +18,10 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr global-mw server-route 3 middlewares (react)', async () => - runGlobalMiddlewareServerRouteLoop(handler, 3), - ).run(globalMiddlewareBenchOptions) +describe('ssr', () => { + bench( + 'ssr global-mw server-route (react)', + () => runGlobalMiddlewareServerRouteLoop(handler), + globalMiddlewareBenchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/react/src/start.ts b/benchmarks/ssr/scenarios/global-middleware/react/src/start.ts index 8dfb2dd3c4..6b59e8035b 100644 --- a/benchmarks/ssr/scenarios/global-middleware/react/src/start.ts +++ b/benchmarks/ssr/scenarios/global-middleware/react/src/start.ts @@ -1,5 +1,4 @@ import { createMiddleware, createStart } from '@tanstack/react-start' -import { getRequestMiddlewareCount } from '../../shared' import type { GlobalMiddlewareContext } from '../../shared' function appendTrace( @@ -49,13 +48,6 @@ const requestMiddlewareC = createMiddleware({ type: 'request' }).server( }, ) -const requestMiddlewareSets: Array> = [ - [], - [requestMiddlewareA], - [requestMiddlewareA, requestMiddlewareB], - [requestMiddlewareA, requestMiddlewareB, requestMiddlewareC], -] - const functionMiddlewareA = createMiddleware({ type: 'function' }).server( ({ next, context }) => { const ctx = (context ?? {}) as GlobalMiddlewareContext @@ -83,6 +75,10 @@ const functionMiddlewareB = createMiddleware({ type: 'function' }).server( ) export const startInstance = createStart(() => ({ - requestMiddleware: requestMiddlewareSets[getRequestMiddlewareCount()], + requestMiddleware: [ + requestMiddlewareA, + requestMiddlewareB, + requestMiddlewareC, + ], functionMiddleware: [functionMiddlewareA, functionMiddlewareB], })) diff --git a/benchmarks/ssr/scenarios/global-middleware/shared.ts b/benchmarks/ssr/scenarios/global-middleware/shared.ts index 8fbe788911..f90fa9b233 100644 --- a/benchmarks/ssr/scenarios/global-middleware/shared.ts +++ b/benchmarks/ssr/scenarios/global-middleware/shared.ts @@ -10,41 +10,11 @@ export interface GlobalMiddlewareRouteContext extends GlobalMiddlewareContext { globalMiddlewareContext?: GlobalMiddlewareContext } -export type RequestMiddlewareCount = 0 | 1 | 2 | 3 - -const requestMiddlewareCountKey = '__TSR_SSR_BENCH_REQUEST_MIDDLEWARE_COUNT__' - -type BenchmarkGlobal = typeof globalThis & { - [requestMiddlewareCountKey]?: RequestMiddlewareCount -} - -const expectedRequestContexts: ReadonlyArray = [ - {}, - { requestTrace: 'req.r1', requestTotal: 1 }, - { requestTrace: 'req.r1.r2', requestTotal: 3 }, - { requestTrace: 'req.r1.r2.r3', requestTotal: 6 }, -] - export const expectedRequestTrace = 'req.r1.r2.r3' export const expectedRequestTotal = 6 export const expectedFunctionTrace = 'fn.f1.f2' export const expectedFunctionTotal = 30 -export function setRequestMiddlewareCount(count: RequestMiddlewareCount) { - const benchmarkGlobal = globalThis as BenchmarkGlobal - benchmarkGlobal[requestMiddlewareCountKey] = count -} - -export function getRequestMiddlewareCount(): RequestMiddlewareCount { - return (globalThis as BenchmarkGlobal)[requestMiddlewareCountKey] ?? 3 -} - -export function getExpectedRequestContext( - count: RequestMiddlewareCount, -): GlobalMiddlewareContext { - return expectedRequestContexts[count]! -} - export function makeDocumentMarker( id: string, context: GlobalMiddlewareContext, diff --git a/benchmarks/ssr/scenarios/global-middleware/solid/speed.bench.ts b/benchmarks/ssr/scenarios/global-middleware/solid/speed.bench.ts index 0e5f504090..5f27210e36 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,8 +18,10 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr global-mw document (solid)', async () => - runGlobalMiddlewareDocumentLoop(handler), - ).run(globalMiddlewareBenchOptions) +describe('ssr', () => { + bench( + 'ssr global-mw document (solid)', + () => runGlobalMiddlewareDocumentLoop(handler), + 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 915507ef9f..eb19e10ec9 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,8 +18,10 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr global-mw server-fn (solid)', async () => - runGlobalMiddlewareServerFnLoop(handler, context), - ).run(globalMiddlewareBenchOptions) +describe('ssr', () => { + bench( + 'ssr global-mw server-fn (solid)', + () => runGlobalMiddlewareServerFnLoop(handler, context), + 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 deleted file mode 100644 index a791145935..0000000000 --- a/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-0-middleware.bench.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { test } from 'vitest' -import { - assertGlobalMiddlewareScenario, - globalMiddlewareBenchOptions, - runGlobalMiddlewareServerRouteLoop, - setupGlobalMiddlewareBench, -} from '../bench' -import type { StartRequestHandler } from '../bench' - -const appModuleUrl = new URL('./dist/server/server.js', import.meta.url).href - -const { default: handler } = (await import( - /* @vite-ignore */ appModuleUrl -)) as { - default: StartRequestHandler -} -const context = await setupGlobalMiddlewareBench(handler) - -await assertGlobalMiddlewareScenario(handler, context) - -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 deleted file mode 100644 index 1baab0f344..0000000000 --- a/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-1-middleware.bench.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { test } from 'vitest' -import { - assertGlobalMiddlewareScenario, - globalMiddlewareBenchOptions, - runGlobalMiddlewareServerRouteLoop, - setupGlobalMiddlewareBench, -} from '../bench' -import type { StartRequestHandler } from '../bench' - -const appModuleUrl = new URL('./dist/server/server.js', import.meta.url).href - -const { default: handler } = (await import( - /* @vite-ignore */ appModuleUrl -)) as { - default: StartRequestHandler -} -const context = await setupGlobalMiddlewareBench(handler) - -await assertGlobalMiddlewareScenario(handler, context) - -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 deleted file mode 100644 index d6fde20764..0000000000 --- a/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-2-middleware.bench.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { test } from 'vitest' -import { - assertGlobalMiddlewareScenario, - globalMiddlewareBenchOptions, - runGlobalMiddlewareServerRouteLoop, - setupGlobalMiddlewareBench, -} from '../bench' -import type { StartRequestHandler } from '../bench' - -const appModuleUrl = new URL('./dist/server/server.js', import.meta.url).href - -const { default: handler } = (await import( - /* @vite-ignore */ appModuleUrl -)) as { - default: StartRequestHandler -} -const context = await setupGlobalMiddlewareBench(handler) - -await assertGlobalMiddlewareScenario(handler, context) - -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 558ebeb9a4..495c57112a 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,8 +18,10 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr global-mw server-route 3 middlewares (solid)', async () => - runGlobalMiddlewareServerRouteLoop(handler, 3), - ).run(globalMiddlewareBenchOptions) +describe('ssr', () => { + bench( + 'ssr global-mw server-route (solid)', + () => runGlobalMiddlewareServerRouteLoop(handler), + 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 65f7fa5848..28d816525e 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 ApiFnUrlsRouteImport } from './routes/api.fn-urls' import { Route as PageIdRouteImport } from './routes/page.$id' +import { Route as ApiFnUrlsRouteImport } from './routes/api.fn-urls' 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 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 ApiFnUrlsRoute = ApiFnUrlsRouteImport.update({ + id: '/api/fn-urls', + path: '/api/fn-urls', + 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 } - '/api/fn-urls': { - id: '/api/fn-urls' - path: '/api/fn-urls' - fullPath: '/api/fn-urls' - preLoaderRoute: typeof ApiFnUrlsRouteImport - parentRoute: typeof rootRouteImport - } '/page/$id': { id: '/page/$id' path: '/page/$id' @@ -92,6 +85,13 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof PageIdRouteImport parentRoute: typeof rootRouteImport } + '/api/fn-urls': { + id: '/api/fn-urls' + path: '/api/fn-urls' + fullPath: '/api/fn-urls' + preLoaderRoute: typeof ApiFnUrlsRouteImport + parentRoute: typeof rootRouteImport + } '/api/ping/$id': { id: '/api/ping/$id' path: '/api/ping/$id' diff --git a/benchmarks/ssr/scenarios/global-middleware/solid/src/start.ts b/benchmarks/ssr/scenarios/global-middleware/solid/src/start.ts index a6f6214b82..8c4168d574 100644 --- a/benchmarks/ssr/scenarios/global-middleware/solid/src/start.ts +++ b/benchmarks/ssr/scenarios/global-middleware/solid/src/start.ts @@ -1,5 +1,4 @@ import { createMiddleware, createStart } from '@tanstack/solid-start' -import { getRequestMiddlewareCount } from '../../shared' import type { GlobalMiddlewareContext } from '../../shared' function appendTrace( @@ -49,13 +48,6 @@ const requestMiddlewareC = createMiddleware({ type: 'request' }).server( }, ) -const requestMiddlewareSets: Array> = [ - [], - [requestMiddlewareA], - [requestMiddlewareA, requestMiddlewareB], - [requestMiddlewareA, requestMiddlewareB, requestMiddlewareC], -] - const functionMiddlewareA = createMiddleware({ type: 'function' }).server( ({ next, context }) => { const ctx = (context ?? {}) as GlobalMiddlewareContext @@ -83,6 +75,10 @@ const functionMiddlewareB = createMiddleware({ type: 'function' }).server( ) export const startInstance = createStart(() => ({ - requestMiddleware: requestMiddlewareSets[getRequestMiddlewareCount()], + requestMiddleware: [ + requestMiddlewareA, + requestMiddlewareB, + requestMiddlewareC, + ], functionMiddleware: [functionMiddlewareA, functionMiddlewareB], })) diff --git a/benchmarks/ssr/scenarios/global-middleware/vue/speed.bench.ts b/benchmarks/ssr/scenarios/global-middleware/vue/speed.bench.ts index 9660f29d07..5d92aab849 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,8 +18,10 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr global-mw document (vue)', async () => - runGlobalMiddlewareDocumentLoop(handler), - ).run(globalMiddlewareBenchOptions) +describe('ssr', () => { + bench( + 'ssr global-mw document (vue)', + () => runGlobalMiddlewareDocumentLoop(handler), + 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 297e8cee7b..ab158504c8 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,8 +18,10 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr global-mw server-fn (vue)', async () => - runGlobalMiddlewareServerFnLoop(handler, context), - ).run(globalMiddlewareBenchOptions) +describe('ssr', () => { + bench( + 'ssr global-mw server-fn (vue)', + () => runGlobalMiddlewareServerFnLoop(handler, context), + 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 deleted file mode 100644 index d023dd458a..0000000000 --- a/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-0-middleware.bench.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { test } from 'vitest' -import { - assertGlobalMiddlewareScenario, - globalMiddlewareBenchOptions, - runGlobalMiddlewareServerRouteLoop, - setupGlobalMiddlewareBench, -} from '../bench' -import type { StartRequestHandler } from '../bench' - -const appModuleUrl = new URL('./dist/server/server.js', import.meta.url).href - -const { default: handler } = (await import( - /* @vite-ignore */ appModuleUrl -)) as { - default: StartRequestHandler -} -const context = await setupGlobalMiddlewareBench(handler) - -await assertGlobalMiddlewareScenario(handler, context) - -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 deleted file mode 100644 index 5018163631..0000000000 --- a/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-1-middleware.bench.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { test } from 'vitest' -import { - assertGlobalMiddlewareScenario, - globalMiddlewareBenchOptions, - runGlobalMiddlewareServerRouteLoop, - setupGlobalMiddlewareBench, -} from '../bench' -import type { StartRequestHandler } from '../bench' - -const appModuleUrl = new URL('./dist/server/server.js', import.meta.url).href - -const { default: handler } = (await import( - /* @vite-ignore */ appModuleUrl -)) as { - default: StartRequestHandler -} -const context = await setupGlobalMiddlewareBench(handler) - -await assertGlobalMiddlewareScenario(handler, context) - -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 deleted file mode 100644 index f9abd8eb60..0000000000 --- a/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-2-middleware.bench.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { test } from 'vitest' -import { - assertGlobalMiddlewareScenario, - globalMiddlewareBenchOptions, - runGlobalMiddlewareServerRouteLoop, - setupGlobalMiddlewareBench, -} from '../bench' -import type { StartRequestHandler } from '../bench' - -const appModuleUrl = new URL('./dist/server/server.js', import.meta.url).href - -const { default: handler } = (await import( - /* @vite-ignore */ appModuleUrl -)) as { - default: StartRequestHandler -} -const context = await setupGlobalMiddlewareBench(handler) - -await assertGlobalMiddlewareScenario(handler, context) - -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 adcec3019f..e7fd4cd205 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,8 +18,10 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr global-mw server-route 3 middlewares (vue)', async () => - runGlobalMiddlewareServerRouteLoop(handler, 3), - ).run(globalMiddlewareBenchOptions) +describe('ssr', () => { + bench( + 'ssr global-mw server-route (vue)', + () => runGlobalMiddlewareServerRouteLoop(handler), + globalMiddlewareBenchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/vue/src/routeTree.gen.ts b/benchmarks/ssr/scenarios/global-middleware/vue/src/routeTree.gen.ts index 3118848e4d..aae3329420 100644 --- a/benchmarks/ssr/scenarios/global-middleware/vue/src/routeTree.gen.ts +++ b/benchmarks/ssr/scenarios/global-middleware/vue/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 ApiFnUrlsRouteImport } from './routes/api.fn-urls' import { Route as PageIdRouteImport } from './routes/page.$id' +import { Route as ApiFnUrlsRouteImport } from './routes/api.fn-urls' 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 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 ApiFnUrlsRoute = ApiFnUrlsRouteImport.update({ + id: '/api/fn-urls', + path: '/api/fn-urls', + getParentRoute: () => rootRouteImport, +} as any) const ApiPingIdRoute = ApiPingIdRouteImport.update({ id: '/api/ping/$id', path: '/api/ping/$id', @@ -78,13 +78,6 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } - '/api/fn-urls': { - id: '/api/fn-urls' - path: '/api/fn-urls' - fullPath: '/api/fn-urls' - preLoaderRoute: typeof ApiFnUrlsRouteImport - parentRoute: typeof rootRouteImport - } '/page/$id': { id: '/page/$id' path: '/page/$id' @@ -92,6 +85,13 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof PageIdRouteImport parentRoute: typeof rootRouteImport } + '/api/fn-urls': { + id: '/api/fn-urls' + path: '/api/fn-urls' + fullPath: '/api/fn-urls' + preLoaderRoute: typeof ApiFnUrlsRouteImport + parentRoute: typeof rootRouteImport + } '/api/ping/$id': { id: '/api/ping/$id' path: '/api/ping/$id' diff --git a/benchmarks/ssr/scenarios/global-middleware/vue/src/routes/page.$id.tsx b/benchmarks/ssr/scenarios/global-middleware/vue/src/routes/page.$id.tsx index 6e837ef0a0..2010d0cd2a 100644 --- a/benchmarks/ssr/scenarios/global-middleware/vue/src/routes/page.$id.tsx +++ b/benchmarks/ssr/scenarios/global-middleware/vue/src/routes/page.$id.tsx @@ -1,4 +1,3 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' import { getGlobalMiddlewareContext, @@ -6,14 +5,6 @@ import { type GlobalMiddlewareContext, } from '../../../shared' -const PageComponent = defineComponent({ - setup() { - const data = Route.useLoaderData() - - return () =>
{data.value.marker}
- }, -}) - export const Route = createFileRoute('/page/$id')({ beforeLoad: ({ serverContext }) => ({ globalMiddlewareContext: (serverContext ?? {}) as GlobalMiddlewareContext, @@ -23,3 +14,9 @@ export const Route = createFileRoute('/page/$id')({ }), component: PageComponent, }) + +function PageComponent() { + const data = Route.useLoaderData() + + return
{data.value.marker}
+} diff --git a/benchmarks/ssr/scenarios/global-middleware/vue/src/start.ts b/benchmarks/ssr/scenarios/global-middleware/vue/src/start.ts index 6e4eb2c5ef..dc3f142e27 100644 --- a/benchmarks/ssr/scenarios/global-middleware/vue/src/start.ts +++ b/benchmarks/ssr/scenarios/global-middleware/vue/src/start.ts @@ -1,5 +1,4 @@ import { createMiddleware, createStart } from '@tanstack/vue-start' -import { getRequestMiddlewareCount } from '../../shared' import type { GlobalMiddlewareContext } from '../../shared' function appendTrace( @@ -49,13 +48,6 @@ const requestMiddlewareC = createMiddleware({ type: 'request' }).server( }, ) -const requestMiddlewareSets: Array> = [ - [], - [requestMiddlewareA], - [requestMiddlewareA, requestMiddlewareB], - [requestMiddlewareA, requestMiddlewareB, requestMiddlewareC], -] - const functionMiddlewareA = createMiddleware({ type: 'function' }).server( ({ next, context }) => { const ctx = (context ?? {}) as GlobalMiddlewareContext @@ -83,6 +75,10 @@ const functionMiddlewareB = createMiddleware({ type: 'function' }).server( ) export const startInstance = createStart(() => ({ - requestMiddleware: requestMiddlewareSets[getRequestMiddlewareCount()], + requestMiddleware: [ + requestMiddlewareA, + requestMiddlewareB, + requestMiddlewareC, + ], functionMiddleware: [functionMiddlewareA, functionMiddlewareB], })) diff --git a/benchmarks/ssr/scenarios/head/react/speed.bench.ts b/benchmarks/ssr/scenarios/head/react/speed.bench.ts index f75008506e..19158b32a9 100644 --- a/benchmarks/ssr/scenarios/head/react/speed.bench.ts +++ b/benchmarks/ssr/scenarios/head/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertHeadSanity, headBenchOptions, runHeadLoop } from '../shared' import type { StartRequestHandler } from '../shared' @@ -12,8 +12,6 @@ const { default: handler } = (await import( await assertHeadSanity(handler) -test('ssr', async ({ bench }) => { - await bench('ssr head (react)', async () => runHeadLoop(handler)).run( - headBenchOptions, - ) +describe('ssr', () => { + bench('ssr head (react)', () => runHeadLoop(handler), headBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/head/solid/speed.bench.ts b/benchmarks/ssr/scenarios/head/solid/speed.bench.ts index 333e2f091b..ad5bf52809 100644 --- a/benchmarks/ssr/scenarios/head/solid/speed.bench.ts +++ b/benchmarks/ssr/scenarios/head/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertHeadSanity, headBenchOptions, runHeadLoop } from '../shared' import type { StartRequestHandler } from '../shared' @@ -12,8 +12,6 @@ const { default: handler } = (await import( await assertHeadSanity(handler) -test('ssr', async ({ bench }) => { - await bench('ssr head (solid)', async () => runHeadLoop(handler)).run( - headBenchOptions, - ) +describe('ssr', () => { + bench('ssr head (solid)', () => runHeadLoop(handler), headBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/head/vue/speed.bench.ts b/benchmarks/ssr/scenarios/head/vue/speed.bench.ts index 936735a909..5d8243b588 100644 --- a/benchmarks/ssr/scenarios/head/vue/speed.bench.ts +++ b/benchmarks/ssr/scenarios/head/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertHeadSanity, headBenchOptions, runHeadLoop } from '../shared' import type { StartRequestHandler } from '../shared' @@ -12,8 +12,6 @@ const { default: handler } = (await import( await assertHeadSanity(handler) -test('ssr', async ({ bench }) => { - await bench('ssr head (vue)', async () => runHeadLoop(handler)).run( - headBenchOptions, - ) +describe('ssr', () => { + bench('ssr head (vue)', () => runHeadLoop(handler), headBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/loaders/react/speed.bench.ts b/benchmarks/ssr/scenarios/loaders/react/speed.bench.ts index 7acd43c635..a5eecfc648 100644 --- a/benchmarks/ssr/scenarios/loaders/react/speed.bench.ts +++ b/benchmarks/ssr/scenarios/loaders/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertLoadersSanity, benchOptions, @@ -16,8 +16,6 @@ const { default: handler } = (await import( await assertLoadersSanity(handler) -test('ssr', async ({ bench }) => { - await bench('ssr loaders (react)', async () => runLoadersLoop(handler)).run( - benchOptions, - ) +describe('ssr', () => { + bench('ssr loaders (react)', () => runLoadersLoop(handler), benchOptions) }) diff --git a/benchmarks/ssr/scenarios/loaders/solid/speed.bench.ts b/benchmarks/ssr/scenarios/loaders/solid/speed.bench.ts index 7fc8d88389..7b3f6247ea 100644 --- a/benchmarks/ssr/scenarios/loaders/solid/speed.bench.ts +++ b/benchmarks/ssr/scenarios/loaders/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertLoadersSanity, benchOptions, @@ -16,8 +16,6 @@ const { default: handler } = (await import( await assertLoadersSanity(handler) -test('ssr', async ({ bench }) => { - await bench('ssr loaders (solid)', async () => runLoadersLoop(handler)).run( - benchOptions, - ) +describe('ssr', () => { + bench('ssr loaders (solid)', () => runLoadersLoop(handler), benchOptions) }) diff --git a/benchmarks/ssr/scenarios/loaders/vue/speed.bench.ts b/benchmarks/ssr/scenarios/loaders/vue/speed.bench.ts index 321350d98c..fb39e0652c 100644 --- a/benchmarks/ssr/scenarios/loaders/vue/speed.bench.ts +++ b/benchmarks/ssr/scenarios/loaders/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertLoadersSanity, benchOptions, @@ -16,8 +16,6 @@ const { default: handler } = (await import( await assertLoadersSanity(handler) -test('ssr', async ({ bench }) => { - await bench('ssr loaders (vue)', async () => runLoadersLoop(handler)).run( - benchOptions, - ) +describe('ssr', () => { + bench('ssr loaders (vue)', () => runLoadersLoop(handler), benchOptions) }) diff --git a/benchmarks/ssr/scenarios/loaders/vue/src/routes/$a.$b.$c.tsx b/benchmarks/ssr/scenarios/loaders/vue/src/routes/$a.$b.$c.tsx index 0a52b9c542..de927a8092 100644 --- a/benchmarks/ssr/scenarios/loaders/vue/src/routes/$a.$b.$c.tsx +++ b/benchmarks/ssr/scenarios/loaders/vue/src/routes/$a.$b.$c.tsx @@ -1,24 +1,6 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' import { makeLevelData } from '../../../shared-data' -const LevelCComponent = defineComponent({ - setup() { - const data = Route.useLoaderData() - - return () => ( -
-

{data.value.meta.label}

-
    - {data.value.items.slice(0, 10).map((item) => ( -
  • {item.name}
  • - ))} -
-
- ) - }, -}) - export const Route = createFileRoute('/$a/$b/$c')({ beforeLoad: ({ params, context }) => { void context @@ -33,3 +15,18 @@ export const Route = createFileRoute('/$a/$b/$c')({ }, component: LevelCComponent, }) + +function LevelCComponent() { + const data = Route.useLoaderData() + + return ( +
+

{data.value.meta.label}

+
    + {data.value.items.slice(0, 10).map((item) => ( +
  • {item.name}
  • + ))} +
+
+ ) +} diff --git a/benchmarks/ssr/scenarios/loaders/vue/src/routes/$a.$b.tsx b/benchmarks/ssr/scenarios/loaders/vue/src/routes/$a.$b.tsx index f3943d58e7..e1a5f52ae2 100644 --- a/benchmarks/ssr/scenarios/loaders/vue/src/routes/$a.$b.tsx +++ b/benchmarks/ssr/scenarios/loaders/vue/src/routes/$a.$b.tsx @@ -1,25 +1,6 @@ -import { defineComponent } from 'vue' import { Outlet, createFileRoute } from '@tanstack/vue-router' import { makeLevelData } from '../../../shared-data' -const LevelBComponent = defineComponent({ - setup() { - const data = Route.useLoaderData() - - return () => ( -
-

{data.value.meta.label}

-
    - {data.value.items.slice(0, 10).map((item) => ( -
  • {item.name}
  • - ))} -
- -
- ) - }, -}) - export const Route = createFileRoute('/$a/$b')({ beforeLoad: ({ params, context }) => { void context @@ -34,3 +15,19 @@ export const Route = createFileRoute('/$a/$b')({ }, component: LevelBComponent, }) + +function LevelBComponent() { + const data = Route.useLoaderData() + + return ( +
+

{data.value.meta.label}

+
    + {data.value.items.slice(0, 10).map((item) => ( +
  • {item.name}
  • + ))} +
+ +
+ ) +} diff --git a/benchmarks/ssr/scenarios/loaders/vue/src/routes/$a.tsx b/benchmarks/ssr/scenarios/loaders/vue/src/routes/$a.tsx index 63bb36949f..b197a8edf1 100644 --- a/benchmarks/ssr/scenarios/loaders/vue/src/routes/$a.tsx +++ b/benchmarks/ssr/scenarios/loaders/vue/src/routes/$a.tsx @@ -1,25 +1,6 @@ -import { defineComponent } from 'vue' import { Outlet, createFileRoute } from '@tanstack/vue-router' import { makeLevelData } from '../../../shared-data' -const LevelAComponent = defineComponent({ - setup() { - const data = Route.useLoaderData() - - return () => ( -
-

{data.value.meta.label}

-
    - {data.value.items.slice(0, 10).map((item) => ( -
  • {item.name}
  • - ))} -
- -
- ) - }, -}) - export const Route = createFileRoute('/$a')({ beforeLoad: ({ params, context }) => { void context @@ -34,3 +15,19 @@ export const Route = createFileRoute('/$a')({ }, component: LevelAComponent, }) + +function LevelAComponent() { + const data = Route.useLoaderData() + + return ( +
+

{data.value.meta.label}

+
    + {data.value.items.slice(0, 10).map((item) => ( +
  • {item.name}
  • + ))} +
+ +
+ ) +} diff --git a/benchmarks/ssr/scenarios/rewrites/react/speed.bench.ts b/benchmarks/ssr/scenarios/rewrites/react/speed.bench.ts index 920186c5db..a8af260279 100644 --- a/benchmarks/ssr/scenarios/rewrites/react/speed.bench.ts +++ b/benchmarks/ssr/scenarios/rewrites/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertRewriteScenario, rewriteBenchOptions, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertRewriteScenario(handler) -test('ssr', async ({ bench }) => { - await bench('ssr rewrite localized (react)', async () => - runRewriteLocalizedLoop(handler), - ).run(rewriteBenchOptions) +describe('ssr', () => { + bench( + 'ssr rewrite localized (react)', + () => runRewriteLocalizedLoop(handler), + 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 f5d09089a6..cffabcafb5 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertRewriteScenario, rewriteBenchOptions, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertRewriteScenario(handler) -test('ssr', async ({ bench }) => { - await bench('ssr rewrite passthrough (react)', async () => - runRewritePassthroughLoop(handler), - ).run(rewriteBenchOptions) +describe('ssr', () => { + bench( + 'ssr rewrite passthrough (react)', + () => runRewritePassthroughLoop(handler), + rewriteBenchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/rewrites/solid/speed.bench.ts b/benchmarks/ssr/scenarios/rewrites/solid/speed.bench.ts index 488fb2ca52..5fdef077c9 100644 --- a/benchmarks/ssr/scenarios/rewrites/solid/speed.bench.ts +++ b/benchmarks/ssr/scenarios/rewrites/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertRewriteScenario, rewriteBenchOptions, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertRewriteScenario(handler) -test('ssr', async ({ bench }) => { - await bench('ssr rewrite localized (solid)', async () => - runRewriteLocalizedLoop(handler), - ).run(rewriteBenchOptions) +describe('ssr', () => { + bench( + 'ssr rewrite localized (solid)', + () => runRewriteLocalizedLoop(handler), + 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 7b86e2ba11..2458a59b69 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertRewriteScenario, rewriteBenchOptions, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertRewriteScenario(handler) -test('ssr', async ({ bench }) => { - await bench('ssr rewrite passthrough (solid)', async () => - runRewritePassthroughLoop(handler), - ).run(rewriteBenchOptions) +describe('ssr', () => { + bench( + 'ssr rewrite passthrough (solid)', + () => runRewritePassthroughLoop(handler), + rewriteBenchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/rewrites/vue/speed.bench.ts b/benchmarks/ssr/scenarios/rewrites/vue/speed.bench.ts index 5fd4da9d3e..b8a98c3408 100644 --- a/benchmarks/ssr/scenarios/rewrites/vue/speed.bench.ts +++ b/benchmarks/ssr/scenarios/rewrites/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertRewriteScenario, rewriteBenchOptions, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertRewriteScenario(handler) -test('ssr', async ({ bench }) => { - await bench('ssr rewrite localized (vue)', async () => - runRewriteLocalizedLoop(handler), - ).run(rewriteBenchOptions) +describe('ssr', () => { + bench( + 'ssr rewrite localized (vue)', + () => runRewriteLocalizedLoop(handler), + 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 f3664b5f21..e011a9fc8d 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertRewriteScenario, rewriteBenchOptions, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertRewriteScenario(handler) -test('ssr', async ({ bench }) => { - await bench('ssr rewrite passthrough (vue)', async () => - runRewritePassthroughLoop(handler), - ).run(rewriteBenchOptions) +describe('ssr', () => { + bench( + 'ssr rewrite passthrough (vue)', + () => runRewritePassthroughLoop(handler), + rewriteBenchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/rewrites/vue/src/routes/p.$a.$b.tsx b/benchmarks/ssr/scenarios/rewrites/vue/src/routes/p.$a.$b.tsx index 3c9de1806e..3fdb7014f4 100644 --- a/benchmarks/ssr/scenarios/rewrites/vue/src/routes/p.$a.$b.tsx +++ b/benchmarks/ssr/scenarios/rewrites/vue/src/routes/p.$a.$b.tsx @@ -1,41 +1,5 @@ -import { defineComponent } from 'vue' import { Link, createFileRoute } from '@tanstack/vue-router' -const LeafComponent = defineComponent({ - setup() { - const data = Route.useLoaderData() - - return () => ( -
-

- rewrite-leaf {data.value.a} {data.value.b} -

- - leaf-self-link - - - leaf-next-link - - - leaf-parent-link - -
- ) - }, -}) - export const Route = createFileRoute('/p/$a/$b')({ loader: ({ params }) => ({ a: params.a, @@ -44,3 +8,32 @@ export const Route = createFileRoute('/p/$a/$b')({ }), component: LeafComponent, }) + +function LeafComponent() { + const data = Route.useLoaderData() + + return ( +
+

+ rewrite-leaf {data.value.a} {data.value.b} +

+ + leaf-self-link + + + leaf-next-link + + + leaf-parent-link + +
+ ) +} diff --git a/benchmarks/ssr/scenarios/rewrites/vue/src/routes/p.$a.tsx b/benchmarks/ssr/scenarios/rewrites/vue/src/routes/p.$a.tsx index 9702ebedd7..acb74aabbd 100644 --- a/benchmarks/ssr/scenarios/rewrites/vue/src/routes/p.$a.tsx +++ b/benchmarks/ssr/scenarios/rewrites/vue/src/routes/p.$a.tsx @@ -1,26 +1,5 @@ -import { defineComponent } from 'vue' import { Link, Outlet, createFileRoute } from '@tanstack/vue-router' -const ParentComponent = defineComponent({ - setup() { - const data = Route.useLoaderData() - - return () => ( -
-

rewrite-parent {data.value.a}

- - parent-branch-link - - -
- ) - }, -}) - export const Route = createFileRoute('/p/$a')({ loader: ({ params }) => ({ a: params.a, @@ -28,3 +7,21 @@ export const Route = createFileRoute('/p/$a')({ }), component: ParentComponent, }) + +function ParentComponent() { + const data = Route.useLoaderData() + + return ( +
+

rewrite-parent {data.value.a}

+ + parent-branch-link + + +
+ ) +} diff --git a/benchmarks/ssr/scenarios/selective-ssr/react/speed.bench.ts b/benchmarks/ssr/scenarios/selective-ssr/react/speed.bench.ts index ba6bd4a61d..e0e8a0e3c4 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertSelectiveSanity, benchOptions, @@ -16,8 +16,6 @@ const { default: handler } = (await import( await assertSelectiveSanity(handler) -test('ssr', async ({ bench }) => { - await bench('ssr selective (react)', async () => - runSelectiveLoop(handler), - ).run(benchOptions) +describe('ssr', () => { + bench('ssr selective (react)', () => runSelectiveLoop(handler), benchOptions) }) diff --git a/benchmarks/ssr/scenarios/selective-ssr/solid/speed.bench.ts b/benchmarks/ssr/scenarios/selective-ssr/solid/speed.bench.ts index 76265397ab..6a2803d45f 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertSelectiveSanity, benchOptions, @@ -16,8 +16,6 @@ const { default: handler } = (await import( await assertSelectiveSanity(handler) -test('ssr', async ({ bench }) => { - await bench('ssr selective (solid)', async () => - runSelectiveLoop(handler), - ).run(benchOptions) +describe('ssr', () => { + bench('ssr selective (solid)', () => runSelectiveLoop(handler), benchOptions) }) diff --git a/benchmarks/ssr/scenarios/selective-ssr/vue/speed.bench.ts b/benchmarks/ssr/scenarios/selective-ssr/vue/speed.bench.ts index ff60341b27..f3082a102d 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertSelectiveSanity, benchOptions, @@ -16,8 +16,6 @@ const { default: handler } = (await import( await assertSelectiveSanity(handler) -test('ssr', async ({ bench }) => { - await bench('ssr selective (vue)', async () => runSelectiveLoop(handler)).run( - benchOptions, - ) +describe('ssr', () => { + bench('ssr selective (vue)', () => runSelectiveLoop(handler), benchOptions) }) diff --git a/benchmarks/ssr/scenarios/selective-ssr/vue/src/routes/mix.$a.$b.$c.tsx b/benchmarks/ssr/scenarios/selective-ssr/vue/src/routes/mix.$a.$b.$c.tsx index 8ae7d468f1..46d7541c2b 100644 --- a/benchmarks/ssr/scenarios/selective-ssr/vue/src/routes/mix.$a.$b.$c.tsx +++ b/benchmarks/ssr/scenarios/selective-ssr/vue/src/routes/mix.$a.$b.$c.tsx @@ -1,21 +1,6 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' import { makeLevelData } from '../../../../loaders/shared-data' -const LevelCComponent = defineComponent({ - setup() { - const data = Route.useLoaderData() - const params = Route.useParams() - - return () => ( -
-

{`csr-rendered-${params.value.c}`}

-

{data.value.marker}

-
- ) - }, -}) - export const Route = createFileRoute('/mix/$a/$b/$c')({ ssr: false, loader: async ({ params }) => { @@ -26,3 +11,15 @@ export const Route = createFileRoute('/mix/$a/$b/$c')({ }, component: LevelCComponent, }) + +function LevelCComponent() { + const data = Route.useLoaderData() + const params = Route.useParams() + + return ( +
+

{`csr-rendered-${params.value.c}`}

+

{data.value.marker}

+
+ ) +} diff --git a/benchmarks/ssr/scenarios/selective-ssr/vue/src/routes/mix.$a.$b.tsx b/benchmarks/ssr/scenarios/selective-ssr/vue/src/routes/mix.$a.$b.tsx index c10751489e..bc685478cc 100644 --- a/benchmarks/ssr/scenarios/selective-ssr/vue/src/routes/mix.$a.$b.tsx +++ b/benchmarks/ssr/scenarios/selective-ssr/vue/src/routes/mix.$a.$b.tsx @@ -1,22 +1,6 @@ -import { defineComponent } from 'vue' import { Outlet, createFileRoute } from '@tanstack/vue-router' import { makeLevelData } from '../../../../loaders/shared-data' -const LevelBComponent = defineComponent({ - setup() { - const data = Route.useLoaderData() - const params = Route.useParams() - - return () => ( -
-

{`data-only-rendered-${params.value.b}`}

-

{data.value.marker}

- -
- ) - }, -}) - export const Route = createFileRoute('/mix/$a/$b')({ ssr: 'data-only', loader: async ({ params }) => { @@ -27,3 +11,16 @@ export const Route = createFileRoute('/mix/$a/$b')({ }, component: LevelBComponent, }) + +function LevelBComponent() { + const data = Route.useLoaderData() + const params = Route.useParams() + + return ( +
+

{`data-only-rendered-${params.value.b}`}

+

{data.value.marker}

+ +
+ ) +} diff --git a/benchmarks/ssr/scenarios/selective-ssr/vue/src/routes/mix.$a.tsx b/benchmarks/ssr/scenarios/selective-ssr/vue/src/routes/mix.$a.tsx index c96165c6d6..8ab4c7d54d 100644 --- a/benchmarks/ssr/scenarios/selective-ssr/vue/src/routes/mix.$a.tsx +++ b/benchmarks/ssr/scenarios/selective-ssr/vue/src/routes/mix.$a.tsx @@ -1,22 +1,6 @@ -import { defineComponent } from 'vue' import { Outlet, createFileRoute } from '@tanstack/vue-router' import { makeLevelData } from '../../../../loaders/shared-data' -const LevelAComponent = defineComponent({ - setup() { - const data = Route.useLoaderData() - const params = Route.useParams() - - return () => ( -
-

{`level-a-rendered-${params.value.a}`}

-

{data.value.items[0]?.name}

- -
- ) - }, -}) - export const Route = createFileRoute('/mix/$a')({ ssr: true, loader: async ({ params }) => { @@ -24,3 +8,16 @@ export const Route = createFileRoute('/mix/$a')({ }, component: LevelAComponent, }) + +function LevelAComponent() { + const data = Route.useLoaderData() + const params = Route.useParams() + + return ( +
+

{`level-a-rendered-${params.value.a}`}

+

{data.value.items[0]?.name}

+ +
+ ) +} diff --git a/benchmarks/ssr/scenarios/serialization/react/speed.bench.ts b/benchmarks/ssr/scenarios/serialization/react/speed.bench.ts index 8be07d2643..9032280e51 100644 --- a/benchmarks/ssr/scenarios/serialization/react/speed.bench.ts +++ b/benchmarks/ssr/scenarios/serialization/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertSerializationScenario, runRichSerializationLoop, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertSerializationScenario(handler) -test('ssr', async ({ bench }) => { - await bench('ssr dehydrate rich types (react)', async () => - runRichSerializationLoop(handler), - ).run(serializationBenchOptions) +describe('ssr', () => { + bench( + 'ssr dehydrate rich types (react)', + () => runRichSerializationLoop(handler), + 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 c70fddc6c4..a6c8d99fb6 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertSerializationScenario, runPlainSerializationLoop, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertSerializationScenario(handler) -test('ssr', async ({ bench }) => { - await bench('ssr dehydrate plain control (react)', async () => - runPlainSerializationLoop(handler), - ).run(serializationBenchOptions) +describe('ssr', () => { + bench( + 'ssr dehydrate plain control (react)', + () => runPlainSerializationLoop(handler), + serializationBenchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/serialization/solid/speed.bench.ts b/benchmarks/ssr/scenarios/serialization/solid/speed.bench.ts index 70bda8c7af..3fa22ccea9 100644 --- a/benchmarks/ssr/scenarios/serialization/solid/speed.bench.ts +++ b/benchmarks/ssr/scenarios/serialization/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertSerializationScenario, runRichSerializationLoop, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertSerializationScenario(handler) -test('ssr', async ({ bench }) => { - await bench('ssr dehydrate rich types (solid)', async () => - runRichSerializationLoop(handler), - ).run(serializationBenchOptions) +describe('ssr', () => { + bench( + 'ssr dehydrate rich types (solid)', + () => runRichSerializationLoop(handler), + 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 d7ccb16f6f..354512e09d 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertSerializationScenario, runPlainSerializationLoop, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertSerializationScenario(handler) -test('ssr', async ({ bench }) => { - await bench('ssr dehydrate plain control (solid)', async () => - runPlainSerializationLoop(handler), - ).run(serializationBenchOptions) +describe('ssr', () => { + bench( + 'ssr dehydrate plain control (solid)', + () => runPlainSerializationLoop(handler), + serializationBenchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/serialization/solid/src/routeTree.gen.ts b/benchmarks/ssr/scenarios/serialization/solid/src/routeTree.gen.ts index b9e25f918e..69b63cffe9 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 PlainIdRouteImport } from './routes/plain.$id' import { Route as RichIdRouteImport } from './routes/rich.$id' +import { Route as PlainIdRouteImport } from './routes/plain.$id' -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) +const PlainIdRoute = PlainIdRouteImport.update({ + id: '/plain/$id', + path: '/plain/$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 { - '/plain/$id': { - id: '/plain/$id' - path: '/plain/$id' - fullPath: '/plain/$id' - preLoaderRoute: typeof PlainIdRouteImport - parentRoute: typeof rootRouteImport - } '/rich/$id': { id: '/rich/$id' path: '/rich/$id' @@ -65,6 +58,13 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof RichIdRouteImport parentRoute: typeof rootRouteImport } + '/plain/$id': { + id: '/plain/$id' + path: '/plain/$id' + fullPath: '/plain/$id' + preLoaderRoute: typeof PlainIdRouteImport + parentRoute: typeof rootRouteImport + } } } diff --git a/benchmarks/ssr/scenarios/serialization/vue/speed.bench.ts b/benchmarks/ssr/scenarios/serialization/vue/speed.bench.ts index 7f733dd601..d68c615fdc 100644 --- a/benchmarks/ssr/scenarios/serialization/vue/speed.bench.ts +++ b/benchmarks/ssr/scenarios/serialization/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertSerializationScenario, runRichSerializationLoop, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertSerializationScenario(handler) -test('ssr', async ({ bench }) => { - await bench('ssr dehydrate rich types (vue)', async () => - runRichSerializationLoop(handler), - ).run(serializationBenchOptions) +describe('ssr', () => { + bench( + 'ssr dehydrate rich types (vue)', + () => runRichSerializationLoop(handler), + 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 8efdeb6c79..875a858226 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertSerializationScenario, runPlainSerializationLoop, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertSerializationScenario(handler) -test('ssr', async ({ bench }) => { - await bench('ssr dehydrate plain control (vue)', async () => - runPlainSerializationLoop(handler), - ).run(serializationBenchOptions) +describe('ssr', () => { + bench( + 'ssr dehydrate plain control (vue)', + () => runPlainSerializationLoop(handler), + serializationBenchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/serialization/vue/src/routeTree.gen.ts b/benchmarks/ssr/scenarios/serialization/vue/src/routeTree.gen.ts index cd7b0b449b..02268c2c3c 100644 --- a/benchmarks/ssr/scenarios/serialization/vue/src/routeTree.gen.ts +++ b/benchmarks/ssr/scenarios/serialization/vue/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 PlainIdRouteImport } from './routes/plain.$id' import { Route as RichIdRouteImport } from './routes/rich.$id' +import { Route as PlainIdRouteImport } from './routes/plain.$id' -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) +const PlainIdRoute = PlainIdRouteImport.update({ + id: '/plain/$id', + path: '/plain/$id', + getParentRoute: () => rootRouteImport, +} as any) export interface FileRoutesByFullPath { '/plain/$id': typeof PlainIdRoute @@ -51,13 +51,6 @@ export interface RootRouteChildren { declare module '@tanstack/vue-router' { interface FileRoutesByPath { - '/plain/$id': { - id: '/plain/$id' - path: '/plain/$id' - fullPath: '/plain/$id' - preLoaderRoute: typeof PlainIdRouteImport - parentRoute: typeof rootRouteImport - } '/rich/$id': { id: '/rich/$id' path: '/rich/$id' @@ -65,6 +58,13 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof RichIdRouteImport parentRoute: typeof rootRouteImport } + '/plain/$id': { + id: '/plain/$id' + path: '/plain/$id' + fullPath: '/plain/$id' + preLoaderRoute: typeof PlainIdRouteImport + parentRoute: typeof rootRouteImport + } } } diff --git a/benchmarks/ssr/scenarios/serialization/vue/src/routes/plain.$id.tsx b/benchmarks/ssr/scenarios/serialization/vue/src/routes/plain.$id.tsx index 47fdeb971f..d41d123f1f 100644 --- a/benchmarks/ssr/scenarios/serialization/vue/src/routes/plain.$id.tsx +++ b/benchmarks/ssr/scenarios/serialization/vue/src/routes/plain.$id.tsx @@ -1,27 +1,24 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' import { makePlainSerializationData } from '../../../shared-data' -const PlainComponent = defineComponent({ - setup() { - const data = Route.useLoaderData() - - return () => ( -
-

{data.value.label}

-

{data.value.createdAt}

-

{data.value.lookup[0]?.[1].label}

-

{data.value.tags[0]}

-

{data.value.count}

-

{data.value.nested[0]?.id}

-

{data.value.points[0]?.label}

-

{data.value.problem.message}

-
- ) - }, -}) - export const Route = createFileRoute('/plain/$id')({ loader: ({ params }) => makePlainSerializationData(params.id), component: PlainComponent, }) + +function PlainComponent() { + const data = Route.useLoaderData() + + return ( +
+

{data.value.label}

+

{data.value.createdAt}

+

{data.value.lookup[0]?.[1].label}

+

{data.value.tags[0]}

+

{data.value.count}

+

{data.value.nested[0]?.id}

+

{data.value.points[0]?.label}

+

{data.value.problem.message}

+
+ ) +} diff --git a/benchmarks/ssr/scenarios/serialization/vue/src/routes/rich.$id.tsx b/benchmarks/ssr/scenarios/serialization/vue/src/routes/rich.$id.tsx index 1ee86cefd3..d50a3f292d 100644 --- a/benchmarks/ssr/scenarios/serialization/vue/src/routes/rich.$id.tsx +++ b/benchmarks/ssr/scenarios/serialization/vue/src/routes/rich.$id.tsx @@ -1,27 +1,24 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' import { makeRichSerializationData } from '../../../shared-data' -const RichComponent = defineComponent({ - setup() { - const data = Route.useLoaderData() - - return () => ( -
-

{data.value.label}

-

{data.value.createdAt.toISOString()}

-

{data.value.lookup.get('k0')?.label}

-

{Array.from(data.value.tags)[0]}

-

{data.value.count.toString()}

-

{data.value.nested[0]?.id}

-

{data.value.points[0]?.label}

-

{data.value.problem.message}

-
- ) - }, -}) - export const Route = createFileRoute('/rich/$id')({ loader: ({ params }) => makeRichSerializationData(params.id), component: RichComponent, }) + +function RichComponent() { + const data = Route.useLoaderData() + + return ( +
+

{data.value.label}

+

{data.value.createdAt.toISOString()}

+

{data.value.lookup.get('k0')?.label}

+

{Array.from(data.value.tags)[0]}

+

{data.value.count.toString()}

+

{data.value.nested[0]?.id}

+

{data.value.points[0]?.label}

+

{data.value.problem.message}

+
+ ) +} 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 fa80cdb690..149ff591ed 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertServerFnTransportScenario, runServerFnMultipartRequestLoop, @@ -16,8 +16,10 @@ const context = await setupServerFnTransportBench(handler) await assertServerFnTransportScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr server-fn multipart (react)', async () => - runServerFnMultipartRequestLoop(handler, context), - ).run(serverFnTransportBenchOptions) +describe('ssr', () => { + bench( + 'ssr server-fn multipart (react)', + () => runServerFnMultipartRequestLoop(handler, context), + 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 fd535ee313..43b31c609d 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertServerFnTransportScenario, runServerFnRawResponseRequestLoop, @@ -16,8 +16,10 @@ const context = await setupServerFnTransportBench(handler) await assertServerFnTransportScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr server-fn raw-response (react)', async () => - runServerFnRawResponseRequestLoop(handler, context), - ).run(serverFnTransportBenchOptions) +describe('ssr', () => { + bench( + 'ssr server-fn raw-response (react)', + () => runServerFnRawResponseRequestLoop(handler, context), + 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 8fbce405dd..4c90ffb847 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertServerFnTransportScenario, runServerFnRawStreamRequestLoop, @@ -16,8 +16,10 @@ const context = await setupServerFnTransportBench(handler) await assertServerFnTransportScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr server-fn raw-stream (react)', async () => - runServerFnRawStreamRequestLoop(handler, context), - ).run(serverFnTransportBenchOptions) +describe('ssr', () => { + bench( + 'ssr server-fn raw-stream (react)', + () => runServerFnRawStreamRequestLoop(handler, context), + 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 adac07cb22..aaa2028902 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertServerFnTransportScenario, runServerFnMultipartRequestLoop, @@ -16,8 +16,10 @@ const context = await setupServerFnTransportBench(handler) await assertServerFnTransportScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr server-fn multipart (solid)', async () => - runServerFnMultipartRequestLoop(handler, context), - ).run(serverFnTransportBenchOptions) +describe('ssr', () => { + bench( + 'ssr server-fn multipart (solid)', + () => runServerFnMultipartRequestLoop(handler, context), + 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 843a4c97ce..661430c3ae 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertServerFnTransportScenario, runServerFnRawResponseRequestLoop, @@ -16,8 +16,10 @@ const context = await setupServerFnTransportBench(handler) await assertServerFnTransportScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr server-fn raw-response (solid)', async () => - runServerFnRawResponseRequestLoop(handler, context), - ).run(serverFnTransportBenchOptions) +describe('ssr', () => { + bench( + 'ssr server-fn raw-response (solid)', + () => runServerFnRawResponseRequestLoop(handler, context), + 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 aa24d55e79..37d9b86e12 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertServerFnTransportScenario, runServerFnRawStreamRequestLoop, @@ -16,8 +16,10 @@ const context = await setupServerFnTransportBench(handler) await assertServerFnTransportScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr server-fn raw-stream (solid)', async () => - runServerFnRawStreamRequestLoop(handler, context), - ).run(serverFnTransportBenchOptions) +describe('ssr', () => { + bench( + 'ssr server-fn raw-stream (solid)', + () => runServerFnRawStreamRequestLoop(handler, context), + 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 24305cf1bc..99d266298d 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertServerFnTransportScenario, runServerFnMultipartRequestLoop, @@ -16,8 +16,10 @@ const context = await setupServerFnTransportBench(handler) await assertServerFnTransportScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr server-fn multipart (vue)', async () => - runServerFnMultipartRequestLoop(handler, context), - ).run(serverFnTransportBenchOptions) +describe('ssr', () => { + bench( + 'ssr server-fn multipart (vue)', + () => runServerFnMultipartRequestLoop(handler, context), + 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 2eeb9a4f6b..36e1b9ed22 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertServerFnTransportScenario, runServerFnRawResponseRequestLoop, @@ -16,8 +16,10 @@ const context = await setupServerFnTransportBench(handler) await assertServerFnTransportScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr server-fn raw-response (vue)', async () => - runServerFnRawResponseRequestLoop(handler, context), - ).run(serverFnTransportBenchOptions) +describe('ssr', () => { + bench( + 'ssr server-fn raw-response (vue)', + () => runServerFnRawResponseRequestLoop(handler, context), + 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 a73905004d..4c9e5dc752 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertServerFnTransportScenario, runServerFnRawStreamRequestLoop, @@ -16,8 +16,10 @@ const context = await setupServerFnTransportBench(handler) await assertServerFnTransportScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr server-fn raw-stream (vue)', async () => - runServerFnRawStreamRequestLoop(handler, context), - ).run(serverFnTransportBenchOptions) +describe('ssr', () => { + bench( + 'ssr server-fn raw-stream (vue)', + () => runServerFnRawStreamRequestLoop(handler, context), + serverFnTransportBenchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/server-fns/react/speed.bench.ts b/benchmarks/ssr/scenarios/server-fns/react/speed.bench.ts index c876772ad1..697bfe967a 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertServerFnScenario, runServerFnGetRequestLoop, @@ -16,8 +16,10 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr server-fn GET (react)', async () => - runServerFnGetRequestLoop(handler, context), - ).run(serverFnBenchOptions) +describe('ssr', () => { + bench( + 'ssr server-fn GET (react)', + () => runServerFnGetRequestLoop(handler, context), + 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 6a0cb55f78..4b1c7c7d1e 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertServerFnScenario, runServerFnDocumentSsrRequestLoop, @@ -16,8 +16,10 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr server-fn during document ssr (react)', async () => - runServerFnDocumentSsrRequestLoop(handler), - ).run(serverFnBenchOptions) +describe('ssr', () => { + bench( + 'ssr server-fn during document ssr (react)', + () => runServerFnDocumentSsrRequestLoop(handler), + 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 96f1160078..1f600dd8cf 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertServerFnScenario, runServerFnNotFoundRequestLoop, @@ -16,8 +16,10 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr server-fn not-found (react)', async () => - runServerFnNotFoundRequestLoop(handler, context), - ).run(serverFnBenchOptions) +describe('ssr', () => { + bench( + 'ssr server-fn not-found (react)', + () => runServerFnNotFoundRequestLoop(handler, context), + 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 e85d5debd3..0b4b3e5d6c 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertServerFnScenario, runServerFnPostRequestLoop, @@ -16,8 +16,10 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr server-fn POST (react)', async () => - runServerFnPostRequestLoop(handler, context), - ).run(serverFnBenchOptions) +describe('ssr', () => { + bench( + 'ssr server-fn POST (react)', + () => runServerFnPostRequestLoop(handler, context), + 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 5dae598549..d07b4ab583 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertServerFnScenario, runServerFnRedirectRequestLoop, @@ -16,8 +16,10 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr server-fn redirect (react)', async () => - runServerFnRedirectRequestLoop(handler, context), - ).run(serverFnBenchOptions) +describe('ssr', () => { + bench( + 'ssr server-fn redirect (react)', + () => runServerFnRedirectRequestLoop(handler, context), + 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 40d6961206..589e2ccaf3 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertServerFnScenario, runServerFnSendContextRequestLoop, @@ -16,8 +16,10 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr server-fn send-context (react)', async () => - runServerFnSendContextRequestLoop(handler, context), - ).run(serverFnBenchOptions) +describe('ssr', () => { + bench( + 'ssr server-fn send-context (react)', + () => runServerFnSendContextRequestLoop(handler, context), + serverFnBenchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/server-fns/solid/speed.bench.ts b/benchmarks/ssr/scenarios/server-fns/solid/speed.bench.ts index f6bbdc9e73..42e57c4ce2 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertServerFnScenario, runServerFnGetRequestLoop, @@ -16,8 +16,10 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr server-fn GET (solid)', async () => - runServerFnGetRequestLoop(handler, context), - ).run(serverFnBenchOptions) +describe('ssr', () => { + bench( + 'ssr server-fn GET (solid)', + () => runServerFnGetRequestLoop(handler, context), + 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 933f61b59c..1cbe7ef20b 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertServerFnScenario, runServerFnDocumentSsrRequestLoop, @@ -16,8 +16,10 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr server-fn during document ssr (solid)', async () => - runServerFnDocumentSsrRequestLoop(handler), - ).run(serverFnBenchOptions) +describe('ssr', () => { + bench( + 'ssr server-fn during document ssr (solid)', + () => runServerFnDocumentSsrRequestLoop(handler), + 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 513b69f4ba..bd5cc10457 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertServerFnScenario, runServerFnNotFoundRequestLoop, @@ -16,8 +16,10 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr server-fn not-found (solid)', async () => - runServerFnNotFoundRequestLoop(handler, context), - ).run(serverFnBenchOptions) +describe('ssr', () => { + bench( + 'ssr server-fn not-found (solid)', + () => runServerFnNotFoundRequestLoop(handler, context), + 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 e2ce8ad9ee..d2cf977cfa 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertServerFnScenario, runServerFnPostRequestLoop, @@ -16,8 +16,10 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr server-fn POST (solid)', async () => - runServerFnPostRequestLoop(handler, context), - ).run(serverFnBenchOptions) +describe('ssr', () => { + bench( + 'ssr server-fn POST (solid)', + () => runServerFnPostRequestLoop(handler, context), + 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 14353f1290..017ac79af0 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertServerFnScenario, runServerFnRedirectRequestLoop, @@ -16,8 +16,10 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr server-fn redirect (solid)', async () => - runServerFnRedirectRequestLoop(handler, context), - ).run(serverFnBenchOptions) +describe('ssr', () => { + bench( + 'ssr server-fn redirect (solid)', + () => runServerFnRedirectRequestLoop(handler, context), + 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 76d3a554bd..a3d0a991d1 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertServerFnScenario, runServerFnSendContextRequestLoop, @@ -16,8 +16,10 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr server-fn send-context (solid)', async () => - runServerFnSendContextRequestLoop(handler, context), - ).run(serverFnBenchOptions) +describe('ssr', () => { + bench( + 'ssr server-fn send-context (solid)', + () => runServerFnSendContextRequestLoop(handler, context), + 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 3d0bd34eaa..3db5e487b3 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 ApiFnUrlsRouteImport } from './routes/api.fn-urls' import { Route as SsrCallIdRouteImport } from './routes/ssr-call.$id' +import { Route as ApiFnUrlsRouteImport } from './routes/api.fn-urls' const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', 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) +const ApiFnUrlsRoute = ApiFnUrlsRouteImport.update({ + id: '/api/fn-urls', + path: '/api/fn-urls', + getParentRoute: () => rootRouteImport, +} as any) export interface FileRoutesByFullPath { '/': typeof IndexRoute @@ -68,13 +68,6 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } - '/api/fn-urls': { - id: '/api/fn-urls' - path: '/api/fn-urls' - fullPath: '/api/fn-urls' - preLoaderRoute: typeof ApiFnUrlsRouteImport - parentRoute: typeof rootRouteImport - } '/ssr-call/$id': { id: '/ssr-call/$id' path: '/ssr-call/$id' @@ -82,6 +75,13 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof SsrCallIdRouteImport parentRoute: typeof rootRouteImport } + '/api/fn-urls': { + id: '/api/fn-urls' + path: '/api/fn-urls' + fullPath: '/api/fn-urls' + preLoaderRoute: typeof ApiFnUrlsRouteImport + 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 3f67c1a500..c4d94659d9 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertServerFnScenario, runServerFnGetRequestLoop, @@ -16,8 +16,10 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr server-fn GET (vue)', async () => - runServerFnGetRequestLoop(handler, context), - ).run(serverFnBenchOptions) +describe('ssr', () => { + bench( + 'ssr server-fn GET (vue)', + () => runServerFnGetRequestLoop(handler, context), + 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 56c9addca5..c6155bcead 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertServerFnScenario, runServerFnDocumentSsrRequestLoop, @@ -16,8 +16,10 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr server-fn during document ssr (vue)', async () => - runServerFnDocumentSsrRequestLoop(handler), - ).run(serverFnBenchOptions) +describe('ssr', () => { + bench( + 'ssr server-fn during document ssr (vue)', + () => runServerFnDocumentSsrRequestLoop(handler), + 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 e9a6e31617..dca17511b8 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertServerFnScenario, runServerFnNotFoundRequestLoop, @@ -16,8 +16,10 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr server-fn not-found (vue)', async () => - runServerFnNotFoundRequestLoop(handler, context), - ).run(serverFnBenchOptions) +describe('ssr', () => { + bench( + 'ssr server-fn not-found (vue)', + () => runServerFnNotFoundRequestLoop(handler, context), + 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 df9312ccd1..4c2166056a 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertServerFnScenario, runServerFnPostRequestLoop, @@ -16,8 +16,10 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr server-fn POST (vue)', async () => - runServerFnPostRequestLoop(handler, context), - ).run(serverFnBenchOptions) +describe('ssr', () => { + bench( + 'ssr server-fn POST (vue)', + () => runServerFnPostRequestLoop(handler, context), + 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 67c4611644..25741baa62 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertServerFnScenario, runServerFnRedirectRequestLoop, @@ -16,8 +16,10 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr server-fn redirect (vue)', async () => - runServerFnRedirectRequestLoop(handler, context), - ).run(serverFnBenchOptions) +describe('ssr', () => { + bench( + 'ssr server-fn redirect (vue)', + () => runServerFnRedirectRequestLoop(handler, context), + 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 6f51ef4bab..c1c2d581ba 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertServerFnScenario, runServerFnSendContextRequestLoop, @@ -16,8 +16,10 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -test('ssr', async ({ bench }) => { - await bench('ssr server-fn send-context (vue)', async () => - runServerFnSendContextRequestLoop(handler, context), - ).run(serverFnBenchOptions) +describe('ssr', () => { + bench( + 'ssr server-fn send-context (vue)', + () => runServerFnSendContextRequestLoop(handler, context), + serverFnBenchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/server-fns/vue/src/routeTree.gen.ts b/benchmarks/ssr/scenarios/server-fns/vue/src/routeTree.gen.ts index 0e24cd9c15..fa27fb1a5d 100644 --- a/benchmarks/ssr/scenarios/server-fns/vue/src/routeTree.gen.ts +++ b/benchmarks/ssr/scenarios/server-fns/vue/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 ApiFnUrlsRouteImport } from './routes/api.fn-urls' import { Route as SsrCallIdRouteImport } from './routes/ssr-call.$id' +import { Route as ApiFnUrlsRouteImport } from './routes/api.fn-urls' const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', 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) +const ApiFnUrlsRoute = ApiFnUrlsRouteImport.update({ + id: '/api/fn-urls', + path: '/api/fn-urls', + getParentRoute: () => rootRouteImport, +} as any) export interface FileRoutesByFullPath { '/': typeof IndexRoute @@ -68,13 +68,6 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } - '/api/fn-urls': { - id: '/api/fn-urls' - path: '/api/fn-urls' - fullPath: '/api/fn-urls' - preLoaderRoute: typeof ApiFnUrlsRouteImport - parentRoute: typeof rootRouteImport - } '/ssr-call/$id': { id: '/ssr-call/$id' path: '/ssr-call/$id' @@ -82,6 +75,13 @@ declare module '@tanstack/vue-router' { preLoaderRoute: typeof SsrCallIdRouteImport parentRoute: typeof rootRouteImport } + '/api/fn-urls': { + id: '/api/fn-urls' + path: '/api/fn-urls' + fullPath: '/api/fn-urls' + preLoaderRoute: typeof ApiFnUrlsRouteImport + parentRoute: typeof rootRouteImport + } } } diff --git a/benchmarks/ssr/scenarios/server-fns/vue/src/routes/ssr-call.$id.tsx b/benchmarks/ssr/scenarios/server-fns/vue/src/routes/ssr-call.$id.tsx index 45fad23dc0..8abe77c2af 100644 --- a/benchmarks/ssr/scenarios/server-fns/vue/src/routes/ssr-call.$id.tsx +++ b/benchmarks/ssr/scenarios/server-fns/vue/src/routes/ssr-call.$id.tsx @@ -1,17 +1,6 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' import { echoGet } from '../fns' -const SsrCallComponent = defineComponent({ - setup() { - const data = Route.useLoaderData() - - return () => ( -
{data.value.marker}
- ) - }, -}) - export const Route = createFileRoute('/ssr-call/$id')({ loader: async ({ params }) => { const result = await echoGet({ @@ -26,3 +15,9 @@ export const Route = createFileRoute('/ssr-call/$id')({ }, component: SsrCallComponent, }) + +function SsrCallComponent() { + const data = Route.useLoaderData() + + return
{data.value.marker}
+} 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 6331216522..8e96bc8e04 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertServerRouteMiddlewareResponse, runServerRouteMiddlewareLoop, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertServerRouteMiddlewareResponse(handler) -test('ssr', async ({ bench }) => { - await bench('ssr server-route middleware (react)', async () => - runServerRouteMiddlewareLoop(handler), - ).run(serverRouteMiddlewareBenchOptions) +describe('ssr', () => { + bench( + 'ssr server-route middleware (react)', + () => runServerRouteMiddlewareLoop(handler), + 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 77d58e7b19..7e6fac4bbe 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertServerRouteMiddlewareResponse, runServerRouteMiddlewareLoop, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertServerRouteMiddlewareResponse(handler) -test('ssr', async ({ bench }) => { - await bench('ssr server-route middleware (solid)', async () => - runServerRouteMiddlewareLoop(handler), - ).run(serverRouteMiddlewareBenchOptions) +describe('ssr', () => { + bench( + 'ssr server-route middleware (solid)', + () => runServerRouteMiddlewareLoop(handler), + 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 3d03b9c1fa..e67ca0a420 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertServerRouteMiddlewareResponse, runServerRouteMiddlewareLoop, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertServerRouteMiddlewareResponse(handler) -test('ssr', async ({ bench }) => { - await bench('ssr server-route middleware (vue)', async () => - runServerRouteMiddlewareLoop(handler), - ).run(serverRouteMiddlewareBenchOptions) +describe('ssr', () => { + bench( + 'ssr server-route middleware (vue)', + () => runServerRouteMiddlewareLoop(handler), + serverRouteMiddlewareBenchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/server-routes/react/speed.bench.ts b/benchmarks/ssr/scenarios/server-routes/react/speed.bench.ts index 631314148a..1bdb7946b2 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertServerRouteResponse, runServerRouteLoop, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertServerRouteResponse(handler) -test('ssr', async ({ bench }) => { - await bench('ssr server-route (react)', async () => - runServerRouteLoop(handler), - ).run(serverRouteBenchOptions) +describe('ssr', () => { + bench( + 'ssr server-route (react)', + () => runServerRouteLoop(handler), + serverRouteBenchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/server-routes/solid/speed.bench.ts b/benchmarks/ssr/scenarios/server-routes/solid/speed.bench.ts index 4788d31854..ce3e1f8a21 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertServerRouteResponse, runServerRouteLoop, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertServerRouteResponse(handler) -test('ssr', async ({ bench }) => { - await bench('ssr server-route (solid)', async () => - runServerRouteLoop(handler), - ).run(serverRouteBenchOptions) +describe('ssr', () => { + bench( + 'ssr server-route (solid)', + () => runServerRouteLoop(handler), + serverRouteBenchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/server-routes/vue/speed.bench.ts b/benchmarks/ssr/scenarios/server-routes/vue/speed.bench.ts index 09c0bbe90b..f2b9e27acb 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 { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertServerRouteResponse, runServerRouteLoop, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertServerRouteResponse(handler) -test('ssr', async ({ bench }) => { - await bench('ssr server-route (vue)', async () => - runServerRouteLoop(handler), - ).run(serverRouteBenchOptions) +describe('ssr', () => { + bench( + 'ssr server-route (vue)', + () => runServerRouteLoop(handler), + serverRouteBenchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/streaming/react/speed.bench.ts b/benchmarks/ssr/scenarios/streaming/react/speed.bench.ts index eb4c9dc1d6..c1dbf38ae5 100644 --- a/benchmarks/ssr/scenarios/streaming/react/speed.bench.ts +++ b/benchmarks/ssr/scenarios/streaming/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertStreamingSanity, benchOptions, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertStreamingSanity(handler) -test('ssr', async ({ bench }) => { - await bench('ssr streaming deferred (react)', async () => - runStreamingLoop(handler), - ).run(benchOptions) +describe('ssr', () => { + bench( + 'ssr streaming deferred (react)', + () => runStreamingLoop(handler), + benchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/streaming/solid/speed.bench.ts b/benchmarks/ssr/scenarios/streaming/solid/speed.bench.ts index 19d5817d32..0828715220 100644 --- a/benchmarks/ssr/scenarios/streaming/solid/speed.bench.ts +++ b/benchmarks/ssr/scenarios/streaming/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertStreamingSanity, benchOptions, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertStreamingSanity(handler) -test('ssr', async ({ bench }) => { - await bench('ssr streaming deferred (solid)', async () => - runStreamingLoop(handler), - ).run(benchOptions) +describe('ssr', () => { + bench( + 'ssr streaming deferred (solid)', + () => runStreamingLoop(handler), + benchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/streaming/vue/speed.bench.ts b/benchmarks/ssr/scenarios/streaming/vue/speed.bench.ts index 42473fc694..a484f95d6a 100644 --- a/benchmarks/ssr/scenarios/streaming/vue/speed.bench.ts +++ b/benchmarks/ssr/scenarios/streaming/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { test } from 'vitest' +import { bench, describe } from 'vitest' import { assertStreamingSanity, benchOptions, @@ -16,8 +16,10 @@ const { default: handler } = (await import( await assertStreamingSanity(handler) -test('ssr', async ({ bench }) => { - await bench('ssr streaming deferred (vue)', async () => - runStreamingLoop(handler), - ).run(benchOptions) +describe('ssr', () => { + bench( + 'ssr streaming deferred (vue)', + () => runStreamingLoop(handler), + benchOptions, + ) }) diff --git a/benchmarks/ssr/solid/speed.bench.ts b/benchmarks/ssr/solid/speed.bench.ts index 2f72977612..0c4317415d 100644 --- a/benchmarks/ssr/solid/speed.bench.ts +++ b/benchmarks/ssr/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { test } from 'vitest' +import { bench, describe } from 'vitest' import { runSsrRequestLoop } from '../bench-utils' import type { StartRequestHandler } from '../bench-utils' @@ -11,12 +11,14 @@ const { default: handler } = (await import( default: StartRequestHandler } -test('ssr', async ({ bench }) => { - await bench('ssr request loop (solid)', async () => - runSsrRequestLoop(handler, { seed: benchmarkSeed }), - ).run({ - warmupIterations: 100, - time: 10_000, - throws: true, - }) +describe('ssr', () => { + bench( + 'ssr request loop (solid)', + () => runSsrRequestLoop(handler, { seed: benchmarkSeed }), + { + warmupIterations: 100, + time: 10_000, + throws: true, + }, + ) }) diff --git a/benchmarks/ssr/vue/speed.bench.ts b/benchmarks/ssr/vue/speed.bench.ts index 57b59e0504..849f042e3c 100644 --- a/benchmarks/ssr/vue/speed.bench.ts +++ b/benchmarks/ssr/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { test } from 'vitest' +import { bench, describe } from 'vitest' import { runSsrRequestLoop } from '../bench-utils' import type { StartRequestHandler } from '../bench-utils' @@ -11,12 +11,14 @@ const { default: handler } = (await import( default: StartRequestHandler } -test('ssr', async ({ bench }) => { - await bench('ssr request loop (vue)', async () => - runSsrRequestLoop(handler, { seed: benchmarkSeed }), - ).run({ - warmupIterations: 100, - time: 10_000, - throws: true, - }) +describe('ssr', () => { + bench( + 'ssr request loop (vue)', + () => runSsrRequestLoop(handler, { seed: benchmarkSeed }), + { + warmupIterations: 100, + time: 10_000, + throws: true, + }, + ) }) diff --git a/docs/AGENTS.md b/docs/AGENTS.md deleted file mode 100644 index ab2d4117e2..0000000000 --- a/docs/AGENTS.md +++ /dev/null @@ -1,4 +0,0 @@ -# Documentation - -- Register new published pages in `router/config.json` or `start/config.json`; drafts need not be registered. -- Run `pnpm test:docs` from the repository root for Markdown link validation. It checks `docs/**/*.md`, not Markdown elsewhere. Relative links resolve from the containing file. diff --git a/docs/router/api/file-based-routing.md b/docs/router/api/file-based-routing.md index 7c94d484d1..ad3e07fad7 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 with Vite, Rspack/Rsbuild or Webpack. With Esbuild, setting it to `true` is an error. +This feature is only available if you are using the TanStack Router Bundler Plugin. 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/api/router/RouterEventsType.md b/docs/router/api/router/RouterEventsType.md index c27887fba1..c79bb47f81 100644 --- a/docs/router/api/router/RouterEventsType.md +++ b/docs/router/api/router/RouterEventsType.md @@ -47,6 +47,9 @@ type RouterEvents = { hrefChanged: boolean hashChanged: boolean } + onInjectedHtml: { + type: 'onInjectedHtml' + } onRendered: { type: 'onRendered' fromLocation?: ParsedLocation @@ -64,7 +67,7 @@ Once an event is emitted, the following properties will be present on the event ### `type` property -- Type: `onBeforeNavigate | onBeforeLoad | onLoad | onBeforeRouteMount | onResolved | onRendered` +- Type: `onBeforeNavigate | onBeforeLoad | onLoad | onBeforeRouteMount | onResolved | onRendered | onInjectedHtml` - The type of the event - This is useful for discriminating between events in a listener function. diff --git a/docs/router/api/router/RouterOptionsType.md b/docs/router/api/router/RouterOptionsType.md index 31f410b208..3556f4ab24 100644 --- a/docs/router/api/router/RouterOptionsType.md +++ b/docs/router/api/router/RouterOptionsType.md @@ -375,10 +375,9 @@ const router = createRouter({ ### `pathParamsAllowedCharacters` property -- Type: `ReadonlyArray<';' | ':' | '@' | '&' | '=' | '+' | '$' | ','>` +- Type: `Array<';' | ':' | '@' | '&' | '=' | '+' | '$' | ','>` - Optional - Configures which URI characters are allowed in path params that would ordinarily be escaped by encodeURIComponent. -- Read only when the router is created. To change these characters, create a new router instance. Router option updates and provider props do not change this setting. ### `defaultStructuralSharing` property diff --git a/docs/router/api/router/RouterType.md b/docs/router/api/router/RouterType.md index 3fde90e32e..cf8fdebeae 100644 --- a/docs/router/api/router/RouterType.md +++ b/docs/router/api/router/RouterType.md @@ -11,9 +11,8 @@ An instance of the `Router` has the following properties and methods: ### `.update` method -- Type: `(newOptions: Omit) => void` +- Type: `(newOptions: RouterOptions) => void` - Updates the router instance with new options. -- Initialization-only options such as `pathParamsAllowedCharacters` cannot be updated. Create a new router instance to change them. ### `state` property diff --git a/docs/router/api/router/linkComponent.md b/docs/router/api/router/linkComponent.md index 478271a208..a8227913b5 100644 --- a/docs/router/api/router/linkComponent.md +++ b/docs/router/api/router/linkComponent.md @@ -43,7 +43,7 @@ By default, param values with characters such as `@` will be encoded in the URL: ``` -To opt out, set [pathParamsAllowedCharacters](../router/RouterOptionsType#pathparamsallowedcharacters-property) when creating the router. This setting cannot be changed on an existing router instance. +To opt-out, update the [pathParamsAllowedCharacters](../router/RouterOptionsType#pathparamsallowedcharacters-property) config on the router ```tsx import { createRouter } from '@tanstack/react-router' diff --git a/docs/router/eslint/create-route-property-order.md b/docs/router/eslint/create-route-property-order.md index 453fd64acc..c22aa7c52d 100644 --- a/docs/router/eslint/create-route-property-order.md +++ b/docs/router/eslint/create-route-property-order.md @@ -37,10 +37,7 @@ import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/path')({ loader: async ({ context }) => { - await context.queryClient.query({ - ...getQueryOptions(context.hello), - staleTime: 'static', - }) + await context.queryClient.ensureQueryData(getQueryOptions(context.hello)) }, beforeLoad: () => ({ hello: 'world' }), }) @@ -58,10 +55,7 @@ import { createFileRoute } from '@tanstack/solid-router' export const Route = createFileRoute('/path')({ loader: async ({ context }) => { - await context.queryClient.query({ - ...getQueryOptions(context.hello), - staleTime: 'static', - }) + await context.queryClient.ensureQueryData(getQueryOptions(context.hello)) }, beforeLoad: () => ({ hello: 'world' }), }) @@ -86,10 +80,7 @@ import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/path')({ beforeLoad: () => ({ hello: 'world' }), loader: async ({ context }) => { - await context.queryClient.query({ - ...getQueryOptions(context.hello), - staleTime: 'static', - }) + await context.queryClient.ensureQueryData(getQueryOptions(context.hello)) }, }) ``` @@ -107,10 +98,7 @@ import { createFileRoute } from '@tanstack/solid-router' export const Route = createFileRoute('/path')({ beforeLoad: () => ({ hello: 'world' }), loader: async ({ context }) => { - await context.queryClient.query({ - ...getQueryOptions(context.hello), - staleTime: 'static', - }) + await context.queryClient.ensureQueryData(getQueryOptions(context.hello)) }, }) ``` diff --git a/docs/router/guide/automatic-code-splitting.md b/docs/router/guide/automatic-code-splitting.md index 859a19ff09..be599845bc 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. It is available with Vite, Rspack/Rsbuild and Webpack, not with Esbuild. +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. ```ts // vite.config.ts diff --git a/docs/router/guide/deferred-data-loading.md b/docs/router/guide/deferred-data-loading.md index f378d7adbf..9956542ebd 100644 --- a/docs/router/guide/deferred-data-loading.md +++ b/docs/router/guide/deferred-data-loading.md @@ -90,16 +90,15 @@ 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 - void queryClient.query(slowDataOptions()).catch(noop) + queryClient.prefetchQuery(slowDataOptions()) // Fetch and await some data that resolves quickly - await queryClient.query({ ...fastDataOptions(), staleTime: 'static' }) + await queryClient.ensureQueryData(fastDataOptions()) }, }) ``` @@ -109,16 +108,15 @@ 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 - void queryClient.query(slowDataOptions()).catch(noop) + queryClient.prefetchQuery(slowDataOptions()) // Fetch and await some data that resolves quickly - await queryClient.query({ ...fastDataOptions(), staleTime: 'static' }) + await queryClient.ensureQueryData(fastDataOptions()) }, }) ``` diff --git a/docs/router/guide/external-data-loading.md b/docs/router/guide/external-data-loading.md index 4ffb318686..b9265facec 100644 --- a/docs/router/guide/external-data-loading.md +++ b/docs/router/guide/external-data-loading.md @@ -6,8 +6,6 @@ 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. -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**? While Router is very capable of storing and managing most data needs out of the box, sometimes you just might want something more robust! @@ -84,8 +82,7 @@ const postsQueryOptions = queryOptions({ export const Route = createFileRoute('/posts')({ // Use the `loader` option to ensure that the data is loaded - loader: () => - queryClient.query({ ...postsQueryOptions, staleTime: 'static' }), + loader: () => queryClient.ensureQueryData(postsQueryOptions), component: () => { // Read the data from the cache and subscribe to updates const { @@ -109,8 +106,7 @@ When an error occurs while using `suspense` with `TanStack Query`, you need to l ```tsx export const Route = createFileRoute('/')({ - loader: () => - queryClient.query({ ...postsQueryOptions, staleTime: 'static' }), + loader: () => queryClient.ensureQueryData(postsQueryOptions), errorComponent: ({ error, reset }) => { const router = useRouter() const queryErrorResetBoundary = useQueryErrorResetBoundary() diff --git a/docs/router/guide/history-types.md b/docs/router/guide/history-types.md index 0c6a914fb6..9e20736854 100644 --- a/docs/router/guide/history-types.md +++ b/docs/router/guide/history-types.md @@ -9,7 +9,6 @@ If you don't create a history instance, a browser-oriented instance of this API - `createBrowserHistory`: The default history type. - `createHashHistory`: A history type that uses a hash to track history. - `createMemoryHistory`: A history type that keeps the history in memory. -- `createServerHistory`: A history type with a fixed request URL and no-op navigation, used by the SSR request handlers. Once you have a history instance, you can pass it to the `Router` constructor: diff --git a/docs/router/guide/path-params.md b/docs/router/guide/path-params.md index d326eabb4b..7ebaaad19e 100644 --- a/docs/router/guide/path-params.md +++ b/docs/router/guide/path-params.md @@ -1395,8 +1395,6 @@ const router = createRouter({ }) ``` -This setting is fixed when the router is created. To use different allowed characters, create a new router instance. - The following is the list of accepted allowed characters: - `;` diff --git a/docs/router/guide/router-context.md b/docs/router/guide/router-context.md index 347082106f..5fc4001010 100644 --- a/docs/router/guide/router-context.md +++ b/docs/router/guide/router-context.md @@ -278,10 +278,9 @@ Then, in your route: export const Route = createFileRoute('/todos')({ component: Todos, loader: async ({ context }) => { - await context.queryClient.query({ + await context.queryClient.ensureQueryData({ queryKey: ['todos', { userId: user.id }], queryFn: fetchTodos, - staleTime: 'static', }) }, }) diff --git a/docs/router/guide/ssr.md b/docs/router/guide/ssr.md index 46a0941e7c..f87849f8a1 100644 --- a/docs/router/guide/ssr.md +++ b/docs/router/guide/ssr.md @@ -60,9 +60,7 @@ To implement non-streaming SSR with TanStack Router, you will need the following ### Automatic Server History -On the client, Router defaults to using an instance of `createBrowserHistory`. On the server, the Router SSR request handler and TanStack Start automatically create a lightweight history containing only the request URL. This history does not keep a navigation stack or respond to `push`, `replace`, `go`, `back`, or `forward` calls. - -Server-side calls to `router.navigate()` and `router.commitLocation()` are also no-ops: their promises resolve without changing the request location or running another load. To redirect a request, use the dedicated [redirect API](../api/router/redirectFunction.md), such as `throw redirect({ to: '/login' })` in `beforeLoad` or a loader. +On the client, Router defaults to using an instance of `createBrowserHistory`, which is the preferred type of history to use on the client. On the server, however, you will want to use an instance of `createMemoryHistory` instead. This is because `createBrowserHistory` uses the `window` object, which does not exist on the server. This is handled automatically for you in the RouterServer component. ### Automatic Loader Dehydration/Hydration @@ -158,8 +156,6 @@ export async function render({ request }: { request: Request }) { using `renderRouterToString` -React and Solid use their native synchronous string renderers. Suspended components render their Suspense fallback without waiting for the component to resolve. The router still finishes serializing hydration data before returning the response. Use `renderRouterToStream` when you need the server to render suspended content after it resolves. - # React @@ -262,9 +258,6 @@ This pattern can be useful for pages that have slow or high-latency data fetchin > [!NOTE] > This streaming pattern is all automatic as long as you are using either `defaultStreamHandler` or `renderRouterToStream`. -> [!IMPORTANT] -> Render [``](./document-head-management.md#scripts) inside `` of your root route. It emits the route scripts and marks where the router inserts streamed hydration data. Without it the response still completes, but the page cannot hydrate. - using `defaultStreamHandler` diff --git a/docs/router/guide/type-safety.md b/docs/router/guide/type-safety.md index 3faaed79e7..2adffc58c5 100644 --- a/docs/router/guide/type-safety.md +++ b/docs/router/guide/type-safety.md @@ -137,13 +137,12 @@ 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.query` 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.ensureQueryData` in a `loader`. ```tsx export const Route = createFileRoute('/posts/$postId/deep')({ - // (ctx: LoaderFnContext) => Promise loader: ({ context: { queryClient }, params: { postId } }) => - queryClient.query({ ...postQueryOptions(postId), staleTime: 'static' }), + queryClient.ensureQueryData(postQueryOptions(postId)), component: PostDeepComponent, }) @@ -155,16 +154,12 @@ 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.query({ - ...postQueryOptions(postId), - staleTime: 'static', - }) + await queryClient.ensureQueryData(postQueryOptions(postId)) }, component: PostDeepComponent, }) diff --git a/docs/router/how-to/setup-testing.md b/docs/router/how-to/setup-testing.md index 104cbedc0d..48afa122f4 100644 --- a/docs/router/how-to/setup-testing.md +++ b/docs/router/how-to/setup-testing.md @@ -659,10 +659,9 @@ describe('React Query Integration', () => { path: '/posts', component: PostsList, loader: ({ context: { queryClient } }) => - queryClient.query({ + queryClient.ensureQueryData({ queryKey: ['posts'], queryFn: mockFetchPosts, - staleTime: 'static', }), }) diff --git a/docs/router/how-to/share-search-params-across-routes.md b/docs/router/how-to/share-search-params-across-routes.md index 23a202b176..e1e24c1e0d 100644 --- a/docs/router/how-to/share-search-params-across-routes.md +++ b/docs/router/how-to/share-search-params-across-routes.md @@ -2,6 +2,8 @@ title: Share Search Parameters Across Routes --- +# How to Share Search Parameters Across Routes + Search parameters automatically inherit from parent routes in TanStack Router. When a parent route validates search parameters, child routes can access them via `Route.useSearch()` alongside their own parameters. ## How Parameter Inheritance Works diff --git a/docs/router/installation/with-esbuild.md b/docs/router/installation/with-esbuild.md index 8ecd9b8d0a..b5cad0622c 100644 --- a/docs/router/installation/with-esbuild.md +++ b/docs/router/installation/with-esbuild.md @@ -25,6 +25,7 @@ export default { plugins: [ tanstackRouter({ target: 'react', + autoCodeSplitting: true, }), ], } @@ -49,7 +50,10 @@ const ctx = await esbuild.context({ format: 'esm', target: ['esnext'], sourcemap: true, - plugins: [solidPlugin(), tanstackRouter({ target: 'solid' })], + plugins: [ + solidPlugin(), + tanstackRouter({ target: 'solid', autoCodeSplitting: true }), + ], }) if (isDev) { @@ -68,9 +72,6 @@ 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 707f90900c..fd174187b5 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 -# Blocking `query` in loader +# React ```tsx title="src/routes/posts.tsx" import { queryOptions, useSuspenseQuery, useQuery } from '@tanstack/react-query' @@ -165,12 +165,7 @@ const postsQuery = queryOptions({ export const Route = createFileRoute('/posts')({ // Ensure the data is in the cache before render - loader: ({ context }) => - context.queryClient.query({ - ...postsQuery, - // returns data from cache immediately, otherwise executes a fetch - staleTime: 'static', - }), + loader: ({ context }) => context.queryClient.ensureQueryData(postsQuery), component: PostsPage, }) @@ -185,15 +180,15 @@ function PostsPage() { ### Prefetching and streaming -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. +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. -# Non-blocking `query` in loader +# React ```tsx title="src/routes/users.$id.tsx" import { createFileRoute } from '@tanstack/react-router' -import { noop, queryOptions, useQuery } from '@tanstack/react-query' +import { queryOptions, useQuery } from '@tanstack/react-query' const userQuery = (id: string) => queryOptions({ @@ -202,18 +197,15 @@ const userQuery = (id: string) => }) export const Route = createFileRoute('/user/$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) + 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)) }, }) ``` -> [!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 36af0e6e0d..57703aad89 100644 --- a/docs/start/config.json +++ b/docs/start/config.json @@ -36,10 +36,6 @@ { "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" } ] }, @@ -57,10 +53,6 @@ { "label": "Build from Scratch", "to": "framework/solid/build-from-scratch" - }, - { - "label": "Migrate from the Release Candidate", - "to": "framework/solid/migrate-from-release-candidate" } ] } @@ -284,10 +276,6 @@ { "label": "react", "children": [ - { - "label": "Production Checklist", - "to": "framework/react/guide/production-checklist" - }, { "label": "Hosting", "to": "framework/react/guide/hosting" @@ -322,7 +310,7 @@ "label": "react", "children": [ { - "label": "Choose Authentication", + "label": "Authentication Overview", "to": "framework/react/guide/authentication-overview" }, { @@ -330,16 +318,12 @@ "to": "framework/react/guide/authentication-server-primitives" }, { - "label": "Implement Authentication", + "label": "Authentication", "to": "framework/react/guide/authentication" }, { "label": "Databases", "to": "framework/react/guide/databases" - }, - { - "label": "TanStack Query", - "to": "framework/react/guide/tanstack-query" } ] }, @@ -347,7 +331,7 @@ "label": "solid", "children": [ { - "label": "Choose Authentication", + "label": "Authentication Overview", "to": "framework/solid/guide/authentication-overview" }, { @@ -355,7 +339,7 @@ "to": "framework/solid/guide/authentication-server-primitives" }, { - "label": "Implement Authentication", + "label": "Authentication", "to": "framework/solid/guide/authentication" }, { diff --git a/docs/start/framework/react/comparison.md b/docs/start/framework/react/comparison.md index b72e286a76..5c39e0f602 100644 --- a/docs/start/framework/react/comparison.md +++ b/docs/start/framework/react/comparison.md @@ -1,61 +1,338 @@ --- title: Comparison | TanStack Start vs Next.js vs React Router -description: Compare rendering, server APIs, caching, forms, and deployment in TanStack Start, Next.js App Router, and React Router Framework Mode. toc: false --- -This matrix compares full-stack framework capabilities. For the choice between Start and Next.js, read [TanStack Start vs Next.js](./start-vs-nextjs). For navigation and URL-state APIs, see the [TanStack Router comparison](/router/latest/docs/comparison). +Choosing a full-stack React framework? This comparison focuses on the **full-stack framework features** that distinguish TanStack Start from Next.js and React Router (v7 Framework Mode). -Checked September 11, 2026 against the linked documentation: TanStack Start's current guides, Next.js 16.3 App Router, and React Router 8.3 Framework Mode. +> **🚨 IMPORTANT: Looking for routing features?** +> +> TanStack Start is built on **TanStack Router**, which provides industry-leading type-safe routing capabilities. For a comprehensive comparison of routing features (nested routes, search params, type safety, loaders, etc.), please see: +> +> ### [📖 TanStack Router Comparison vs React Router / Next.js →](/router/latest/docs/framework/react/comparison) +> +> That comparison covers all the routing features in detail. This page focuses specifically on **full-stack framework capabilities** like SSR, server functions, middleware, deployment, and more. -## Rendering and data +While we aim to provide an accurate and fair comparison, please note that this table may not capture every nuance or recent update of each framework. We recommend reviewing the official documentation and trying out each solution to make the most informed decision for your specific use case. -| Capability | TanStack Start | Next.js App Router | React Router Framework Mode | -| ----------------------------- | --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------- | -| Server rendering | [SSR with hydration by default](./overview) | [Server and Client Components contribute to initial HTML](https://nextjs.org/docs/app/getting-started/server-and-client-components) | [Server rendering is configurable](https://reactrouter.com/start/framework/rendering) | -| Rendering control | [Per-route full, data-only, or disabled SSR](./guide/selective-ssr) | [Server/Client Component boundaries](https://nextjs.org/docs/app/getting-started/server-and-client-components); `use client` does not disable initial SSR | [Global SSR setting and route-level client loaders](https://reactrouter.com/start/framework/rendering) | -| SPA applications | [Dedicated SPA mode](./guide/spa-mode) | [Documented SPA patterns](https://nextjs.org/docs/app/guides/single-page-applications) | [`ssr: false`](https://reactrouter.com/start/framework/rendering) | -| Static output | [Prerendering configuration](./guide/static-prerendering) | [Static export](https://nextjs.org/docs/app/guides/static-exports), with server-feature limitations | [Prerender selected URLs](https://reactrouter.com/start/framework/rendering) | -| React Server Components | [Experimental, opt-in](./guide/server-components) | [Core App Router component model](https://nextjs.org/docs/app/getting-started/server-and-client-components) | [Unstable RSC integration](https://reactrouter.com/how-to/react-server-components) | -| Client data reuse | [Router loader caching](/router/latest/docs/guide/data-loading), plus [Query integration](/router/latest/docs/integrations/query) | [Navigation caching and server cache APIs](https://nextjs.org/docs/app/getting-started/caching); a query library can manage additional client data | [Loader/action revalidation](https://reactrouter.com/start/framework/actions); separate client-data tools can be added | -| Revalidation after deployment | [HTTP caching and provider-specific ISR configuration](./guide/isr) | [ISR and cache coordination](https://nextjs.org/docs/app/guides/self-hosting) | [HTTP response headers](https://reactrouter.com/how-to/headers) and deployment infrastructure | +If you find any discrepancies or have suggestions for improvement, please don't hesitate to contribute via the "Edit this page on GitHub" link at the bottom of this page or open an issue in the [TanStack Router GitHub repository](https://github.com/TanStack/router). -A client loader cache, a cached server result, and a cached HTML response are different things. Compare invalidation behavior, persistence, and multi-instance coordination for the layer your application needs. A CDN honoring `stale-while-revalidate` is not proof of identical ISR behavior across providers. +Feature/Capability Key: -## Server APIs and forms +- ✅ 1st-class, built-in, and ready to use with no added configuration or code +- 🟡 Partial Support (rated 1-5 where noted) +- 🟠 Supported via addon/community package +- 🔶 Possible, but requires custom code/implementation/casting +- 🛑 Not officially supported -| Capability | TanStack Start | Next.js App Router | React Router Framework Mode | -| -------------------------- | -------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- | -| Server calls and mutations | [Typed server functions with GET or POST](./guide/server-functions) | [Server Actions](https://nextjs.org/docs/app/guides/forms) | [Route actions and fetchers](https://reactrouter.com/start/framework/actions) | -| Input validation | [Validator API with inferred types](./guide/server-functions) | [Validate action input with application code or a schema](https://nextjs.org/docs/app/guides/forms) | [Validate action input with application code](https://reactrouter.com/how-to/form-validation) | -| Middleware | [Request middleware and client/server function middleware](./guide/middleware) | [Request interception with Proxy](https://nextjs.org/docs/app/getting-started/proxy); action authorization belongs in server code | [Server and client route middleware](https://reactrouter.com/how-to/middleware) | -| Form handling | [Server functions](./guide/server-functions) can be called from event handlers; use a form library when needed | [Built-in `next/form`](https://nextjs.org/docs/app/api-reference/components/form), plus [Server Action forms](https://nextjs.org/docs/app/guides/forms) | [`Form`, actions, and fetchers](https://reactrouter.com/start/framework/actions) | -| Server endpoints | [Server routes](./guide/server-routes) | [Route Handlers](https://nextjs.org/docs/app/getting-started/route-handlers) | [Resource routes](https://reactrouter.com/how-to/resource-routes) | +| | TanStack Start | Next.js [_(Website)_][nextjs] | React Router [_(Website)_][react-router] | +| ----------------------------------------------------------------- | ------------------------------------------------ | --------------------------------------------- | ------------------------------------------ | +| Github Repo / Stars | [![][stars-tanstack-router]][gh-tanstack-router] | [![][stars-nextjs]][gh-nextjs] | [![][stars-react-router]][gh-react-router] | +| Bundle Size | [![][bp-tanstack-router]][bpl-tanstack-router] | ❓ | ❓ | +| -- | -- | -- | -- | +| **Routing Features** [_(See Full Comparison)_][router-comparison] | ✅ Built on TanStack Router | ✅ File-based App Router | ✅ File-based Nested Routes | +| -- | -- | -- | -- | +| **Full-Stack Features** | -- | -- | -- | +| SSR | ✅ | ✅ | ✅ | +| Streaming SSR | ✅ | ✅ | ✅ | +| Selective SSR (per-route) | ✅ | 🔶 | 🔶 | +| SPA Mode | ✅ | 🔶 (via "use client") | ✅ | +| Built-in Client-Side SWR Caching | ✅ (via TanStack Router) | 🔶 (fetch cache only) | 🛑 | +| Data Fetching Library Integration | ✅ (Official TanStack Query, Apollo, etc.) | 🔶 (manual integration) | 🔶 (manual integration) | +| Static Prerendering (SSG) | ✅ | ✅ | ✅ | +| Incremental Static Regeneration (ISR) | ✅ (via Cache-Control headers) | ✅ (Proprietary) | ✅ (via Cache-Control headers) | +| React Server Components | 🟡 (Experimental) | ✅ | 🟡 (Experimental) | +| Server Functions | ✅ (RPC-based) | ✅ (Server Actions) | ✅ (Actions) | +| Server Function Client Middleware | ✅ | 🛑 | 🛑 | +| Server Function Server Middleware | ✅ | 🛑 | ✅ | +| Request Middleware (All Routes) | ✅ | ✅ | ✅ | +| Server Function Input Validation | ✅ | 🔶 (manual) | 🔶 (manual) | +| API Routes / Server Routes / Resource Routes | ✅ | ✅ | ✅ | +| `
` API | 🛑 | 🟠 (via React 19 useActionState) | ✅ | +| -- | -- | -- | -- | +| **Developer Experience** | -- | -- | -- | +| Devtools | ✅ | 🛑 | 🟠 (3rd party) | +| CLI Tooling | ✅ | ✅ | ✅ | +| Dev Server Startup Speed | ✅ (Fast) | 🛑 (Slow) | ✅ (Fast) | +| HMR Speed | ✅ (Fast, Vite or Rsbuild) | 🛑 (Slow, Webpack/Turbopack) | ✅ (Fast, Vite) | +| Dev Navigation Speed | ✅ | 🟡 | ✅ | +| Dev Resource Usage (CPU/RAM) | ✅ (Lightweight) | 🛑 (Heavy) | ✅ (Lightweight) | +| TypeScript Support | ✅ | ✅ | ✅ | +| Type-First Architecture | ✅ | 🛑 | 🛑 | +| -- | -- | -- | -- | +| **Deployment & Hosting** | -- | -- | -- | +| Deployment Flexibility | ✅ (Vite and Rsbuild builds) | 🟡 (Optimized for Vercel, possible elsewhere) | ✅ (Multiple adapters) | +| Edge Runtime Support | ✅ | ✅ | ✅ | +| Serverless Support | ✅ | ✅ | ✅ | +| Node.js Support | ✅ | ✅ | ✅ | +| Docker Support | ✅ | ✅ | ✅ | +| Static Export | ✅ | ✅ | ✅ | +| Official Cloudflare Support | ✅ | 🟡 | ✅ | +| Official Netlify Support | ✅ | 🟡 | ✅ | +| Official Vercel Support | ✅ (via Nitro) | ✅ | ✅ | -Type inference helps callers write valid code. It does not validate an incoming HTTP request or authorize access to a record. All three frameworks need runtime validation and server-side authorization for private operations. For Start, see [Authentication Server Primitives](./guide/authentication-server-primitives). +--- -## Tooling and deployment +> **⚠️ Remember:** For detailed comparisons of **routing features** (type safety, search params, loaders, navigation, etc.), see the [**TanStack Router Comparison**][router-comparison]. This page focuses on full-stack framework capabilities. -| Capability | TanStack Start | Next.js App Router | React Router Framework Mode | -| ----------------------- | ------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- | -| Build integration | [Vite or Rsbuild](./build-from-scratch) | [Turbopack](https://nextjs.org/docs/app/api-reference/turbopack) | [Framework tooling](https://reactrouter.com/start/framework/installation) | -| Type support | [Router inference](/router/latest/docs/guide/type-safety) and [server function inference](./guide/server-functions) | [Stable opt-in typed links](https://nextjs.org/docs/app/api-reference/config/next-config-js/typedRoutes) and TypeScript APIs | [Generated route-module types](https://reactrouter.com/how-to/route-module-type-safety) | -| Metadata | [Route head management and SEO guide](./guide/seo) | [Metadata API and file conventions](https://nextjs.org/docs/app/getting-started/metadata-and-og-images) | [Route-module metadata](https://reactrouter.com/start/framework/route-module) | -| Image and font handling | Choose CSS, an image service, or an integration for your deployment | Built-in [`next/image`](https://nextjs.org/docs/app/api-reference/components/image) and [`next/font`](https://nextjs.org/docs/app/api-reference/components/font) | Choose CSS, an image service, or an integration for your deployment | -| Hosting | [Provider and runtime guides](./guide/hosting) | [Self-hosting](https://nextjs.org/docs/app/guides/self-hosting) or a deployment provider | [Deployment templates and hosting options](https://reactrouter.com/start/framework/deploying) | +--- -Deployment support depends on the adapter, runtime, and features you use. Check streaming, image processing, filesystem access, background work, and shared-cache behavior on your chosen target. Next.js self-hosting includes image optimization and ISR configuration; those features should not be labeled Vercel-only. +## Key Philosophical Differences -## Performance Considerations +### TanStack Start -This page does not establish a performance winner. Startup time, HMR, memory use, JavaScript shipped, and response latency require separate measurements. Comparing a router package's bundle size with an entire framework is not a valid application benchmark. +**Philosophy**: Maximum developer freedom with best-in-class type safety. -For a useful comparison, build the same representative application with recommended patterns in each framework. Record package versions, hardware, dependencies, route count, rendering and caching settings, deployment target, warm and cold runs, and the raw results. +- **Router-First**: Built on TanStack Router (see [full routing comparison][router-comparison]) +- **Deployment Agnostic**: Built on Vite and Rsbuild integrations, deploy without vendor lock-in +- **Composable Middleware**: Middleware system works at both the request level AND individual server function level (both client & server) +- **Selective SSR**: Fine-grained control over SSR behavior per route (full SSR, data-only, or client-only) +- **Developer Control**: Explicit, composable patterns over convention-based magic +- **Type Safety First**: End-to-end compile-time safety for server functions, loaders, and routing + +### Next.js + +**Philosophy**: Production-ready with optimal defaults, best with Vercel. + +- **RSC-First**: Deep integration with React Server Components as the primary paradigm +- **Vercel-Optimized**: Best performance and DX on Vercel's infrastructure +- **Convention over Configuration**: Opinionated structure with file-system routing conventions +- **Automatic Optimizations**: Many performance optimizations happen automatically +- **Production Grade**: Battle-tested at massive scale + +### React Router (v7 Framework Mode) + +**Philosophy**: Web fundamentals with progressive enhancement. + +- **Web Standards**: Embraces web platform primitives (fetch, FormData, Headers) +- **Progressive Enhancement**: Works without JavaScript by default +- **Nested Routes**: First-class support for nested routing and data loading +- **Action-Based**: Form submissions via actions follow web standards +- **Framework Evolution**: Successor to Remix, with Vite-based architecture ## When to Choose Each Framework -- **TanStack Start:** you want typed route context and URL state, explicit loaders and server functions, and control over per-route rendering. -- **Next.js:** you want its Server Component model and integrated image, font, metadata, and form facilities. Existing team experience and integrations can also make staying with Next.js the better choice. -- **React Router Framework Mode:** you want route loaders and actions, fetchers, and form-driven workflows. Read its [progressive enhancement guide](https://reactrouter.com/explanation/progressive-enhancement) if operation before JavaScript loads matters to your application. +### Choose TanStack Start if you: -Check Start's [overview](./overview) and [Server Components guide](./guide/server-components) for current release and experimental-feature status before adopting those features. To try Start, use [Getting Started](./getting-started) or [Migrate from Next.js](./migrate-from-next-js). +- Want the absolute best type safety for routing (see [Router Comparison][router-comparison]) +- Need deployment flexibility without vendor lock-in (works with Vite and Rsbuild builds) +- Prefer composable, explicit patterns over convention +- Want fine-grained control over SSR behavior (selective SSR per route) +- Need composable middleware that works at both request and server function levels +- Are building a complex application that benefits from TanStack Router's advanced features +- Already use TanStack Query or other TanStack libraries + +### Choose Next.js if you: + +- Want to use React Server Components today with full ecosystem support +- Are deploying to Vercel or want a Vercel-optimized experience +- Prefer convention over configuration for faster initial development +- Want automatic image optimization and font loading + +### Choose React Router if you: + +- Prioritize progressive enhancement +- Want your app to work without JavaScript +- Prefer action-based mutations following web conventions + +## Feature Deep Dives + +### Built-in Client-Side Caching + +**TanStack Start** includes powerful built-in SWR (stale-while-revalidate) caching through TanStack Router: + +- **Out-of-the-box performance** - Loader data is automatically cached and revalidated +- **Fine-grained control** - Configure `staleTime`, `gcTime`, and revalidation per route +- **Structural sharing** - Efficient updates that only re-render what changed +- **Official integrations** - Turn-key support for TanStack Query, Apollo, and other data fetching libraries +- **More performant** - Optimized for the user experience with instant navigation and background updates + +```tsx +export const Route = createFileRoute('/posts/$postId')({ + loader: async ({ params }) => fetchPost(params.postId), + staleTime: 10_000, // Consider fresh for 10 seconds + gcTime: 5 * 60_000, // Keep in memory for 5 minutes +}) +``` + +For advanced scenarios, TanStack Start integrates seamlessly with TanStack Query: + +```tsx +import { queryOptions } from '@tanstack/react-query' + +const postQueryOptions = (postId: string) => + queryOptions({ + queryKey: ['post', postId], + queryFn: () => fetchPost(postId), + }) + +export const Route = createFileRoute('/posts/$postId')({ + loader: ({ context, params }) => + context.queryClient.ensureQueryData(postQueryOptions(params.postId)), +}) + +function Post() { + const { postId } = Route.useParams() + const { data } = useQuery(postQueryOptions(postId)) + // Automatically uses cached data from loader +} +``` + +**Next.js** has basic fetch caching but lacks fine-grained control and requires manual integration with libraries like React Query. + +**React Router** doesn't have built-in client-side caching - you need to manually integrate a caching solution. + +### Server Functions vs Server Actions + +**TanStack Start Server Functions**: + +```tsx +export const getTodos = createServerFn({ method: 'GET' }) + .validator(zodValidator(z.object({ userId: z.string() }))) + .middleware([authMiddleware]) + .handler(async ({ data, context }) => { + // Fully typed data and context + return db.todos.findMany({ where: { userId: data.userId } }) + }) + +// Call from anywhere with full type safety +const todos = await getTodos({ data: { userId: '123' } }) +``` + +**Next.js Server Actions**: + +```tsx +'use server' +export async function getTodos(userId: string) { + // Runs on server, called from client + return db.todos.findMany({ where: { userId } }) +} + +// Call from client component +const todos = await getTodos('123') +``` + +Key differences: + +- Start's server functions support both client and server middleware +- Start has built-in input validation +- Start's approach is more explicit about the client/server boundary +- Start's server functions support both GET and POST methods (configurable via the `method` option, defaults to GET), while Next.js Server Actions only support POST. +- Next.js Server Actions integrate more seamlessly with forms + +### Middleware Architecture + +**TanStack Start** has two types of middleware: + +1. **Request Middleware**: Runs for all requests (SSR, API routes, server functions) +2. **Server Function Middleware**: Runs specifically for server functions, supports both client-side and server-side execution + +This composability allows for: + +```tsx +const authMiddleware = createMiddleware({ type: 'function' }) + .client(async ({ next }) => { + // Run auth checks on client + return next({ + headers: { Authorization: `Bearer ${getToken()}` }, + }) + }) + .server(async ({ next }) => { + // Validate auth on server + return next({ context: { user: await getUser() } }) + }) +``` + +**Next.js** has a single proxy.ts file that runs on the Node.js runtime. Unlike the deprecated middleware.ts (which ran on Edge Runtime), proxy.ts has full access to server-side resources like databases. + +### Deployment Flexibility + +**TanStack Start** leverages modern build tool ecosystems: + +- Deploy to Cloudflare Workers, Netlify, Vercel, Railway, Fly.io, AWS, etc. +- Use Nitro for universal deployment support +- No vendor-specific features or lock-in +- Same codebase works everywhere + +**Next.js** is optimized for Vercel: + +- Many features work best or only on Vercel (ISR, Image Optimization, Middleware) +- Self-hosting requires more configuration +- Deployment to other platforms may have limitations + +## React Server Components (RSC) + +**Current Status**: + +- **Next.js**: Full production support with extensive ecosystem +- **TanStack Start**: Experimental support available +- **React Router**: Experimental support available + +TanStack Start's RSC implementation takes a client-led composition approach: server components are treated as data that the client can fetch, cache, and compose. See the [Server Components guide](/start/latest/docs/framework/react/guide/server-components) for details. + +## Performance Considerations + +### Production Performance + +All three frameworks are capable of achieving excellent production performance and top Lighthouse scores. The differences come down to optimization strategies: + +- **TanStack Start**: Optimized bundler builds, SWR caching reduces server load, lightweight runtime +- **Next.js**: Automatic code splitting, image optimization, and built-in performance features +- **React Router**: Web standards-based caching and optimization + +### Development Performance + +This is where the frameworks differ significantly: + +**TanStack Start & React Router:** + +- ⚡ **Instant dev server startup** - Vite and Rsbuild start quickly +- ⚡ **Lightning-fast HMR** - Changes reflect instantly without page refresh +- ⚡ **Fast dev navigation** - Full-speed routing during development +- ⚡ **Lightweight resource usage** - Minimal CPU and RAM consumption +- ⚡ **High dev throughput** - Handle many concurrent requests efficiently + +**Next.js:** + +- 🐌 **Slow dev server startup** - Can take many seconds to start, especially on larger projects +- 🐌 **Slow HMR** - Hot reloading is noticeably sluggish even with Turbopack +- 🐌 **Throttled dev navigation** - Navigation is artificially slowed during development +- 🐌 **Heavy resource usage** - Significant CPU and RAM consumption during development + +**Why This Matters:** + +Development performance directly impacts developer productivity. Faster feedback loops mean: + +- More iterations per hour +- Better flow state and focus +- Lower machine requirements +- Reduced frustration during development +- Faster CI/CD pipelines for development builds + +While Next.js's production performance is excellent, the development experience can be notably slower, especially on larger codebases or less powerful machines. + +## Community and Ecosystem + +- **Next.js**: Largest community, most third-party integrations, extensive learning resources +- **React Router**: One of the oldest and most widely used React libraries, strong community, excellent documentation +- **TanStack Start**: Growing community, part of TanStack ecosystem, excellent Discord support + +## Maturity + +- **Next.js**: Production-ready, used by thousands of companies, proven at scale +- **React Router**: Production-ready, powers millions of apps, v7 Framework Mode is the evolution of Remix +- **TanStack Start**: Release Candidate stage, feature-complete, rapidly stabilizing toward v1 + +[bp-tanstack-router]: https://badgen.net/bundlephobia/minzip/@tanstack/react-router +[bpl-tanstack-router]: https://bundlephobia.com/result?p=@tanstack/react-router +[gh-tanstack-router]: https://github.com/tanstack/router +[stars-tanstack-router]: https://img.shields.io/github/stars/tanstack/router?label=%F0%9F%8C%9F +[router-comparison]: /router/latest/docs/framework/react/comparison +[_]: _ +[nextjs]: https://nextjs.org/ +[gh-nextjs]: https://github.com/vercel/next.js +[stars-nextjs]: https://img.shields.io/github/stars/vercel/next.js?label=%F0%9F%8C%9F +[_]: _ +[react-router]: https://reactrouter.com/ +[gh-react-router]: https://github.com/remix-run/react-router +[stars-react-router]: https://img.shields.io/github/stars/remix-run/react-router?label=%F0%9F%8C%9F diff --git a/docs/start/framework/react/getting-started.md b/docs/start/framework/react/getting-started.md index 6e5bcd8841..0320fdab4e 100644 --- a/docs/start/framework/react/getting-started.md +++ b/docs/start/framework/react/getting-started.md @@ -3,7 +3,6 @@ id: getting-started title: Getting Started redirect_from: - /framework/react/quick-start -description: Create a TanStack Start application with TanStack Builder, the CLI, or a working example, then run it locally and start adding routes. --- ## Start a new project diff --git a/docs/start/framework/react/guide/authentication-overview.md b/docs/start/framework/react/guide/authentication-overview.md index e80ba97f8c..8b5838a9f9 100644 --- a/docs/start/framework/react/guide/authentication-overview.md +++ b/docs/start/framework/react/guide/authentication-overview.md @@ -1,11 +1,8 @@ --- id: authentication-overview -title: Choose Authentication for React Apps -description: Compare hosted services, auth libraries, and custom authentication for React apps built with TanStack Start. Choose an approach before implementing sessions and authorization. +title: Authentication --- -Choose how your React app will handle identity, sessions, and permissions. This page compares approaches and providers. Once you have chosen an approach, use [Implement Authentication in React](./authentication.md) for the application workflow. - ## Authentication vs Authorization - **Authentication**: Who is this user? (Login/logout, identity verification) @@ -116,7 +113,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 written with `setCookie`, read with `getCookie` +- **Session Management**: HTTP-only cookies via `setResponseHeader`, read with `getRequestHeader` - **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 103e9c4455..20cc143d2f 100644 --- a/docs/start/framework/react/guide/authentication-server-primitives.md +++ b/docs/start/framework/react/guide/authentication-server-primitives.md @@ -3,7 +3,7 @@ id: authentication-server-primitives title: Authentication Server Primitives --- -This guide covers the **server-side primitives** for building authentication in TanStack Start: session cookies, session lookup, OAuth, password-reset hardening, CSRF, and rate limiting. It pairs with the [routing-side guide](/router/latest/docs/framework/react/guide/authenticated-routes) (`_authenticated` layout, `beforeLoad`, redirects, RBAC). +This guide covers the **server-side primitives** for building authentication in TanStack Start: session cookies, session lookup, OAuth, password-reset hardening, CSRF, and rate limiting. It pairs with the [routing-side guide](../../../../router/guide/authenticated-routes.md) (`_authenticated` layout, `beforeLoad`, redirects, RBAC). If you can use a managed solution like [Clerk](https://go.clerk.com/wOwHtuJ) or [WorkOS](https://workos.com/), prefer that — they handle most of what this guide describes. Read on if you're rolling your own. @@ -28,39 +28,47 @@ Whichever you choose, the cookie flags matter: ```ts // src/server/session.ts import { - deleteCookie, - getCookie, - setCookie, + getRequestHeader, + setResponseHeader, } 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) { - setCookie(SESSION_COOKIE, token, { - ...sessionCookieOptions, - maxAge: ONE_DAY, - }) + setResponseHeader( + 'Set-Cookie', + [ + `${SESSION_COOKIE}=${token}`, + `HttpOnly`, + `Secure`, + `SameSite=Lax`, + `Path=/`, + `Max-Age=${ONE_DAY}`, + ].join('; '), + ) } export function clearSessionCookie() { - deleteCookie(SESSION_COOKIE, sessionCookieOptions) + setResponseHeader( + 'Set-Cookie', + `${SESSION_COOKIE}=; HttpOnly; Secure; SameSite=Lax; Path=/; Max-Age=0`, + ) } export function readSessionToken(): string | null { - return getCookie(SESSION_COOKIE) ?? 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 } ``` -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. | @@ -161,7 +169,7 @@ For OAuth authorization-code flow: // src/server/oauth.functions.ts import { createServerFn } from '@tanstack/react-start' import { redirect } from '@tanstack/react-router' -import { setCookie } from '@tanstack/react-start/server' +import { setResponseHeader } from '@tanstack/react-start/server' import crypto from 'node:crypto' const OAUTH_STATE_COOKIE = '__Host-oauth' @@ -182,13 +190,10 @@ export const startOAuth = createServerFn({ method: 'GET' }).handler( crypto.createHash('sha256').update(verifier).digest(), ) - setCookie(OAUTH_STATE_COOKIE, signed({ state, verifier }), { - httpOnly: true, - secure: true, - sameSite: 'lax', - path: '/', - maxAge: 600, - }) + setResponseHeader( + 'Set-Cookie', + `${OAUTH_STATE_COOKIE}=${signed({ state, verifier })}; HttpOnly; Secure; SameSite=Lax; Path=/; Max-Age=600`, + ) throw redirect({ href: @@ -344,7 +349,7 @@ See [Execution Model: Module-Level `process.env` Reads](./execution-model.md#mod ## See Also - [Authentication Overview](./authentication-overview.md) — choosing between partner solutions, OSS libraries, and DIY. -- [Authenticated Routes (Router)](/router/latest/docs/framework/react/guide/authenticated-routes) — the routing-side guide. +- [Authenticated Routes (Router)](../../../../router/guide/authenticated-routes.md) — the routing-side guide. - [Server Functions](./server-functions.md) — the RPC primitive that auth lives inside. - [Middleware](./middleware.md) — composing `authMiddleware`. - [OWASP Cheat Sheets — Authentication](https://cheatsheetseries.owasp.org/cheatsheets/Authentication_Cheat_Sheet.html), [Session Management](https://cheatsheetseries.owasp.org/cheatsheets/Session_Management_Cheat_Sheet.html), [CSRF](https://cheatsheetseries.owasp.org/cheatsheets/Cross-Site_Request_Forgery_Prevention_Cheat_Sheet.html). diff --git a/docs/start/framework/react/guide/authentication.md b/docs/start/framework/react/guide/authentication.md index c77c681ee0..da839e1fbe 100644 --- a/docs/start/framework/react/guide/authentication.md +++ b/docs/start/framework/react/guide/authentication.md @@ -1,12 +1,11 @@ --- id: authentication -title: Implement Authentication in React -description: Implement sessions, sign-in, sign-out, protected routes, and server-side authorization in a TanStack Start React app. +title: Authentication --- -Implement the authentication workflow in your React app, from sessions and sign-in to protected routes and authorization. +This guide covers authentication patterns and shows how to implement your own authentication system with TanStack Start. -To compare libraries and hosted services, read [Choose Authentication for React Apps](./authentication-overview.md). +> **📋 Before You Start:** Check our [Authentication Overview](./authentication-overview.md) for all available options including partner solutions and hosted services. ## Authentication Approaches @@ -35,7 +34,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 server functions, request and cookie utilities, and route protection. Session storage and authentication come from your application or a library you choose. +TanStack Start provides the tools for both through server functions, sessions, and route protection. > 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,7 +47,6 @@ 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' }) @@ -62,9 +60,11 @@ export const loginFn = createServerFn({ method: 'POST' }) } // Create session - const session = await getAppSession() - session.userId = user.id - await session.save() + const session = await useAppSession() + await session.update({ + userId: user.id, + email: user.email, + }) // Redirect to protected area throw redirect({ to: '/dashboard' }) @@ -72,131 +72,98 @@ export const loginFn = createServerFn({ method: 'POST' }) // Logout server function export const logoutFn = createServerFn({ method: 'POST' }).handler(async () => { - const session = await getAppSession() - session.destroy() + const session = await useAppSession() + await session.clear() throw redirect({ to: '/' }) }) // Get current user export const getCurrentUserFn = createServerFn({ method: 'GET' }).handler( async () => { - const session = await getAppSession() - const userId = session.userId + const session = await useAppSession() + const userId = session.data.userId if (!userId) { return null } - const user = await getUserById(userId) - return user ? { id: user.id, email: user.email, role: user.role } : null + return await getUserById(userId) }, ) ``` ### 2. Session Management -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. +TanStack Start provides secure HTTP-only cookie sessions: ```tsx -// utils/session.ts — import only from server code -import { getIronSession } from 'iron-session' -import { getCookie, setCookie } from '@tanstack/react-start/server' +// utils/session.ts +import { useSession } from '@tanstack/react-start/server' type SessionData = { - userId: string - oauthState: string + userId?: string + email?: string + role?: string } -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: '/', - }, +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, }, - ) + }) } ``` -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`. - -Merge this pattern into your existing root route, keeping its metadata and document shell: +Share authentication state across your application: ```tsx -// routes/__root.tsx -import { - createRootRoute, - HeadContent, - Outlet, - Scripts, -} from '@tanstack/react-router' -import type { ReactNode } from 'react' +// contexts/auth.tsx +import { createContext, useContext, ReactNode } from 'react' +import { useServerFn } from '@tanstack/react-start' import { getCurrentUserFn } from '../server/auth' -export const Route = createRootRoute({ - headers: () => ({ 'Cache-Control': 'private, no-store' }), - beforeLoad: async () => ({ user: await getCurrentUserFn() }), - component: Outlet, - shellComponent: RootDocument, -}) +type User = { + id: string + email: string + role: string +} + +type AuthContextType = { + user: User | null + isLoading: boolean + refetch: () => void +} + +const AuthContext = createContext(undefined) + +export function AuthProvider({ children }: { children: ReactNode }) { + const { data: user, isLoading, refetch } = useServerFn(getCurrentUserFn) -function RootDocument({ children }: { children: ReactNode }) { return ( - - - - - - {children} - - - + + {children} + ) } -``` -The root includes session-specific data, so its responses use `Cache-Control: private, no-store`. Keep that policy on child routes that render this data, and do not override it with public caching at your CDN. - -Read that state from a descendant component: - -```tsx -// components/AuthStatus.tsx -import { Route } from '../routes/__root' - -export function AuthStatus() { - const { user } = Route.useRouteContext() - return {user ? user.email : 'Signed out'} +export function useAuth() { + const context = useContext(AuthContext) + if (!context) { + throw new Error('useAuth must be used within AuthProvider') + } + return context } ``` -After login or logout changes the session, call `await router.invalidate()` to reload the current user and rerun route guards. Keep private-data authorization in the server function itself, even when a route already checks the user. - ### 4. Route Protection Protect routes using `beforeLoad`: @@ -273,9 +240,8 @@ export const registerFn = createServerFn({ method: 'POST' }) }) // Create session - const session = await getAppSession() - session.userId = user.id - await session.save() + const session = await useAppSession() + await session.update({ userId: user.id }) return { success: true, user: { id: user.id, email: user.email } } }) @@ -343,9 +309,8 @@ export const initiateOAuthFn = createServerFn({ method: 'POST' }) const state = generateRandomState() // Store state in session for CSRF protection - const session = await getAppSession() - session.oauthState = state - await session.save() + const session = await useAppSession() + await session.update({ oauthState: state }) // Generate OAuth URL const authUrl = generateOAuthUrl(provider, state) @@ -408,9 +373,21 @@ const hashedPassword = await bcrypt.hash(password, saltRounds) ### 2. Session Security -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. +```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 + }, + }) +} +``` ### 3. Rate Limiting @@ -512,69 +489,28 @@ describe('Authentication Flow', () => { ### Loading States -Call the function returned by `useServerFn` with `{ data }`. Track pending state in the component, handle invalid credentials, and refresh route context after a successful login. This form uses the `loginFn` from the server-functions example above. It requires JavaScript, so the fields stay disabled until hydration; `method="post"` also prevents credentials appearing in a native GET submission. - ```tsx -// components/LoginForm.tsx -import { useState } from 'react' -import type { FormEvent } from 'react' -import { useHydrated, useRouter } from '@tanstack/react-router' -import { useServerFn } from '@tanstack/react-start' -import { loginFn } from '../server/auth' - -export function LoginForm() { - const hydrated = useHydrated() +function LoginForm() { const [isLoading, setIsLoading] = useState(false) - const [error, setError] = useState('') - const login = useServerFn(loginFn) - const router = useRouter() - - const handleSubmit = async (event: FormEvent) => { - event.preventDefault() - const formData = new FormData(event.currentTarget) - const email = formData.get('email') - const password = formData.get('password') - if (typeof email !== 'string' || typeof password !== 'string') { - return - } + const loginMutation = useServerFn(loginFn) + const handleSubmit = async (data: LoginData) => { setIsLoading(true) - setError('') try { - const result = await login({ data: { email, password } }) - if (result?.error) { - setError(result.error) - return - } - await router.invalidate() - } catch { - setError('Login failed. Please try again.') + await loginMutation.mutate(data) + } catch (error) { + // Handle error } finally { setIsLoading(false) } } return ( - -
- - - -
-

{error}

+ + {/* Form fields */} + ) } @@ -589,14 +525,16 @@ 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 ttl = data.rememberMe ? 30 * 24 * 60 * 60 : 8 * 60 * 60 - const session = await getAppSession(ttl) - session.userId = user.id - await session.save() + 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 + }, + ) return { success: true } }) @@ -624,6 +562,7 @@ 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/cdn-asset-urls.md b/docs/start/framework/react/guide/cdn-asset-urls.md index ac5f3e7b57..28c9c8c030 100644 --- a/docs/start/framework/react/guide/cdn-asset-urls.md +++ b/docs/start/framework/react/guide/cdn-asset-urls.md @@ -3,6 +3,8 @@ id: cdn-asset-urls title: CDN Asset URLs --- +# CDN Asset URLs + > **Experimental:** `transformAssets` is experimental and subject to change. Use this guide when you need TanStack Start to rewrite manifest-managed asset URLs at runtime. The most common use case is serving JavaScript and CSS from a CDN whose origin is known only when the server starts, or varies per request. diff --git a/docs/start/framework/react/guide/client-entry-point.md b/docs/start/framework/react/guide/client-entry-point.md index 3d81a13ac2..02d0ecd426 100644 --- a/docs/start/framework/react/guide/client-entry-point.md +++ b/docs/start/framework/react/guide/client-entry-point.md @@ -3,6 +3,8 @@ id: client-entry-point title: Client Entry Point --- +# Client Entry Point + > [!NOTE] > The client entry point is **optional** out of the box. If not provided, TanStack Start will automatically handle the client entry point for you using the below as a default. diff --git a/docs/start/framework/react/guide/databases.md b/docs/start/framework/react/guide/databases.md index 774a9df61b..cbafa13f51 100644 --- a/docs/start/framework/react/guide/databases.md +++ b/docs/start/framework/react/guide/databases.md @@ -1,7 +1,6 @@ --- id: databases title: Databases -description: Connect a database to TanStack Start through server functions and server routes, and compare supported database providers. --- Databases are at the core of any dynamic application, providing the necessary infrastructure to store, retrieve, and manage data. TanStack Start makes it easy to integrate with a variety of databases, offering a flexible approach to managing your application's data layer. diff --git a/docs/start/framework/react/guide/deferred-hydration.md b/docs/start/framework/react/guide/deferred-hydration.md index ba07d65b24..1dc4760fa7 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 { noop, useQueryClient } from '@tanstack/react-query' +import { useQueryClient } from '@tanstack/react-query' import { Hydrate } from '@tanstack/react-start' import { visible } from '@tanstack/react-start/hydration' @@ -255,10 +255,8 @@ function DeferredReviews() { { - await Promise.all([ - preload(), - queryClient.query(reviewsQueryOptions).catch(noop), - ]) + await preload() + await queryClient.prefetchQuery(reviewsQueryOptions) }} > diff --git a/docs/start/framework/react/guide/early-hints.md b/docs/start/framework/react/guide/early-hints.md index 2341215022..da633a84d7 100644 --- a/docs/start/framework/react/guide/early-hints.md +++ b/docs/start/framework/react/guide/early-hints.md @@ -3,6 +3,8 @@ id: early-hints title: Early Hints --- +# Early Hints + > **Experimental:** Early Hints are experimental and subject to change. HTTP `103 Early Hints` lets your server tell the browser about important resources before the final HTML response is ready. TanStack Start can collect route assets and route `head().links`, then call your server entry so your runtime can send `103` responses. @@ -164,7 +166,6 @@ 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 94fbb52501..f472a3a26a 100644 --- a/docs/start/framework/react/guide/environment-functions.md +++ b/docs/start/framework/react/guide/environment-functions.md @@ -121,37 +121,3 @@ 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 2d02f881b3..aa1806c6bf 100644 --- a/docs/start/framework/react/guide/hosting.md +++ b/docs/start/framework/react/guide/hosting.md @@ -1,7 +1,6 @@ --- id: hosting title: Hosting -description: Deploy TanStack Start with Vite or Rsbuild using hosting guides for Cloudflare, Netlify, Railway, Vercel, Node.js, and other runtimes. --- Hosting is the process of deploying your application to the internet so that users can access it. This is a critical part of any web development project, ensuring your application is available to the world. TanStack Start supports Vite and Rsbuild, giving you flexible build outputs for different hosting providers and runtimes. @@ -116,32 +115,6 @@ 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_ @@ -501,7 +474,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, this should be `./.output`) + - **Output directory:** `./dist` (if you're using Nitro v2 or v3, 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 451d405f81..8bf47c729a 100644 --- a/docs/start/framework/react/guide/import-protection.md +++ b/docs/start/framework/react/guide/import-protection.md @@ -3,6 +3,8 @@ 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/isr.md b/docs/start/framework/react/guide/isr.md index 98007d3f15..5704af1a11 100644 --- a/docs/start/framework/react/guide/isr.md +++ b/docs/start/framework/react/guide/isr.md @@ -492,5 +492,5 @@ Track key metrics: - [Static Prerendering](./static-prerendering.md) - Build-time page generation - [Hosting](./hosting.md) - CDN deployment configurations - [Server Functions](./server-functions.md) - Creating dynamic data endpoints -- [Data Loading](/router/latest/docs/guide/data-loading) - Client-side cache control +- [Data Loading](../../../../router/guide/data-loading.md) - Client-side cache control - [Middleware](./middleware.md) - Request/response customization diff --git a/docs/start/framework/react/guide/path-aliases.md b/docs/start/framework/react/guide/path-aliases.md index bd75dc01ed..ff9735df83 100644 --- a/docs/start/framework/react/guide/path-aliases.md +++ b/docs/start/framework/react/guide/path-aliases.md @@ -26,7 +26,9 @@ After updating your `tsconfig.json` file, configure your build tool so it resolv # Vite -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: +## 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: ```ts // vite.config.ts @@ -40,6 +42,31 @@ 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/production-checklist.md b/docs/start/framework/react/guide/production-checklist.md deleted file mode 100644 index b46cd70f2e..0000000000 --- a/docs/start/framework/react/guide/production-checklist.md +++ /dev/null @@ -1,42 +0,0 @@ ---- -id: production-checklist -title: Production Checklist -description: Check a TanStack Start production build for secret exposure, authorization, cache isolation, HTTP status codes, SEO, assets, logging, and deployment failures. ---- - -Run these checks against the production build and again through your public hostname. A passing development server does not verify your deployment adapter, runtime environment, or CDN. - -## Secrets and server boundaries - -- [ ] **Check required environment variables at runtime.** Start the production server with the same variable names and runtime bindings as your host. Missing configuration should fail clearly before it serves dependent requests. Look for undefined credentials, connections to a development database, or values that only existed during the build. See [Environment Variables](./environment-variables). -- [ ] **Keep secrets out of browser output.** Build with a harmless, unique test secret and search the emitted client files, source maps you publish, and response bodies for that value. Do not use a real secret for this check. A match means a value crossed the server boundary, even if its variable name lacks `VITE_`. Check server-function return values as well as imports. See [Environment Variables](./environment-variables#security-best-practices) and [Import Protection](./import-protection). - -## Authorization and mutations - -- [ ] **Test endpoints directly.** Record a private read and write, then repeat them while signed out and as a different account. Both must reject unauthorized access without changing data. A redirect in `beforeLoad` does not protect a separately callable endpoint. See [Authentication Server Primitives](./authentication-server-primitives#protect-data-first). -- [ ] **Exercise session expiry and sign-out.** Reload a private page, expire its session, sign out, and revisit it. Confirm the cookie's HTTPS flags and that old account data disappears from browser caches. Look for sessions that survive beyond your intended policy or another account's data appearing after switching accounts. See [Session Cookies](./authentication-server-primitives#session-cookies). -- [ ] **Reject invalid and cross-site writes.** Send malformed input and browser-like requests from an untrusted origin to each mutation entry point, including ordinary server-route forms. Use an authenticated test session for protected writes so an authentication failure cannot be mistaken for CSRF protection. Verify validation and your intended CSRF policy before any write occurs. Also test rapid or repeated submissions. A disabled button helps the interface, but the endpoint still needs its own checks. See [Authentication Server Primitives](./authentication-server-primitives) and [Server Functions](./server-functions). - -## Cache isolation and rendering - -- [ ] **Request the same private URL as two accounts concurrently.** Inspect each HTML response and any serialized loader or query data. Each response must contain only its own account's values. Repeat through the CDN and after a browser account switch. Shared personalized HTML or process-wide user caches are failures. See [Middleware](./middleware) and [Authentication Server Primitives](./authentication-server-primitives). -- [ ] **Check final cache headers and update behavior.** Use `Cache-Control: no-store` for personalized responses unless you have an explicit identity-partitioned cache key and lifecycle that prevents reuse across accounts. `private` alone does not prevent a browser cache from retaining one account's response after sign-out. For public cached content, perform a write and confirm it becomes visible within the freshness policy you chose. Inspect the final headers from your host, not just the values assigned in route code. Query invalidation, Router invalidation, and CDN invalidation affect different caches. See [Server Routes](./server-routes) and [Static Prerendering](./static-prerendering). -- [ ] **Compare a direct visit with client navigation.** Test initial HTML, hydration, back/forward navigation, and a reload for a parameterized route and a route with search values. Missing content, mismatched metadata, hydration warnings, or repeated immediate reads need investigation. See [Hydration Errors](./hydration-errors) and [Routing](./routing). - -## HTTP responses and search visibility - -- [ ] **Probe success, missing, redirect, and error responses.** A real missing public resource should return HTTP 404, a moved URL should use its intended redirect, and a failed request should not masquerade as a successful page. Check status codes before following redirects. Test a controlled failure in staging and confirm the error interface offers recovery without leaking sensitive details. See [Server Routes](./server-routes), [Error Boundaries](./error-boundaries), and [Router Not Found Errors](/router/latest/docs/guide/not-found-errors). -- [ ] **Inspect public HTML before JavaScript runs.** Verify useful content, a specific title and description, the public canonical URL, and relevant social metadata. Repeat after client navigation. Look for preview hostnames in canonicals, duplicate titles, or metadata that depends on a browser effect. See [SEO](./seo). -- [ ] **Check indexing rules and discovery files.** Fetch `robots.txt` and the sitemap from the deployed hostname. Sitemap URLs should resolve to intended public canonical pages. Remove accidental production `noindex` rules, but keep private and preview content out of search. Robots rules are not access control. See [SEO](./seo#sitemaps). - -## Assets, logging, and deployment - -- [ ] **Inspect the production network waterfall.** Test a representative page on a narrow viewport with slower network and CPU settings. Check large images, missing dimensions, font loading, third-party scripts, and failed asset requests. Record a baseline so later releases have something to compare against. Local lab results do not establish real-user performance. See [SEO performance guidance](./seo#performance-matters), [CDN Asset URLs](./cdn-asset-urls), and [Observability](./observability). -- [ ] **Trigger and find a controlled error.** Confirm your chosen logs or error service receive it with enough route and release context to investigate. Check that credentials, cookies, and sensitive payloads are absent. An error boundary that only changes the screen is not evidence of a working alert. See [Observability](./observability). -- [ ] **Run the deployed entry point and rehearse rollback.** Use your adapter's production output and start command, then test a direct deep link, a static asset, a server function, and a server route. Check that requests still work after a restart. Rehearse restoring a previous release and account for any database migration separately. Local success cannot prove host bindings, asset retention, or database rollback safety. See [Hosting](./hosting). - -## Keep a release record - -Record the tested commit, runtime, hostname, commands, and results. Turn repeatable HTTP and browser checks into CI tests; repeat host-specific checks after deployment changes. - -The [Next.js migration reference](../examples/start-next-migration) provides production browser checks for public HTML and metadata, search, redirects, missing pages, session reloads, and protected mutations. Its demo credentials and cookie session are for local comparison, not a production authentication system. Use its tests as a starting point, then add your own authorization rules, external services, CDN behavior, and operational checks. diff --git a/docs/start/framework/react/guide/rendering-markdown.md b/docs/start/framework/react/guide/rendering-markdown.md index bf644124d9..4258d6f4f1 100644 --- a/docs/start/framework/react/guide/rendering-markdown.md +++ b/docs/start/framework/react/guide/rendering-markdown.md @@ -3,85 +3,191 @@ id: rendering-markdown title: Rendering Markdown --- -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. +This guide covers two methods for importing and rendering markdown content in your TanStack Start application: -This guide covers static posts loaded with Content Collections and remote content fetched through a server function. Both use the same Markdown component. +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 -## Rendering Markdown +Both methods share a common rendering pipeline using the `unified` ecosystem. -Install TanStack Markdown: +## Setting Up the Markdown Processor + +Both approaches use the same markdown-to-HTML processing pipeline. First, install the required dependencies: ```bash -npm install @tanstack/markdown +npm install unified remark-parse remark-gfm remark-rehype rehype-raw rehype-slug rehype-autolink-headings rehype-stringify shiki html-react-parser gray-matter ``` -Create a shared component that accepts either Markdown source or a parsed document: +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: ```tsx // src/components/Markdown.tsx -import { Markdown as ReactMarkdown } from '@tanstack/markdown/react' -import type { MarkdownDocument } from '@tanstack/markdown' +import parse, { type HTMLReactParserOptions, Element } from 'html-react-parser' +import { renderMarkdown, type MarkdownResult } from '~/utils/markdown' type MarkdownProps = { - content: string | MarkdownDocument + content: string className?: string } export function Markdown({ content, className }: MarkdownProps) { - return ( -
- {content} -
- ) + 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)}
} ``` -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. +## Method 1: Static Markdown with content-collections -Use the `components` prop to customize elements, for example to lazy-load images: +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. -```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 +### Installation ```bash -npm install -D @content-collections/core @content-collections/vite zod +npm install @content-collections/core @content-collections/vite ``` -```ts +### Configuration + +Create a `content-collections.ts` file in your project root: + +```tsx // content-collections.ts import { defineCollection, defineConfig } from '@content-collections/core' -import { z } from 'zod' +import matter from 'gray-matter' + +function extractFrontMatter(content: string) { + const { data, content: body, excerpt } = matter(content, { excerpt: true }) + return { data, body, excerpt: excerpt || '' } +} const posts = defineCollection({ name: 'posts', - directory: './src/blog', + directory: './src/blog', // Directory containing your .md files include: '*.md', - schema: z.object({ + schema: (z) => ({ title: z.string(), - 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, + published: z.string().date(), + description: z.string().optional(), + authors: z.string().array(), }), + 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({ @@ -89,56 +195,40 @@ export default defineConfig({ }) ``` -Content Collections already separates frontmatter from `content`, so this transform does not need a second frontmatter parser. +### Vite Integration -Add the plugin to your existing Vite configuration, keeping any deployment plugins your app needs: +Add the content-collections plugin to your Vite config: -```ts -// vite.config.ts +```tsx +// app.config.ts +import { defineConfig } from '@tanstack/react-start/config' 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({ - plugins: [ - contentCollections(), - tsConfigPaths({ projects: ['./tsconfig.json'] }), - tanstackStart(), - viteReact(), - ], + vite: { + plugins: [contentCollections()], + }, }) ``` -Add the generated collection alias to your existing `tsconfig.json`: +### Creating Blog Posts -```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`: +Create markdown files in your designated directory: ````markdown ---- +## + title: Hello World -published: '2026-01-15' -description: My first blog post +published: 2024-01-15 authors: - - Jane Doe + +- Jane Doe + description: My first blog post + --- +![Hero Image](/images/hero.jpg) + Welcome to my blog! This is my first post. ## Getting Started @@ -150,11 +240,13 @@ console.log('Hello, world!') ``` ```` -### Listing Posts +### Using the Collection + +Access your posts through the generated collection: ```tsx // src/routes/blog.index.tsx -import { createFileRoute, Link } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' import { allPosts } from 'content-collections' export const Route = createFileRoute('/blog/')({ @@ -162,30 +254,31 @@ export const Route = createFileRoute('/blog/')({ }) function BlogIndex() { - const sortedPosts = [...allPosts].sort((a, b) => - b.published.localeCompare(a.published), + // Posts are sorted by published date + const sortedPosts = allPosts.sort( + (a, b) => new Date(b.published).getTime() - new Date(a.published).getTime(), ) return ( -
+

Blog

    {sortedPosts.map((post) => (
  • - {post.title} +

    {post.title}

    +

    {post.excerpt}

    + {post.published} -

    {post.description}

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

{post.title}

-

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

+
+

{post.title}

+

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

+
) } ``` -The renderer parses the Markdown synchronously and renders React elements on both the server and client. +## Method 2: Dynamic Markdown from Remote Sources -## Remote Markdown with a Server Function +For content stored externally (like GitHub repositories), you can fetch and render markdown dynamically using server functions. -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: - -```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' - -export const fetchDocs = createServerFn({ method: 'GET' }) - .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 document: ${response.status}`) - } - - const { data, content } = matter(await response.text()) - - return { - title: typeof data.title === 'string' ? data.title : slug, - document: parseMarkdown(content), - } - }) -``` +### Creating a Fetch Utility ```tsx -// src/routes/docs.$slug.tsx -import { createFileRoute } from '@tanstack/react-router' -import { Markdown } from '~/components/Markdown' -import { fetchDocs } from '~/utils/docs' +// src/utils/docs.server.ts +import { createServerFn } from '@tanstack/react-start' +import matter from 'gray-matter' -export const Route = createFileRoute('/docs/$slug')({ - loader: ({ params }) => fetchDocs({ data: params.slug }), +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}`, + }, + }) + + if (!response.ok) { + throw new Error(`Failed to fetch: ${response.status}`) + } + + const rawContent = await response.text() + const { data: frontmatter, content } = matter(rawContent) + + return { + frontmatter, + content, + filePath, + } + }) +``` + +### 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 +import { createFileRoute } from '@tanstack/react-router' +import { fetchDocs } from '~/utils/docs.server' +import { Markdown } from '~/components/Markdown' + +export const Route = createFileRoute('/docs/$path')({ + loader: async ({ params }) => { + return fetchDocs({ + data: { + repo: 'your-org/your-repo', + branch: 'main', + filePath: `docs/${params.path}.md`, + }, + }) + }, component: DocsPage, }) function DocsPage() { - const { title, document } = Route.useLoaderData() + const { frontmatter, content } = Route.useLoaderData() return (
-

{title}

- +

{frontmatter.title}

+
) } ``` -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. +### Fetching Directory Contents -## Syntax Highlighting with TanStack Highlight - -Install [TanStack Highlight](https://tanstack.com/highlight/latest/docs/overview). The Markdown adapter requires version `0.0.6` or newer: - -```bash -npm install @tanstack/highlight -``` - -Register the languages your content uses and create the Markdown adapter: - -```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' - -const highlighter = createHighlighter({ - languages: [plaintext, js, ts, tsx], -}) - -export const highlightMarkdownCode = - createTanStackMarkdownHighlighter(highlighter) -``` - -Update the shared component to pass the highlighter and include its theme styles: +To build navigation from a GitHub directory: ```tsx -// 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 +// src/utils/docs.server.ts +type GitHubContent = { + name: string + path: string + type: 'file' | 'dir' } -export function Markdown({ content, className }: MarkdownProps) { - return ( -
- - - {content} - -
+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, + })) + }) +``` + +## Adding Syntax Highlighting with Shiki + +For code blocks with syntax highlighting, integrate Shiki into your markdown processor: + +```tsx +// src/utils/markdown.ts +import { codeToHtml } from 'shiki' + +// 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', + }, + }) +} +``` + +Then handle code blocks in your Markdown component: + +```tsx +// In your Markdown component's replace function +if (domNode.name === 'pre') { + const codeElement = domNode.children.find( + (child) => child instanceof Element && child.name === 'code', ) + if (codeElement) { + const className = codeElement.attribs.class || '' + const language = className.replace('language-', '') || 'text' + const code = getText(codeElement) + + return + } } ``` -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.
+## Summary
 
-## Table of Contents
+| 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 |
 
-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.
+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.
diff --git a/docs/start/framework/react/guide/seo.md b/docs/start/framework/react/guide/seo.md
index 1a202503a8..2d3e98757d 100644
--- a/docs/start/framework/react/guide/seo.md
+++ b/docs/start/framework/react/guide/seo.md
@@ -1,7 +1,6 @@
 ---
 id: seo
 title: SEO
-description: Configure SEO in TanStack Start with page metadata, canonical URLs, structured data, server rendering, sitemaps, and robots.txt.
 ---
 
 > [!NOTE]
diff --git a/docs/start/framework/react/guide/server-components.md b/docs/start/framework/react/guide/server-components.md
index 581ae145bd..6bbc716754 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 8+ or Rsbuild 2+
+**Requirements:** React 19+, Vite 7+ or Rsbuild 2+
 
 ## Quick Start
 
@@ -401,10 +401,7 @@ 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.query({
-      ...postQueryOptions(params.postId),
-      staleTime: 'static',
-    })
+    await context.queryClient.ensureQueryData(postQueryOptions(params.postId))
   },
   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 5f74eb7846..5acc8ee550 100644
--- a/docs/start/framework/react/guide/server-entry-point.md
+++ b/docs/start/framework/react/guide/server-entry-point.md
@@ -3,72 +3,38 @@ id: server-entry-point
 title: Server Entry Point
 ---
 
+# Server Entry Point
+
 > [!NOTE]
-> 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 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.
 
 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.
 
-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:
+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.
 
 ```tsx
 // src/server.ts
 import handler, { createServerEntry } from '@tanstack/react-start/server-entry'
 
 export default createServerEntry({
-  fetch(request, opts) {
-    return handler.fetch(request, opts)
+  fetch(request) {
+    return handler.fetch(request)
   },
 })
 ```
 
 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:
@@ -87,155 +53,16 @@ const customHandler = defineHandlerCallback((ctx) => {
   return defaultStreamHandler(ctx)
 })
 
-const startHandler = createStartHandler(customHandler)
+const fetch = createStartHandler(customHandler)
 
 export default createServerEntry({
-  fetch(request, opts) {
-    return startHandler(request, opts)
-  },
+  fetch,
 })
 ```
 
-## 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. 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.
+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.
 
 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:
 
@@ -256,11 +83,8 @@ declare module '@tanstack/react-router' {
 }
 
 export default createServerEntry({
-  fetch(request, opts) {
-    return handler.fetch(request, {
-      ...opts,
-      context: { hello: 'world', foo: 123 },
-    })
+  async fetch(request) {
+    return handler.fetch(request, { 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 879aa9e867..903e5d7b86 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 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.
+Return `Response` objects binary data, or custom content types.
 
 ### Progressive Enhancement
 
@@ -425,9 +425,7 @@ Customization:
 
 You can customize function ID generation for the production build by providing a `generateFunctionId` function when configuring the TanStack Start build tool plugin.
 
-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.
+Prefer deterministic inputs (filename + functionName) so IDs remain stable between builds.
 
 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
deleted file mode 100644
index dec42ca26c..0000000000
--- a/docs/start/framework/react/guide/tanstack-query.md
+++ /dev/null
@@ -1,158 +0,0 @@
----
-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.
----
-
-TanStack Start uses Router loaders to coordinate navigation. TanStack Query can own the fetched data, freshness, and mutation state. Use them together when your application needs a query cache across routes, background updates, or mutation-driven invalidation.
-
-The [React Query example](../examples/start-basic-react-query) includes a `/preferences` page that reads and updates a display name stored in a cookie. Its [tests](https://github.com/TanStack/router/blob/main/examples/react/start-basic-react-query/tests/preferences.spec.ts) check server-rendered data, isolation between requests, hydration without a duplicate read, and invalidation after a server function. The preference cookie is not an authentication mechanism.
-
-## Install and create a QueryClient per router
-
-Install `@tanstack/react-query` and `@tanstack/react-router-ssr-query`. The example uses Query 5.102 or newer, including `queryClient.query`. See the [integration reference](/router/latest/docs/integrations/query) for its options.
-
-```tsx title="src/router.tsx"
-import { QueryClient } from '@tanstack/react-query'
-import { createRouter } from '@tanstack/react-router'
-import { setupRouterSsrQueryIntegration } from '@tanstack/react-router-ssr-query'
-import { routeTree } from './routeTree.gen'
-
-export function getRouter() {
-  const queryClient = new QueryClient({
-    defaultOptions: { queries: { staleTime: 30_000 } },
-  })
-  const router = createRouter({
-    routeTree,
-    context: { queryClient },
-    defaultPreload: 'intent',
-    defaultPreloadStaleTime: 0,
-  })
-
-  setupRouterSsrQueryIntegration({ router, queryClient })
-  return router
-}
-```
-
-Create the client inside `getRouter`, not at module scope. Start creates a router for each SSR request. A process-wide QueryClient could reuse one reader's cached data in another reader's HTML. The browser then keeps the client attached to its router during navigation.
-
-Declare `queryClient: QueryClient` in the root route's `createRootRouteWithContext` type so child loaders can access it. The integration supplies the Query provider and handles SSR dehydration, hydration, and streaming. Do not add a second QueryClient or independently dehydrate the same cache. If you already own the provider wrapper, use the integration's `wrapQueryClient: false` option.
-
-`defaultPreloadStaleTime: 0` lets Query decide whether a preload needs data. The example's 30-second Query `staleTime` prevents an immediate repeat read when the browser receives fresh SSR data. Choose the freshness window for your application, rather than treating 30 seconds as a universal setting.
-
-## Share query options between the loader and component
-
-Keep a query's key and function together. Privileged reads belong in a server function, because a normal route loader can also run in the browser during navigation.
-
-```tsx title="src/utils/preferences.ts"
-import { queryOptions } from '@tanstack/react-query'
-import { createServerFn } from '@tanstack/react-start'
-import { getCookie, setResponseHeader } from '@tanstack/react-start/server'
-
-export const getReaderName = createServerFn({ method: 'GET' }).handler(() => {
-  setResponseHeader('Cache-Control', 'private, no-store')
-  return getCookie('reader-name') || 'Guest'
-})
-
-export const readerNameOptions = queryOptions({
-  queryKey: ['reader-name'],
-  queryFn: () => getReaderName(),
-})
-```
-
-The route awaits the query for content that must appear in the initial HTML:
-
-```tsx title="src/routes/preferences.tsx"
-import { useSuspenseQuery } from '@tanstack/react-query'
-import { createFileRoute } from '@tanstack/react-router'
-import { readerNameOptions } from '../utils/preferences'
-
-export const Route = createFileRoute('/preferences')({
-  loader: async ({ context }) => {
-    await context.queryClient.query(readerNameOptions)
-  },
-  headers: () => ({ 'Cache-Control': 'private, no-store' }),
-  component: Preferences,
-})
-
-function Preferences() {
-  const { data: name } = useSuspenseQuery(readerNameOptions)
-  return 

Hello, {name}

-} -``` - -Both calls use the same query key and options. The loader populates the request's cache; the component reads it; the integration transfers it to the browser. The component does not need to call the server function again in an effect. - -For a parameterized resource, include its identity in the key, such as `['post', postId]`. If search values affect the result, validate them and include them in both `loaderDeps` and the query key. Keep secrets out of keys and serialized query data. - -## Await critical data and stream secondary data - -Await queries that determine the page's main content, title, authorization, redirects, or whether it exists. Return title and description data from the loader when a route's `head` needs them, as the example's post route does. - -Secondary content can begin loading without blocking the loader, then render inside a Suspense boundary. Keep that query under the SSR integration so its result can stream to the browser. Handle the imperative query promise's rejection as well as the component's error boundary; a fire-and-forget promise should not become an unhandled server rejection. - -The example's existing `/deferred` route shows a separate Suspense boundary. See [streaming and prefetching](/router/latest/docs/integrations/query#prefetching-and-streaming) for the integration's behavior. A plain `useQuery` that has no loader prefetch is not a guarantee that its data will be in the server-rendered HTML. - -## Invalidate Query after a server mutation - -The preference example validates the display name and writes its cookie inside a POST server function. Its `src/start.ts` enables Start's CSRF middleware for server-function requests. The component calls that function through `useServerFn`, then invalidates the query that reads the cookie: - -```tsx -const queryClient = useQueryClient() -const save = useServerFn(saveReaderName) -const mutation = useMutation({ - mutationFn: (name: string) => save({ data: name }), - onSuccess: () => - queryClient.invalidateQueries({ queryKey: readerNameOptions.queryKey }), -}) -``` - -Returning the invalidation promise keeps the mutation pending until its active query's refetch finishes. The form can use `mutation.isPending` and `mutation.isError` for feedback. The example also disables its JavaScript-dependent form until hydration and uses a POST method so a native submission cannot put form values in the URL. - -Invalidate the data's actual owner. `queryClient.invalidateQueries` refreshes Query data; `router.invalidate()` reloads Router-owned loader data and route context. Use both only when the mutation changes both, such as a login that changes root authentication context and private queries. Neither call purges your CDN or invalidates a database cache. - -If a mutation returns the complete updated resource, `setQueryData` can update that cache entry directly instead. Optimistic updates need cancellation, rollback on failure, and reconciliation with the server result. This example uses a confirmed write followed by invalidation, not an optimistic update. - -## Keep account data isolated beyond SSR - -Request-scoped QueryClients prevent cross-request cache sharing on the server. They do not authorize reads or automatically clear a browser cache when its account changes. - -For authenticated applications, authorize every private read and mutation on the server, including resource-level permissions. On sign-out or account switching, cancel and remove the previous account's private queries, then reload the relevant route context. Include account or tenant identity in keys when that is part of the resource's identity, but do not treat a key as an access-control check. - -The `/preferences` route and its server functions return `Cache-Control: private, no-store` because their output varies by cookie. Verify the final response through your hosting provider and CDN. Do not publicly cache personalized HTML merely because the QueryClient itself is isolated. - -## Diagnose extra requests - -Check when and where each request occurs. A background refresh after the freshness window, a reconnect, or a deliberate invalidation can be expected. - -| Symptom | Check | -| --------------------------------------------------- | --------------------------------------------------------------------------------------------- | -| A read repeats immediately after hydration | Query `staleTime`, hydration configuration, matching keys, and accidental extra QueryClients | -| Navigation loads different data than a direct visit | Search validation, `loaderDeps`, query keys, and server-only boundaries | -| A mutation succeeds but old data stays visible | Which cache owns the displayed value and which keys were invalidated | -| A second account sees the first account's data | Module-scoped server clients, browser cache cleanup, account keys, and shared HTTP caches | -| SSR contains only a loading state | Whether the loader awaited critical data and whether the component reads the prefetched query | - -Start with the same options object in the loader and component. Avoid adding manual hydration code or disabling all refetching to hide a duplicate request. - -## Run the example's checks - -From the repository root, install dependencies and build the framework packages as described in [Contributing](https://github.com/TanStack/router/blob/main/CONTRIBUTING.md). Then: - -```sh -cd examples/react/start-basic-react-query -pnpm exec playwright install chromium -pnpm test:e2e -pnpm build -QUERY_EXAMPLE_PRODUCTION=1 pnpm test:e2e -``` - -The tests send concurrent SSR requests with different preference cookies while using the same query key. Each HTML response must contain only its own reader's value. The browser test then requires zero additional reads during hydration, exactly one read after mutation invalidation, and no extra read after a reload hydrates fresh data. - -The post and user demos use JSONPlaceholder. The preference tests run without that external API. diff --git a/docs/start/framework/react/migrate-from-next-js.md b/docs/start/framework/react/migrate-from-next-js.md index dc5377df08..2f4d988449 100644 --- a/docs/start/framework/react/migrate-from-next-js.md +++ b/docs/start/framework/react/migrate-from-next-js.md @@ -1,187 +1,510 @@ --- id: migrate-from-next-js title: Migrate from Next.js -description: Move a Next.js App Router application to TanStack Start while preserving routes, metadata, authentication, mutations, and deployment behavior. --- -This guide migrates a Next.js App Router application to TanStack Start. The [runnable before-and-after example](https://github.com/TanStack/router/tree/main/examples/react/start-next-migration) implements the same article site in both frameworks, including public articles, URL search, sign-in, a private saved-article page, and a mutation. +This guide provides a step-by-step process to migrate a project from the Next.js App Router to **TanStack Start**. We respect the powerful features of Next.js and aim to make this transition as smooth as possible. -Start does not interpret Next.js route conventions or configuration. Keep your application behavior, then translate each framework boundary. If your application relies heavily on React Server Components, read the [comparison](./start-vs-nextjs) and [RSC guide](./guide/server-components) first. Start's RSC support is experimental and opt-in; the example uses ordinary route components and server functions. +## Step-by-Step (Basics) -## Run the reference application +This step-by-step guide provides an overview of how to migrate your Next.js App Router project to TanStack Start. The goal is to help you understand the basic steps involved in the migration process so you can adapt them to your specific project needs. -Use Node 24 or newer and pnpm 12: +### Prerequisites + +Before we begin, this guide assumes your project structure looks like this: + +```txt +├── next.config.ts +├── package.json +├── postcss.config.mjs +├── public +│ ├── file.svg +│ ├── globe.svg +│ ├── next.svg +│ ├── vercel.svg +│ └── window.svg +├── README.md +├── src +│ └── app +│ ├── favicon.ico +│ ├── globals.css +│ ├── layout.tsx +│ └── page.tsx +└── tsconfig.json +``` + +Alternatively, you can follow along by cloning the following [starter template](https://github.com/nrjdalal/awesome-templates/tree/main/next.js-apps/next.js-start): ```sh -git clone --depth 1 https://github.com/TanStack/router.git -cd router -pnpm install -pnpm nx run @tanstack/react-start:build -cd examples/react/start-next-migration +npx gitpick nrjdalal/awesome-templates/tree/main/next.js-apps/next.js-start next.js-start-er ``` -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`. +This structure is a basic Next.js application using the App Router, which we will migrate to TanStack Start. -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. +### 1. Remove Next.js -With those ports free, run: +First, uninstall Next.js and remove related configuration files: ```sh -pnpm exec playwright install chromium -pnpm test:e2e -pnpm build:next -pnpm build -MIGRATION_PRODUCTION=1 pnpm test:e2e +npm uninstall @tailwindcss/postcss next +rm postcss.config.* next.config.* ``` -The same browser tests run against both apps. They check public URLs, server-rendered metadata, query filtering, redirects, missing pages, sitemap entries, sign-in errors, session persistence, private response caching, mutations, and server rejection after sign-out. +### 2. Install Required Dependencies -## Inventory the application before changing it +TanStack Start leverages TanStack Router and supports [Vite](https://vite.dev) or [Rsbuild](https://rsbuild.dev/) as the build tool. The Vite setup below includes [Nitro](https://nitro.build/) as a deployment plugin. -Record your current paths and observable behavior. Include dynamic paths, query parameters, redirects, trailing slashes, locale prefixes, response status, title, description, canonical, robots directives, and sitemap membership. Keep representative HTML responses and run your existing application tests against the replacement. + -Inventory Next.js-specific code separately: `next/*` imports, `'use server'`, server-only modules, metadata exports, `generateStaticParams`, `revalidatePath`, `revalidateTag`, cache directives, route configuration, Proxy or middleware, and image/font configuration. A route that renders successfully can still have lost authentication, cache invalidation, or an important search URL. +# Vite -| Request | Required behavior | -| -------------------------- | -------------------------------------------------------------------- | -| `/` | Article list, title, description, self-referencing canonical | -| `/?q=metadata` | Filtered article list; canonical remains `/` | -| `/posts/keeping-your-urls` | Same article, title, description, canonical, and Open Graph title | -| `/posts/missing` | HTTP 404 | -| `/old-notes` | HTTP 308 to `/posts/keeping-your-urls` | -| `/saved` | Signed-out users reach sign-in; private HTML is not shared-cacheable | -| `/sitemap.xml` | Public pages only | - -For your application, decide which query variants deserve indexing. Do not copy the example's canonical policy onto meaningful product filters or paginated results without checking their content. - -## Set up Start alongside the existing app - -Create a Start application using [Getting Started](./getting-started) and [Build from Scratch](./build-from-scratch). Keep the Next.js app runnable until the migrated routes pass their checks. You do not need to remove Next.js, its configuration, or its CSS tooling before you can test Start. - -```text -next-app/ # Before: Next.js App Router - app/ - layout.tsx - page.tsx - posts/[slug]/page.tsx - actions.ts -src/ # After: TanStack Start - router.tsx - routes/ - __root.tsx - index.tsx - posts.$slug.tsx - server/account.ts -vite.config.ts +```sh +npm i @tanstack/react-router @tanstack/react-start nitro vite @vitejs/plugin-react ``` -The Start Vite plugin generates `src/routeTree.gen.ts`. `src/router.tsx` returns a new router using that tree. The root route renders `HeadContent` in the document head and `Scripts` in the body. Merge your existing CSS, document attributes, and providers into that root. +# Rsbuild -The reference uses Vite and Nitro's Node output. If you use another host or build tool, follow its [hosting instructions](./guide/hosting) and test its actual build output. A Next.js deployment adapter does not become a Start adapter by changing dependencies. - -## Preserve paths while changing route files - -| Next.js App Router | Default Start route directory | -| ------------------------------ | ---------------------------------------------- | -| `app/layout.tsx` | `src/routes/__root.tsx` | -| `app/page.tsx` | `src/routes/index.tsx` | -| `app/posts/page.tsx` | `src/routes/posts.index.tsx` | -| `app/posts/[slug]/page.tsx` | `src/routes/posts.$slug.tsx` | -| `app/docs/[...parts]/page.tsx` | `src/routes/docs.$.tsx` | -| `app/api/hello/route.ts` | `src/routes/api.hello.ts` with server handlers | - -`src/routes` is a source directory, not a URL prefix. A route for `/posts/example` uses `createFileRoute('/posts/$slug')`, not `/app/posts/$slug`. - -Nested layouts, pathless layouts, route groups, optional parameters, catch-alls, parallel routes, and intercepting routes need individual mapping. Read [routing concepts](/router/latest/docs/routing/routing-concepts) instead of mechanically renaming every file. The reference does not reproduce Next.js parallel or intercepting route behavior. - -Replace `next/link` with Router's `Link`. Dynamic paths use typed `params`: - -```tsx - - {article.title} - +```sh +npm i @tanstack/react-router @tanstack/react-start @rsbuild/core @rsbuild/plugin-react ``` -Check direct requests, client navigation, back/forward, and reload for each representative path. Update your redirects and sitemap from the same route inventory. + -## Validate URL search state +For Tailwind CSS, install the build tool integration you want to use: -Next.js passes `searchParams` to an App Router page. Start validates URL state in the route: + -```tsx -export const Route = createFileRoute('/')({ - validateSearch: (search) => ({ - q: typeof search.q === 'string' ? search.q : '', - }), - component: Articles, -}) +# Vite -function Articles() { - const { q } = Route.useSearch() - return

Searching for: {q}

+```sh +npm i -D @tailwindcss/vite tailwindcss +``` + +# Rsbuild + +```sh +npm i -D @tailwindcss/postcss tailwindcss +``` + + + +### 3. Update Project Configuration + +Now that you've installed the necessary dependencies, update your project configuration files to work with TanStack Start. + + + +# Vite + +```json +{ + "type": "module", + "scripts": { + "dev": "vite dev", + "build": "vite build", + "start": "node .output/server/index.mjs" + } } ``` -If a loader depends on search state, declare the relevant values in `loaderDeps`. That makes those values part of the loader's dependency and cache behavior. Validate page numbers, sorting, and filters at runtime; TypeScript types alone do not validate an incoming URL. See [search parameters](/router/latest/docs/guide/search-params) and [data loading](/router/latest/docs/guide/data-loading). +# Rsbuild -## Move server reads into server functions +```json +{ + "type": "module", + "scripts": { + "dev": "rsbuild dev", + "build": "rsbuild build" + } +} +``` -An ordinary Start route loader can execute on the server for the initial request and in the browser during navigation. Do not move a database query, credential, or privileged SDK directly from an async Next.js Server Component into an ordinary loader. + -Put the privileged read inside a [server function](./guide/server-functions), then call it from the loader. The reference's `/saved` route calls `getAccount`, checks the result, and redirects signed-out readers. Its public article loader only reads bundled public content. + -Return the data the browser is allowed to see, not an entire database record. Keep connection setup and secrets on the server. For a database-backed application, preserve your schema and access layer where possible, and change the framework-facing handler around them. +# Vite -## Translate mutations and their invalidation +```ts title="vite.config.ts" +import { defineConfig } from 'vite' +import { tanstackStart } from '@tanstack/react-start/plugin/vite' +import viteReact from '@vitejs/plugin-react' +import tailwindcss from '@tailwindcss/vite' +import { nitro } from 'nitro/vite' -The reference's Next.js form calls a Server Action. That Action authorizes the session, changes the saved flag, and calls `revalidatePath('/saved')`. The Start version calls a POST server function through `useServerFn`, then awaits `router.invalidate()` to reload the active route data. +export default defineConfig({ + server: { + port: 3000, + }, + resolve: { + // Enables Vite to resolve imports using path aliases. + tsconfigPaths: true, + }, + plugins: [ + tailwindcss(), + tanstackStart({ + srcDirectory: 'src', // This is the default + router: { + // Specifies the directory TanStack Router uses for your routes. + routesDirectory: 'app', // Defaults to "routes", relative to srcDirectory + }, + }), + viteReact(), + nitro(), + ], +}) +``` -These invalidation APIs operate on different caches. `router.invalidate()` does not purge a CDN, clear a database cache, or revalidate all statically generated pages. If the app uses TanStack Query, invalidate the relevant query keys as well. Map each existing `revalidatePath`, tag, and cache directive to the layer that owns the replacement data. +# Rsbuild -The Start function checks authorization even though the route already checks it. A caller can invoke the mutation without visiting the page. Validate every untrusted input inside the server boundary and preserve resource-level permissions. +```ts title="rsbuild.config.ts" +import { defineConfig } from '@rsbuild/core' +import { pluginReact } from '@rsbuild/plugin-react' +import { tanstackStart } from '@tanstack/react-start/plugin/rsbuild' -`useServerFn` returns a callable function. The reference keeps pending and error state in the component and reloads route data after a successful mutation. It also tests replaying the mutation after sign-out. +export default defineConfig({ + server: { + port: 3000, + }, + plugins: [ + pluginReact(), + tanstackStart({ + srcDirectory: 'src', // This is the default + router: { + // Specifies the directory TanStack Router uses for your routes. + routesDirectory: 'app', // Defaults to "routes", relative to srcDirectory + }, + }), + ], +}) +``` -Next.js Action forms and these Start event-handler forms have different no-JavaScript behavior. The latter require JavaScript and keep their fields disabled until hydration. If progressive enhancement is a requirement, use a FormData-compatible [server function URL](./guide/server-functions#progressive-enhancement) or an ordinary form POST to a [server route](./guide/server-routes). Include validation, CSRF protection, and an appropriate response or redirect. Do not treat `createServerFn` as a drop-in replacement for the React form Action protocol. +```js title="postcss.config.mjs" +export default { + plugins: { + '@tailwindcss/postcss': {}, + }, +} +``` -## Preserve authentication and session boundaries + -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. +By default, `routesDirectory` is set to `routes`. To maintain consistency with Next.js App Router conventions, you can set it to `app` instead. -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. +### 4. Adapt the Root Layout -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. +> TanStack Start uses a routing approach similar to Remix, with some changes to support nested structures and special features using tokens. Learn more about it at [Routing Concepts](/router/latest/docs/framework/react/routing/routing-concepts) guide. -## Preserve metadata and search responses +Instead of `layout.tsx`, create a file named `__root.tsx` in the `src/app` directory. This file will serve as the root layout for your application. -Next.js `metadata` and `generateMetadata` become a Start route's `head` configuration. The article route derives title, description, Open Graph title, and canonical from its loader result. Keep `HeadContent` in the root document so those values appear in the response. +- `src/app/layout.tsx` to `src/app/__root.tsx` -Compare HTML responses before JavaScript runs, then check the head after client navigation. Keep the public canonical origin independent of a local or preview host. Preserve locale alternates and social images where your app has them. See [SEO](./guide/seo) and [head management](/router/latest/docs/guide/document-head-management). +```tsx +- import type { Metadata } from "next" // [!code --] +import { + Outlet, + createRootRoute, + HeadContent, + Scripts, +} from "@tanstack/react-router" +import appCss from "./globals.css?url" -Next.js metadata file conventions also need replacements. The reference turns `app/sitemap.ts` into a Start server route at `/sitemap.xml`. Migrate `robots.txt`, icons, manifests, and generated social images explicitly. Return real 404s for missing content and maintain intentional permanent redirects. Avoid redirecting every missing URL to the homepage. +- export const metadata: Metadata = { // [!code --] +- title: "Create Next App", // [!code --] +- description: "Generated by create next app", // [!code --] +- } // [!code --] +export const Route = createRootRoute({ + head: () => ({ + meta: [ + { charSet: "utf-8" }, + { + name: "viewport", + content: "width=device-width, initial-scale=1", + }, + { title: "TanStack Start Starter" } + ], + links: [ + { + rel: 'stylesheet', + href: appCss, + }, + ], + }), + component: RootLayout, +}) -## Replace image and font services deliberately +- export default function RootLayout({ // [!code --] +- children, // [!code --] +- }: Readonly<{ // [!code --] +- children: React.ReactNode // [!code --] +- }>) { // [!code --] +- return ( // [!code --] +- // [!code --] +- {children} // [!code --] +- // [!code --] +- ) // [!code --] +- } // [!code --] +function RootLayout() { + return ( + + + + + + + + + + ) +} +``` -Start does not automatically provide the Next.js image optimizer. Preserve image dimensions, responsive sources, loading behavior, alt text, and cache policy. Plain `` works for preprocessed assets; an image component such as Unpic needs a compatible image service or prepared sources to provide transformations. It does not create Next.js's image processing backend by itself. Next.js also supports its optimizer when [self-hosted](https://nextjs.org/docs/app/guides/self-hosting). +### 5. Adapt the Home Page -Replace `next/font` with self-hosted font files, a package such as Fontsource, or another chosen font delivery method. CSS `@font-face` does not require Tailwind. Preserve font weights and subsets, set an appropriate `font-display`, and check layout shift and network requests. Copy public assets and update imports only after confirming their resulting URLs. +Instead of `page.tsx`, create an `index.tsx` file for the `/` route. -The reference uses text and the browser's default font. It does not claim to verify your image transformations or font loading. +- `src/app/page.tsx` to `src/app/index.tsx` -## Rebuild caching and deployment behavior +```tsx ++ import { createFileRoute } from '@tanstack/react-router' // [!code ++] -List each cache separately: browser data, Router loaders, Query, server data, generated pages, and CDN responses. Define what populates it, its key, expiration, and the operation that invalidates it. Test after changing data, signing out, and deploying a new version. +- export default function Home() { // [!code --] ++ export const Route = createFileRoute('/')({ // [!code ++] ++ component: Home, // [!code ++] ++ }) // [!code ++] -Next.js cache directives, revalidation, and `generateStaticParams` do not carry across automatically. Use [static prerendering](./guide/static-prerendering) only for suitable public routes, and review [ISR](./guide/isr) with your hosting provider's actual behavior. A cache header alone is not proof of equivalent regeneration or invalidation. ++ function Home() { // [!code ++] + return ( +
+ ) +} +``` -Move server-only environment variables into the server runtime. Audit any public variable prefix changes rather than exposing the old environment wholesale. Verify API/webhook URLs, forwarded host/protocol, cookies behind a proxy, asset paths, streaming, and runtime limits in the deployment you will use. +### 6. Are we migrated yet? -## Cut over with a rollback path +Before you can run the development server, you need to create a file that will define the behavior of TanStack Router within TanStack Start. -1. Build both applications and run the contract checks against a staging deployment of Start. Include real representative data, authenticated sessions, and the CDN in that check. -2. Keep the current database schema compatible with both versions during the transition. Separate destructive schema changes from the framework cutover. -3. Preserve the public origin and paths where possible. If paths must change, deploy tested redirects and update internal links, canonicals, and sitemaps together. -4. Record the previous deployment and routing configuration. Know how to route traffic back, and what happens to sessions and writes if you do. -5. Monitor error rates, login and mutation failures, response status, indexing signals, and application conversion events after cutover. Compare against the baseline rather than assuming a framework change will improve search traffic. +- `src/router.tsx` -Remove Next.js and its unused configuration after the migrated behavior and rollback plan are verified. Retain historical redirects and any assets still referenced by public content. +```tsx +import { createRouter } from '@tanstack/react-router' +import { routeTree } from './routeTree.gen' + +export function getRouter() { + const router = createRouter({ + routeTree, + scrollRestoration: true, + }) + + return router +} +``` + +> 🧠 Here you can configure everything from the default [preloading functionality](/router/latest/docs/framework/react/guide/preloading) to [caching staleness](/router/latest/docs/framework/react/guide/data-loading). + +Don't worry if you see some TypeScript errors at this point; the next step will resolve them. + +### 7. Verify the Migration + +Run the development server: + +```sh +npm run dev +``` + +Then, visit `http://localhost:3000`. You should see the TanStack Start welcome page with its logo and a documentation link. + +> If you encounter issues, review the steps above and ensure that file names and paths match exactly. For a reference implementation, see the [post-migration repository](https://github.com/nrjdalal/next-to-start). + +## Next Steps (Advanced) + +Now that you have migrated the basic structure of your Next.js application to TanStack Start, you can explore more advanced features and concepts. + +### Routing Concepts + +| Route Example | Next.js | TanStack Start | +| ------------------------------ | ---------------------------------- | ------------------------- | +| Root Layout | `src/app/layout.tsx` | `src/app/__root.tsx` | +| `/` (Home Page) | `src/app/page.tsx` | `src/app/index.tsx` | +| `/posts` (Static Route) | `src/app/posts/page.tsx` | `src/app/posts.tsx` | +| `/posts/[slug]` (Dynamic) | `src/app/posts/[slug]/page.tsx` | `src/app/posts/$slug.tsx` | +| `/posts/[...slug]` (Catch-All) | `src/app/posts/[...slug]/page.tsx` | `src/app/posts/$.tsx` | +| `/api/endpoint` (API Route) | `src/app/api/endpoint/route.ts` | `src/app/api/endpoint.ts` | + +Learn more about the [Routing Concepts](/router/latest/docs/framework/react/routing/routing-concepts). + +### Dynamic and Catch-All Routes + +Retrieving dynamic route parameters in TanStack Start is straightforward. + +```tsx +- export default async function Page({ // [!code --] +- params, // [!code --] +- }: { // [!code --] +- params: Promise<{ slug: string }> // [!code --] +- }) { // [!code --] ++ export const Route = createFileRoute('/app/posts/$slug')({ // [!code ++] ++ component: Page, // [!code ++] ++ }) // [!code ++] + ++ function Page() { // [!code ++] +- const { slug } = await params // [!code --] ++ const { slug } = Route.useParams() // [!code ++] + return
My Post: {slug}
+} +``` + +> Note: If you've made a catch-all route (like `src/app/posts/$.tsx`), you can access the parameters via `const { _splat } = Route.useParams()`. + +Similarly, you can access `searchParams` using `const { page, filter, sort } = Route.useSearch()`. + +Learn more about the [Dynamic and Catch-All Routes](/router/latest/docs/framework/react/routing/routing-concepts#dynamic-route-segments). + +### Links + +```tsx +- import Link from "next/link" // [!code --] ++ import { Link } from "@tanstack/react-router" // [!code ++] + +function Component() { +- return Dashboard // [!code --] ++ return Dashboard // [!code ++] +} +``` + +Learn more about the [Links](/router/latest/docs/framework/react/guide/navigation#link-component). + +### Images + +Next.js uses the `next/image` component for optimized images. In TanStack Start, you can use the package called [Unpic](https://unpic.pics/) for similar functionality +and almost a drop-in replacement. + +```tsx +import Image from 'next/image' // [!code --] +import { Image } from '@unpic/react' // [!code ++] +function Component() { + return ( + Description + ) +} +``` + +### Server ~Actions~ Functions + +```tsx +- 'use server' // [!code --] ++ import { createServerFn } from "@tanstack/react-start" // [!code ++] + +- export const create = async () => { // [!code --] ++ export const create = createServerFn().handler(async () => { // [!code ++] + return true +- } // [!code --] ++ }) // [!code ++] +``` + +Learn more about the [Server Functions](./guide/server-functions). + +### Server Routes ~Handlers~ + +```ts +- export async function GET() { // [!code --] ++ export const Route = createFileRoute('/api/hello')({ // [!code ++] ++ server: { // [!code ++] ++ handlers: { // [!code ++] ++ GET: async () => { // [!code ++] ++ return Response.json("Hello, World!") ++ } // [!code ++] ++ } // [!code ++] ++ } // [!code ++] ++ }) // [!code ++] +``` + +Learn more about the [Server Routes](./guide/server-routes). + +### Fonts + +```tsx +- import { Inter } from "next/font/google" // [!code --] + +- const inter = Inter({ // [!code --] +- subsets: ["latin"], // [!code --] +- display: "swap", // [!code --] +- }) // [!code --] + +- export default function Page() { // [!code --] +- return

Font Sans

// [!code --] +- } // [!code --] +``` + +Instead of `next/font`, use Tailwind CSS’s CSS-first approach. Install fonts (for example, from [Fontsource](https://github.com/fontsource/fontsource)): + +```sh +npm i -D @fontsource-variable/dm-sans @fontsource-variable/jetbrains-mono +``` + +Add the following to `src/app/globals.css`: + +```css +@import 'tailwindcss' source('../'); + +@import '@fontsource-variable/dm-sans'; /* [!code ++] */ +@import '@fontsource-variable/jetbrains-mono'; /* [!code ++] */ + +@theme inline { + --font-sans: 'DM Sans Variable', sans-serif; /* [!code ++] */ + --font-mono: 'JetBrains Mono Variable', monospace; /* [!code ++] */ + /* ... */ +} + +/* ... */ +``` + +### Fetching Data + +```tsx +- export default async function Page() { // [!code --] ++ export const Route = createFileRoute('/')({ // [!code ++] ++ component: Page, // [!code ++] ++ loader: async () => { // [!code ++] ++ const res = await fetch('https://api.vercel.app/blog') // [!code ++] ++ return res.json() // [!code ++] ++ }, // [!code ++] ++ }) // [!code ++] + ++ function Page() { // [!code ++] +- const data = await fetch('https://api.vercel.app/blog') // [!code --] +- const posts = await data.json() // [!code --] ++ const posts = Route.useLoaderData() // [!code ++] + + return ( +
    + {posts.map((post) => ( +
  • {post.title}
  • + ))} +
+ ) +} +``` diff --git a/docs/start/framework/react/migrate-from-release-candidate.md b/docs/start/framework/react/migrate-from-release-candidate.md deleted file mode 100644 index 5cfa614cda..0000000000 --- a/docs/start/framework/react/migrate-from-release-candidate.md +++ /dev/null @@ -1,39 +0,0 @@ ---- -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 ced7b65458..3494b7a187 100644 --- a/docs/start/framework/react/overview.md +++ b/docs/start/framework/react/overview.md @@ -1,11 +1,12 @@ --- id: overview title: TanStack Start Overview -description: Build full-stack React applications with TanStack Start, including server rendering, streaming, server functions, and type-safe routing. --- > [!NOTE] -> 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 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 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/react/start-vs-nextjs.md b/docs/start/framework/react/start-vs-nextjs.md index f1dd175a41..27b814725f 100644 --- a/docs/start/framework/react/start-vs-nextjs.md +++ b/docs/start/framework/react/start-vs-nextjs.md @@ -1,67 +1,286 @@ --- id: start-vs-nextjs title: TanStack Start vs Next.js -description: Compare TanStack Start and Next.js for routing, rendering, server functions, caching, deployment, and the work each framework handles for you. --- -TanStack Start is a good fit when you want TanStack Router's typed navigation, search parameters, and loaders in a full-stack application. Next.js is a good fit when you want the App Router's Server Component model and integrated image, font, and metadata tools. Both can build interactive applications and server-rendered websites. +Choosing between TanStack Start and Next.js isn't just about features - it's about understanding what each framework optimizes for and how those decisions cascade through your entire development experience. -This comparison was checked on September 11, 2026 against the linked documentation, including Next.js 16.3. For a broader feature matrix, see [Start, Next.js, and React Router](./comparison). For a practical migration, see [Migrate from Next.js](./migrate-from-next-js). +This page explains the fundamental differences, addresses common misconceptions, and helps you make an informed decision. For a feature-by-feature matrix, see the [full comparison table](./comparison). Ready to switch? See the [migration guide](./migrate-from-next-js). -## Rendering and interactivity +**A note on benchmarks:** If someone quotes performance numbers comparing Start and Next without methodology, app complexity, hosting details, and configuration specifics - those numbers are meaningless. Comparisons must assume best practices on both sides. You can't give Next the benefit of optimized usage while assuming Start users misconfigure things. -Start's React components are server-rendered and hydrated by default. You can change rendering behavior per route with [selective SSR](./guide/selective-ssr), including data-only and client-only rendering. You do not need React Server Components to use Start's server functions or SSR. +## Two Different Visions of React -Next.js App Router layouts and pages are Server Components by default. A `use client` boundary enables client-side state, effects, and event handlers. It applies to the imported module tree, so you do not add the directive to every interactive component. Client Components can still contribute server-rendered HTML on the initial request. [Next.js component model](https://nextjs.org/docs/app/getting-started/server-and-client-components). +Both frameworks want to help you build great React applications. But they start from different assumptions about what "great" means. -Start's [Server Components support](./guide/server-components) is **experimental and opt-in**. It uses client-led composition of server-produced UI. That is a different integration model from Next.js, and experimental support should not be presented as production feature parity. +### Next.js: The Platform Play + +Next.js optimizes for **Vercel's vision of the web**: server-first rendering, tight platform integration, and automatic optimizations that work best on their infrastructure. + +The core bet: most web content is static or near-static. Server Components should be the default. Interactivity is the exception you opt into. The framework should make decisions for you, and those decisions should be optimized for their infrastructure. + +This works well if: + +- You're deploying to Vercel and want tight platform integration +- Your app is content-heavy with islands of interactivity +- You want the framework to make architectural decisions for you + +### TanStack Start: The Developer-First Play + +TanStack Start optimizes for **developer control and correctness**: type safety everywhere, explicit over implicit, composable primitives, and deployment freedom. + +The core bet: developers know their apps better than frameworks do. Server rendering is an optimization you opt into where it makes sense. The framework should give you powerful primitives and get out of your way. + +This works well if: + +- You want your deployment target to be a decision you make, not one the framework makes for you +- Your app is highly interactive +- You value type safety and explicit control +- You want to understand exactly what your code is doing + +## The Mental Model Gap + +This is the most important difference to understand. Everything else flows from it. + +### Both SSR - Different Defaults for Interactivity + +Let's be clear: both frameworks SSR by default, and both support static generation and React Server Components. The difference isn't capability - it's how you access those capabilities and how much control you have. + +**Next.js** defaults to Server Components. Every component is a Server Component unless you add `"use client"`. Server Components can't use state, effects, or event handlers - so the path to interactivity requires understanding the framework's implicit boundaries, caching layers, and serialization rules. + +**TanStack Start** defaults to interactive components (traditional React). Your components SSR and hydrate, ready for state and event handlers out of the box. You opt into Server Components where they provide value - for heavy static content, keeping secrets server-side, or reducing bundle size. + +Both approaches get you to the same destination. The question is: which direction feels like swimming upstream for _your_ app? + +Consider: + +- If most of your components need state, effects, or event handlers, Next's defaults mean constant `"use client"` annotations and thinking about serialization boundaries +- If most of your content is static, Start lets you explicitly opt those components into server-only rendering - with clearer control over caching and hydration +- Either way, Start gives you more granular control over _how_ things render, not just _where_ + +### Implicit vs Explicit + +Both frameworks handle the fundamentals - code splitting, caching, SSR, static optimization. The difference is visibility and predictability. **Next.js** layers implicit behaviors: multi-layer server-side caching with a history of breaking changes and community frustration, data fetching conventions tied to file structure, optimizations that require understanding the framework's internals to override. + +**TanStack Start** is explicit without being verbose. Loader functions, cache configuration, middleware chains - they're visible in your code, not hidden behind conventions. This doesn't mean more code; it means the code you write maps directly to what happens at runtime. + +## Architecture Deep Dive + +### The Build Pipeline + +**Next.js** uses a custom build system (historically Webpack, now Turbopack). It's tightly integrated with their architecture, which enables optimizations but limits flexibility. Turbopack has improved dev speed, but it's still no match for Vite or Rsbuild. + +**TanStack Start** supports Vite and Rsbuild. This means: + +- Faster dev server startup +- Faster HMR +- Access to modern plugin ecosystems +- Standard tooling that transfers to other projects + +### The Runtime + +**Next.js** ships a substantial runtime to support Server Components, server-side caching, automatic optimizations, and the App Router's conventions. This runtime has real weight. + +**TanStack Start** ships a minimal runtime. The router is powerful but lean. Server functions are thin RPC wrappers. There's no framework magic layer between you and React. + +Bundle size isn't everything, but it's the baseline everything else builds on. Start's architecture is designed to minimize runtime overhead - even with RSC support, the runtime stays lean. Much of Next's bundle weight is architectural tax, not feature weight. + +### The Type System + +**Next.js** has TypeScript support. **TanStack Start** is built around TypeScript. + +The difference matters: + +- In Next.js, the boundary between client and server creates type gaps. Server Actions can receive data that doesn't match what TypeScript expects. You need runtime validation to be safe. +- In Start, server functions have end-to-end type safety. Input validation, return types, middleware context, route parameters - all checked at compile time. + +In the age of AI-assisted development, end-to-end type safety should be non-negotiable. Types aren't just "nice for DX" - they're correctness guarantees that prevent production errors. ## Routing -Start inherits [TanStack Router's routing model](/router/latest/docs/guide/type-safety). Route definitions connect the types for links, path parameters, validated search parameters, loaders, and route context. This is useful when application state lives in the URL or when many screens share typed data dependencies. +This is where TanStack shines brightest. TanStack Router (which powers Start) is the most powerful, type-safe router in any framework. -Next.js also provides compile-time checking for links through its stable, opt-in [`typedRoutes`](https://nextjs.org/docs/app/api-reference/config/next-config-js/typedRoutes) option. Describing it as only IDE hints is inaccurate. The distinction is the scope of inference and validation across your application, not whether Next.js supports TypeScript. +**Features Next.js doesn't have:** -In either framework, a valid route type does not prove that a database record exists or that a user may access it. Handle missing data and authorization at runtime. +- **Typesafe search params** - Define, validate, and parse search params with full type inference. Next gives you `?foo=bar` as strings; Start gives you validated, typed objects +- **Search param validation & middleware** - Transform and validate search params at the route level +- **Typesafe path params** - Path params are inferred and validated, not just `string | string[]` +- **Typesafe route context** - Pass typed context down through nested routes +- **Path param validation & custom parsing** - Parse `/users/123` as a number, validate it exists +- **Route mount/transition/unmount events** - Hook into the route lifecycle +- **Code-based routes** - Define routes in code when file-based doesn't fit +- **Built-in devtools** - Inspect router state, cache, and pending navigations +- **Element scroll restoration** - Restore scroll position for specific elements, not just the page +- **Navigation blocking** - `useBlocker` for unsaved changes warnings -For detailed navigation features, see the [Router comparison](/router/latest/docs/comparison). +**Type safety that actually works:** + +- Route paths are fully typed - typos are compile errors +- Links validate their destinations - no broken links in production +- Loaders know their route context - no guessing what data is available +- Search params are typed end-to-end - from URL to component + +Next.js has file-based routing that works, but the type safety is superficial (an IDE plugin for link hints) compared to TanStack Router's compile-time guarantees. + +**First-class integrations:** + +TanStack Router was designed from the ground up for isomorphism and hydration. This makes it the foundation for first-class integrations with TanStack Query and other data-fetching libraries. In Next, you wire up Query manually; in Start, it's a supported pattern with official integrations. + +See the [full router comparison](/router/latest/docs/framework/react/comparison) for the complete feature matrix. + +## The Caching Question + +Caching is where the philosophical differences become most visible. + +### Next.js: Implicit and Server-Side + +Next.js caches aggressively by default (or did - they've changed this multiple times). The caching happens in layers: + +- Request memoization +- Data cache +- Full route cache +- Router cache + +Each layer has its own invalidation semantics. The system has been rewritten multiple times with community criticism for being unpredictable. Next 15 simplified the defaults, but the fundamental complexity of server-side RSC stream caching remains. + +When people talk about "component caching," they're referring to caching serialized RSC streams on the server. This is more complicated than most realize: + +- You're caching text streams with complex invalidation semantics +- This happens in lambda-style environments with their own constraints +- Granular invalidation requires explicit tagging setup +- Cache misses cascade through the component tree in ways that aren't always predictable + +**Ask anyone claiming server-side component caching is special:** "How do you invalidate a cached RSC stream when a data dependency changes?" Most can't answer clearly. + +### TanStack Start: RSCs Are Just Data + +Start treats Server Component output the same as any other data flowing through your app. There's no special "component cache" with its own semantics - RSC payloads are data, and you cache data however you want: + +- **TanStack Router** - Built-in SWR-style caching with `staleTime` and `gcTime` +- **TanStack Query** - Full-featured async state management +- **CDN caching** - Standard HTTP cache headers at the edge +- **Redis, database, whatever** - It's just data; use your existing infrastructure + +```tsx +export const Route = createFileRoute('/posts/$postId')({ + loader: async ({ params }) => fetchPost(params.postId), + staleTime: 10_000, // Fresh for 10 seconds + gcTime: 5 * 60_000, // Keep in memory for 5 minutes +}) +``` + +This is the same SWR pattern TanStack Query has battle-tested across millions of applications. No new mental model. No framework-specific caching semantics to learn. No chasing ghosts. + +The caching layers are well-understood and compose naturally: + +- Client-side SWR caching (built into the router) +- CDN caching at the edge (standard HTTP semantics) +- Server-side caching where you want it (explicit, opt-in) + +You already know how to cache data. Start doesn't make you learn a new way. + +### The Bottom Line on RSCs + +Start has full RSC support with feature parity to Next.js. The difference is mental model and cognitive overhead. + +In Next, RSCs are the paradigm - you build around them, think about them constantly, manage their boundaries everywhere. In Start, RSCs are just another data primitive. Fetch them, cache them, compose them - using patterns you already know from TanStack Query and Router. + +We call our approach **Composite Components** - server-produced React components that the client can fetch, cache, stream, and assemble. The client owns composition; the server ships UI pieces. No new mental model. No framework-specific caching semantics. Just data flowing through tools you already understand. + +For the full deep-dive, see [Composite Components: Server Components with Client-Led Composition](https://tanstack.com/blog/composite-components). ## Server Functions vs Server Actions -Start's [server functions](./guide/server-functions) provide callable server endpoints with inferred inputs and outputs. You can choose GET or POST, supply an input validator, and compose [function middleware](./guide/middleware). Use runtime validation for untrusted inputs and server-side authorization for private data. +Both frameworks let you call server code from the client. The approaches differ significantly. -Next.js Server Actions integrate with forms and React's pending and error-state APIs. They can validate input with a schema too. Receiving `FormData` does not prevent validation, and a TypeScript annotation does not perform validation in either framework. [Next.js forms and validation](https://nextjs.org/docs/app/guides/forms). +### Next.js Server Actions -Choose the API that fits your application's data flow. A typed RPC call and a form action solve overlapping problems, but they are not interchangeable in every workflow. +```tsx +'use server' -## Caching +export async function createPost(formData: FormData) { + const title = formData.get('title') + // No compile-time type safety on inputs + return db.posts.create({ title }) +} +``` -Start uses [TanStack Router's loader cache](/router/latest/docs/guide/data-loading) for navigation data, with options such as `staleTime` and `gcTime`. You can also use the [official Query integration](/router/latest/docs/integrations/query) when you need a separate query cache. Browser data caching, server data caching, and CDN response caching serve different purposes. +Server Actions integrate with forms and transitions. They're convenient for simple cases but provide limited type safety at the boundary. -Next.js documents explicit caching through Cache Components, enabled with `cacheComponents: true`. Its `use cache`, `cacheLife`, and tag-based revalidation APIs control reuse and invalidation. Applications without that option use a different documented caching model. Compare the configuration you intend to run, rather than treating every Next.js version and configuration as having the same defaults. [Next.js caching](https://nextjs.org/docs/app/getting-started/caching). +### TanStack Server Functions -Start's [ISR guide](./guide/isr) describes HTTP caching and provider-specific options. A `Cache-Control` header alone does not guarantee the same regeneration, invalidation, or shared-cache behavior on every host. Verify those behaviors on your deployment target. +```tsx +export const createPost = createServerFn({ method: 'POST' }) + .validator(z.object({ title: z.string().min(1) })) + .middleware([authMiddleware]) + .handler(async ({ data, context }) => { + // data is typed and validated + // context comes from middleware, also typed + return db.posts.create({ title: data.title }) + }) +``` -## Build tools +Server functions give you: -Start supports [Vite and Rsbuild](./build-from-scratch). Next.js integrates [Turbopack](https://nextjs.org/docs/app/api-reference/turbopack), with its own supported configuration and plugin surface. Your existing build tooling can make one choice easier to adopt. +- **Input validation** - Define schemas, get runtime validation and compile-time types +- **Middleware** - Composable, works on both client and server +- **Full type inference** - From input to output to error handling +- **Explicit RPC** - Clear mental model of what's happening -There is no benchmark in this comparison establishing a startup, HMR, build-time, memory, or runtime-size winner. A router package's bundle size is not the bundle size of a complete Start application. Measure the same application, dependencies, rendering behavior, hardware, and production deployment before drawing performance conclusions. - -## Deployment - -Start has [deployment guides](./guide/hosting) for several providers and runtimes. Check the guide for your chosen bundler and target, especially when you need streaming, image processing, background work, or cache invalidation. - -Next.js supports self-hosting. Its image optimizer works with `next start`, and its documentation covers ISR, shared caches, streaming, and multi-instance deployments. These features are not inherently Vercel-only. Operating them yourself still requires infrastructure configuration. [Next.js self-hosting](https://nextjs.org/docs/app/guides/self-hosting). +**Security note:** Start's architecture doesn't parse Flight data on the server - payloads flow one direction (server to client). Recent React security advisories around RSC serialization vulnerabilities don't apply to Start's model. ## Where Next.js Has the Advantage -Next.js is worth choosing when your application depends on its established Server Component integration, or when you want the built-in [`next/image`](https://nextjs.org/docs/app/api-reference/components/image), [`next/font`](https://nextjs.org/docs/app/api-reference/components/font), and [metadata conventions](https://nextjs.org/docs/app/getting-started/metadata-and-og-images). Replacing those facilities is migration work, even when alternatives exist. +Next.js has been around longer. That's not a technical advantage, but it creates real ecosystem effects: -If your team already maintains a working Next.js application, keep that experience and migration cost in the decision. A different routing model is not, by itself, a reason to rewrite a healthy application. +**More content** - More tutorials, more Stack Overflow answers, more blog posts, more example repos. When you Google a problem, you're more likely to find a Next-specific answer. -## When to Choose TanStack Start +**Mindshare** - Next is the default recommendation in many circles. That means more developers have used it, which means more content, which reinforces the cycle. -Start is worth choosing when typed URL state, route context, explicit loaders, and callable server functions fit how you build applications. Its [Router integration](./guide/routing), [selective SSR](./guide/selective-ssr), and [middleware](./guide/middleware) are concrete reasons to try it. +**Vercel integration** - Next.js is built by Vercel, so new Vercel platform features often ship with Next.js support first. That said, Start works great on Vercel too - you're not giving up preview deployments or edge functions by choosing Start. You're just not locked into Vercel as the only first-class option. -Build one representative route before committing to a migration: load real data, validate search parameters, submit a mutation, handle unauthorized access, and deploy it. If those tasks become easier to maintain, you have evidence that Start fits your application. Continue with [Getting Started](./getting-started) or the [Next.js migration guide](./migrate-from-next-js). +**Built-in image/font optimization** - Start supports image optimization via pluggable solutions (like [Unpic](https://unpic.pics/)), but it's not built-in. Whether "built-in" is better than "pluggable" depends on whether you want the framework making that choice for you. + +None of these are technical superiority - they're ecosystem and business model advantages. On the technical merits, we're confident in Start's approach. + +## What Start Does Better + +With RSC support, the question isn't "what does Start lack?" - it's: **"Why give up Start's router, type safety, caching design, and simpler mental model for Next's API design?"** + +**Type safety** - End-to-end, not bolted on. This prevents bugs and enables confident refactoring. + +**Routing** - The most powerful, type-safe router in any framework. Search params, path params, loaders, middleware - all fully typed. + +**Caching model** - Explicit SWR primitives you already understand if you've used TanStack Query. No implicit layers to debug. + +**Dev experience** - Vite and Rsbuild are fast. Instant startup, fast HMR, lower resource usage. This compounds over a workday - and even more so when AI agents are iterating on your code in tight loops. + +**Deployment as a feature** - Start treats deployment flexibility as a first-class feature. Cloudflare, Netlify, AWS, Fly, Railway, your own servers - they're all equally supported. Your app works the same everywhere because it's built on standards, not platform-specific optimizations. This means you can: + +- Choose hosting based on price, performance, or proximity to your users +- Switch providers without rewriting deployment logic +- Run the same code in development, staging, and production across different platforms +- Avoid accumulating platform-specific patterns that create friction later + +**Middleware** - Composable middleware that works at both the request level AND the server function level, on both client and server. + +**Debugging** - Predictable execution. When something breaks, you can trace it. No abstraction layers hiding behavior. + +## Summary + +| Aspect | TanStack Start | Next.js | +| -------------------- | ------------------------------------ | ------------------------------------- | +| **Philosophy** | Developer control, explicit patterns | Platform integration, conventions | +| **Components** | Interactive by default, opt into RSC | Server Components by default | +| **Type safety** | End-to-end, compile-time | TypeScript support with boundary gaps | +| **Server functions** | Typed, validated, middleware support | Untyped boundary, no middleware | +| **Caching** | Explicit SWR primitives | Multi-layer implicit caching | +| **Build tool** | Vite or Rsbuild | Turbopack/Webpack | +| **Deployment** | Equal support everywhere | Optimized for Vercel | +| **Routing** | Best-in-class type safety | File-based, basic types | +| **RSC** | Supported | Supported | +| **Maturity** | 2+ years, approaching 1.0 | 8+ years, historically unstable APIs | + +--- + +> **Ready to try Start?** See the [Getting Started guide](./getting-started) or [migrate from Next.js](./migrate-from-next-js). diff --git a/docs/start/framework/react/tutorial/reading-writing-file.md b/docs/start/framework/react/tutorial/reading-writing-file.md index f4af4480f1..11b1be0794 100644 --- a/docs/start/framework/react/tutorial/reading-writing-file.md +++ b/docs/start/framework/react/tutorial/reading-writing-file.md @@ -152,7 +152,7 @@ export type JokesData = Joke[] ### Step 1.3: Create Server Functions to Read the File -Let's create a new file `src/serverActions/jokesActions.ts` to create a server function to perform a read-write operation. We will be creating a server function using [`createServerFn`](https://tanstack.com/start/latest/docs/framework/react/guide/server-functions). +Let's create a new file `src/serverActions/jokesActions.ts` to create a server function to perform a read-write operation. We will be creating a server function using [`createServerFn`](https://tanstack.com/start/latest/docs/framework/react/server-functions). ```tsx // src/serverActions/jokesActions.ts diff --git a/docs/start/framework/solid/guide/authentication.md b/docs/start/framework/solid/guide/authentication.md index 460a58747c..8ae205ef21 100644 --- a/docs/start/framework/solid/guide/authentication.md +++ b/docs/start/framework/solid/guide/authentication.md @@ -1,12 +1,11 @@ --- id: authentication -title: Implement Authentication in SolidJS -description: Implement sessions, sign-in, sign-out, protected routes, and server-side authorization in a TanStack Start SolidJS app. +title: Authentication --- -Implement the authentication workflow in your SolidJS app, from sessions and sign-in to protected routes and authorization. +This guide covers authentication patterns and shows how to implement your own authentication system with TanStack Start. -To compare libraries and hosted services, read [Choose Authentication for SolidJS Apps](./authentication-overview.md). +> **📋 Before You Start:** Check our [Authentication Overview](./authentication-overview.md) for all available options including partner solutions and hosted services. ## Authentication Approaches @@ -35,7 +34,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 server functions, request and cookie utilities, and route protection. Session storage and authentication come from your application or a library you choose. +TanStack Start provides the tools for both through server functions, sessions, and route protection. > 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,7 +47,6 @@ 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' }) @@ -62,9 +60,11 @@ export const loginFn = createServerFn({ method: 'POST' }) } // Create session - const session = await getAppSession() - session.userId = user.id - await session.save() + const session = await useAppSession() + await session.update({ + userId: user.id, + email: user.email, + }) // Redirect to protected area throw redirect({ to: '/dashboard' }) @@ -72,131 +72,98 @@ export const loginFn = createServerFn({ method: 'POST' }) // Logout server function export const logoutFn = createServerFn({ method: 'POST' }).handler(async () => { - const session = await getAppSession() - session.destroy() + const session = await useAppSession() + await session.clear() throw redirect({ to: '/' }) }) // Get current user export const getCurrentUserFn = createServerFn({ method: 'GET' }).handler( async () => { - const session = await getAppSession() - const userId = session.userId + const session = await useAppSession() + const userId = session.get('userId') if (!userId) { return null } - const user = await getUserById(userId) - return user ? { id: user.id, email: user.email, role: user.role } : null + return await getUserById(userId) }, ) ``` ### 2. Session Management -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. +TanStack Start provides secure HTTP-only cookie sessions: ```tsx -// utils/session.ts — import only from server code -import { getIronSession } from 'iron-session' -import { getCookie, setCookie } from '@tanstack/solid-start/server' +// utils/session.ts +import { useSession } from '@tanstack/solid-start/server' type SessionData = { - userId: string - oauthState: string + userId?: string + email?: string + role?: string } -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: '/', - }, +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, }, - ) + }) } ``` -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`. - -Merge this pattern into your existing root route, keeping its metadata and document shell: +Share authentication state across your application: ```tsx -// routes/__root.tsx -import { - createRootRoute, - HeadContent, - Outlet, - Scripts, -} from '@tanstack/solid-router' -import type { JSX } from 'solid-js' +// contexts/auth.tsx +import { createContext, useContext } from 'solid-js' +import { useServerFn } from '@tanstack/solid-start' import { getCurrentUserFn } from '../server/auth' -export const Route = createRootRoute({ - headers: () => ({ 'Cache-Control': 'private, no-store' }), - beforeLoad: async () => ({ user: await getCurrentUserFn() }), - component: Outlet, - shellComponent: RootDocument, -}) +type User = { + id: string + email: string + role: string +} + +type AuthContextType = { + user: User | null + isLoading: boolean + refetch: () => void +} + +const AuthContext = createContext(undefined) + +export function AuthProvider(props) { + const { data: user, isLoading, refetch } = useServerFn(getCurrentUserFn) -function RootDocument({ children }: { children: JSX.Element }) { return ( - - - - - - {children} - - - + + {props.children} + ) } -``` -The root includes session-specific data, so its responses use `Cache-Control: private, no-store`. Keep that policy on child routes that render this data, and do not override it with public caching at your CDN. - -Read that state from a descendant component: - -```tsx -// components/AuthStatus.tsx -import { Route } from '../routes/__root' - -export function AuthStatus() { - const context = Route.useRouteContext() - return {context().user?.email ?? 'Signed out'} +export function useAuth() { + const context = useContext(AuthContext) + if (!context) { + throw new Error('useAuth must be used within AuthProvider') + } + return context } ``` -After login or logout changes the session, call `await router.invalidate()` to reload the current user and rerun route guards. Keep private-data authorization in the server function itself, even when a route already checks the user. - ### 4. Route Protection Protect routes using `beforeLoad`: @@ -273,9 +240,8 @@ export const registerFn = createServerFn({ method: 'POST' }) }) // Create session - const session = await getAppSession() - session.userId = user.id - await session.save() + const session = await useAppSession() + await session.update({ userId: user.id }) return { success: true, user: { id: user.id, email: user.email } } }) @@ -343,9 +309,8 @@ export const initiateOAuthFn = createServerFn({ method: 'POST' }) const state = generateRandomState() // Store state in session for CSRF protection - const session = await getAppSession() - session.oauthState = state - await session.save() + const session = await useAppSession() + await session.update({ oauthState: state }) // Generate OAuth URL const authUrl = generateOAuthUrl(provider, state) @@ -408,9 +373,21 @@ const hashedPassword = await bcrypt.hash(password, saltRounds) ### 2. Session Security -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. +```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 + }, + }) +} +``` ### 3. Rate Limiting @@ -512,70 +489,28 @@ describe('Authentication Flow', () => { ### Loading States -Call the function returned by `useServerFn` with `{ data }`. Track pending state in the component, handle invalid credentials, and refresh route context after a successful login. This form uses the `loginFn` from the server-functions example above. It requires JavaScript, so the fields stay disabled until hydration; `method="post"` also prevents credentials appearing in a native GET submission. - ```tsx -// components/LoginForm.tsx -import { createSignal } from 'solid-js' -import { useHydrated, useRouter } from '@tanstack/solid-router' -import { useServerFn } from '@tanstack/solid-start' -import { loginFn } from '../server/auth' - -export function LoginForm() { - const hydrated = useHydrated() +function LoginForm() { const [isLoading, setIsLoading] = createSignal(false) - const [error, setError] = createSignal('') - const login = useServerFn(loginFn) - const router = useRouter() - - const handleSubmit = async ( - event: SubmitEvent & { currentTarget: HTMLFormElement }, - ) => { - event.preventDefault() - const formData = new FormData(event.currentTarget) - const email = formData.get('email') - const password = formData.get('password') - if (typeof email !== 'string' || typeof password !== 'string') { - return - } + const loginMutation = useServerFn(loginFn) + const handleSubmit = async (data: LoginData) => { setIsLoading(true) - setError('') try { - const result = await login({ data: { email, password } }) - if (result?.error) { - setError(result.error) - return - } - await router.invalidate() - } catch { - setError('Login failed. Please try again.') + await loginMutation.mutate(data) + } catch (error) { + // Handle error } finally { setIsLoading(false) } } return ( -
-
- - - -
-

{error()}

+ + {/* Form fields */} +
) } @@ -590,14 +525,16 @@ 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 ttl = data.rememberMe ? 30 * 24 * 60 * 60 : 8 * 60 * 60 - const session = await getAppSession(ttl) - session.userId = user.id - await session.save() + 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 + }, + ) return { success: true } }) @@ -617,6 +554,7 @@ 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/guide/client-entry-point.md b/docs/start/framework/solid/guide/client-entry-point.md index 929efc7a2d..b73408e8e4 100644 --- a/docs/start/framework/solid/guide/client-entry-point.md +++ b/docs/start/framework/solid/guide/client-entry-point.md @@ -3,6 +3,8 @@ id: client-entry-point title: Client Entry Point --- +# Client Entry Point + > [!NOTE] > The client entry point is **optional** out of the box. If not provided, TanStack Start will automatically handle the client entry point for you using the below as a default. diff --git a/docs/start/framework/solid/guide/reading-writing-file.md b/docs/start/framework/solid/guide/reading-writing-file.md new file mode 100644 index 0000000000..5aa48d8188 --- /dev/null +++ b/docs/start/framework/solid/guide/reading-writing-file.md @@ -0,0 +1,5 @@ +--- +ref: docs/start/framework/react/guide/reading-writing-file.md +replace: + { '@tanstack/react-start': '@tanstack/solid-start', 'React': 'SolidJS' } +--- diff --git a/docs/start/framework/solid/migrate-from-release-candidate.md b/docs/start/framework/solid/migrate-from-release-candidate.md deleted file mode 100644 index 9f988a14fc..0000000000 --- a/docs/start/framework/solid/migrate-from-release-candidate.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -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/docs/start/framework/solid/tutorial/reading-writing-file.md b/docs/start/framework/solid/tutorial/reading-writing-file.md index 09b58c38f5..de3d4d472e 100644 --- a/docs/start/framework/solid/tutorial/reading-writing-file.md +++ b/docs/start/framework/solid/tutorial/reading-writing-file.md @@ -1,8 +1,6 @@ --- id: reading-and-writing-file title: Building a Full Stack DevJokes App with TanStack Start -redirect_from: - - /framework/solid/guide/reading-writing-file --- This tutorial will guide you through building a complete full-stack application using TanStack Start. You'll create a DevJokes app where users can view and add developer-themed jokes, demonstrating key concepts of TanStack Start including server functions, file-based data storage, and Solid components. @@ -154,7 +152,7 @@ export type JokesData = Joke[] ### Step 1.3: Create Server Functions to Read the File -Let's create a new file `src/serverActions/jokesActions.ts` to create a server function to perform a read-write operation. We will be creating a server function using [`createServerFn`](https://tanstack.com/start/latest/docs/framework/solid/guide/server-functions). +Let's create a new file `src/serverActions/jokesActions.ts` to create a server function to perform a read-write operation. We will be creating a server function using [`createServerFn`](https://tanstack.com/start/latest/docs/framework/solid/server-functions). ```tsx // src/serverActions/jokesActions.ts diff --git a/e2e/AGENTS.md b/e2e/AGENTS.md deleted file mode 100644 index f373ecba4f..0000000000 --- a/e2e/AGENTS.md +++ /dev/null @@ -1,9 +0,0 @@ -# E2E tests - -- Read the project's `package.json` and test config. Inspect resolved targets with `CI=1 NX_DAEMON=false pnpm nx show project --json`: `nx.metadata.playwrightModes` generates modes, variants, and shards. The aggregate `test:e2e` can also run extra package-script suites. For focused Playwright runs, select an executable test target (a mode/shard target when inferred) and append filters after `--` (e.g. `-- tests/navigation.spec.ts --grep "redirect"`). -- Check Playwright's `webServer.command` to select dev or production coverage. A mode named `ssr` can still start a dev server. `e2e/eslint-plugin-start` uses Vitest instead of Playwright. -- For inferred Playwright modes, Nx builds first and supplies `MODE`, `E2E_TOOLCHAIN`, `E2E_DIST_DIR`, and `E2E_PORT_KEY`. Preserve these in server/config changes; let Nx own the build while `webServer.command` only starts the selected server. Target generation lives in [`scripts/nx/playwright-plugin.ts`](../scripts/nx/playwright-plugin.ts). -- Use the same `E2E_PORT_KEY`-aware key throughout config, app, and dummy-server setup/teardown. Clean only that key's port files, before allocation, when `TEST_WORKER_INDEX === undefined`; worker config reloads must not remap a running server's port. -- For new browser tests, reuse the local error-checking fixture. The shared `test` from `@tanstack/router-e2e-utils` fails on unexpected `console.error`, including hydration errors; allow only expected errors with `whitelistErrors`. -- HMR/watch tests edit real app sources. Reuse existing edit/restore helpers such as `createHmrFileEditor`, restore edits in teardown even after failures, and preserve the suites' single-worker and Nx `parallelism: false` settings. -- `@tanstack/router-e2e-utils:test:unit` is a placeholder. Validate helper changes through consuming e2e projects. diff --git a/e2e/e2e-utils/mock-api.mjs b/e2e/e2e-utils/mock-api.mjs deleted file mode 100644 index f92ec840e5..0000000000 --- a/e2e/e2e-utils/mock-api.mjs +++ /dev/null @@ -1,4 +0,0 @@ -import { setupServer } from 'msw/node' -import { apiHandlers } from './src/api-handlers.ts' - -setupServer(...apiHandlers).listen({ onUnhandledRequest: 'bypass' }) diff --git a/e2e/e2e-utils/package.json b/e2e/e2e-utils/package.json index fcfa5f8dc0..127f9a01f2 100644 --- a/e2e/e2e-utils/package.json +++ b/e2e/e2e-utils/package.json @@ -5,7 +5,7 @@ "clean": "rimraf ./dist && rimraf ./coverage", "build": "vite build", "test:eslint": "eslint ./src", - "test:unit": "vitest run" + "test:unit": "exit 0; vitest --typecheck" }, "type": "module", "types": "dist/types/index.d.ts", @@ -22,8 +22,7 @@ "default": "./dist/cjs/index.cjs" } }, - "./package.json": "./package.json", - "./mock-api": "./mock-api.mjs" + "./package.json": "./package.json" }, "sideEffects": false, "files": [ @@ -31,14 +30,13 @@ "src" ], "engines": { - "node": "^22.18.0 || >=24.0.0" + "node": ">=20.19" }, + "dependencies": {}, "devDependencies": { - "@msw/playwright": "0.6.7", - "msw": "2.15.0", - "rimraf": "catalog:", + "get-port-please": "^3.2.0", "vite": "^8.0.14", "vite-plugin-dts": "^4.5.4", - "vitest": "catalog:" + "rimraf": "catalog:" } } diff --git a/e2e/e2e-utils/src/api-fixture.ts b/e2e/e2e-utils/src/api-fixture.ts deleted file mode 100644 index 90ca1912a3..0000000000 --- a/e2e/e2e-utils/src/api-fixture.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { test as base } from '@playwright/test' -import { defineNetworkFixture } from '@msw/playwright' -import { apiHandlers } from './api-handlers' - -// Opt in only for suites that consume the canned API. Playwright routing -// disables HTTP caching; other suites keep their normal browser behavior. -export const apiTest = base.extend<{ mockApi: void }>({ - mockApi: [ - async ({ context }, use) => { - const network = defineNetworkFixture({ context, handlers: apiHandlers }) - await network.enable() - await use() - await network.disable() - }, - { auto: true }, - ], -}) diff --git a/e2e/e2e-utils/src/api-handlers.ts b/e2e/e2e-utils/src/api-handlers.ts deleted file mode 100644 index 4e2c0498f4..0000000000 --- a/e2e/e2e-utils/src/api-handlers.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { HttpResponse, http } from 'msw' -import { posts } from './posts.ts' -import { users } from './users.ts' - -export const apiHandlers = [ - ...Object.entries({ posts, users }).flatMap(([resource, data]) => [ - http.get(`https://jsonplaceholder.typicode.com/${resource}`, () => - HttpResponse.json(data), - ), - http.get( - `https://jsonplaceholder.typicode.com/${resource}/:id`, - ({ params }) => { - const id = parseInt(String(params.id)) - if (Number.isNaN(id)) { - return HttpResponse.json( - { error: `invalid ${resource.slice(0, -1)} id` }, - { status: 404 }, - ) - } - const item = data.find((entry) => entry.id === id) - return item - ? HttpResponse.json(item) - : new HttpResponse(null, { - headers: { 'content-type': 'application/json' }, - }) - }, - ), - ]), - http.all('https://jsonplaceholder.typicode.com/*', () => - HttpResponse.error(), - ), -] diff --git a/e2e/e2e-utils/src/derivePort.ts b/e2e/e2e-utils/src/derivePort.ts new file mode 100644 index 0000000000..3ecb86cb53 --- /dev/null +++ b/e2e/e2e-utils/src/derivePort.ts @@ -0,0 +1,27 @@ +import fs from 'node:fs' +import { getRandomPort } from 'get-port-please' + +/** + * Check if a port has been allocated, if it hasn't generate a random port and save it. + * @param {string} input - port test allocation + * @returns {number} A random port. + */ +export async function derivePort(input: string): Promise { + const portFile = `port-${input}.txt` + + if (!fs.existsSync(portFile)) { + fs.writeFileSync(portFile, (await getRandomPort()).toString()) + } + + const portNumber = parseInt(await fs.promises.readFile(portFile, 'utf-8')) + console.info(`Mapped "${input}" to port ${portNumber}`) + return portNumber +} + +export async function getDummyServerPort(input: string): Promise { + return await derivePort(`${input}-external`) +} + +export async function getTestServerPort(input: string): Promise { + return await derivePort(input) +} diff --git a/e2e/e2e-utils/src/e2eSetupTeardown.ts b/e2e/e2e-utils/src/e2eSetupTeardown.ts new file mode 100644 index 0000000000..d1acf4740e --- /dev/null +++ b/e2e/e2e-utils/src/e2eSetupTeardown.ts @@ -0,0 +1,16 @@ +import { localDummyServer } from './localDummyServer' +import { getDummyServerPort } from './derivePort' + +export async function e2eStartDummyServer(input: string) { + const port = await getDummyServerPort(input) + + return await localDummyServer(port) +} + +export async function e2eStopDummyServer(input: string) { + const port = await getDummyServerPort(input) + + await fetch(`http://localhost:${port}/stop`, { + method: 'POST', + }) +} diff --git a/e2e/e2e-utils/src/index.ts b/e2e/e2e-utils/src/index.ts index 960a01a9be..17e58f82e5 100644 --- a/e2e/e2e-utils/src/index.ts +++ b/e2e/e2e-utils/src/index.ts @@ -1,9 +1,10 @@ -export { apiTest } from './api-fixture' +export { derivePort, getDummyServerPort, getTestServerPort } from './derivePort' +export { localDummyServer } from './localDummyServer' +export { toRuntimePath } from './to-runtime-path' +export { resolveRuntimeSuffix } from './resolve-runtime-suffix' +export { e2eStartDummyServer, e2eStopDummyServer } from './e2eSetupTeardown' export { preOptimizeDevServer, waitForServer } from './devServerWarmup' -export { collectBrowserErrors, test } from './fixture' export { createHmrFileEditor, replaceAll } from './hmrFileEditor' export type { HmrFileEditorOptions } from './hmrFileEditor' export type { Post } from './posts' -export { resolveRuntimeSuffix } from './resolve-runtime-suffix' -export { toRuntimePath } from './to-runtime-path' -export { appServerReady, appServerReadyPattern } from './webServer' +export { collectBrowserErrors, test } from './fixture' diff --git a/e2e/e2e-utils/src/localDummyServer.ts b/e2e/e2e-utils/src/localDummyServer.ts new file mode 100644 index 0000000000..d452f54c59 --- /dev/null +++ b/e2e/e2e-utils/src/localDummyServer.ts @@ -0,0 +1,128 @@ +import http from 'node:http' +import { posts } from './posts' +import { users } from './users' + +// some tests redirect to an external host +// however, in CI this is unstable due to network conditions +// so here we spawn a local server to simulate the external host + +export async function localDummyServer(port: number) { + const server = http.createServer((req, res) => { + // Set CORS headers + res.setHeader('Access-Control-Allow-Origin', '*') + res.setHeader('Access-Control-Request-Method', '*') + res.setHeader('Access-Control-Allow-Methods', 'OPTIONS, GET, POST') + res.setHeader('Access-Control-Allow-Headers', '*') + + if (req.method === 'OPTIONS') { + res.writeHead(200) + res.end() + return + } + }) + + server.on('request', (req, res) => { + const url = new URL(req.url!, 'http://localhost') + + if (res.req.method === 'GET' && url.pathname === '/') { + res.writeHead(200, { 'Content-Type': 'text/html' }) + res.end('Hello World') + } + }) + + server.on('request', (req, res) => { + const url = new URL(req.url!, `http://localhost`) + + if (res.req.method === 'POST' && url.pathname === '/stop') { + server.close() + console.info( + `stopped local dummy server running at http://localhost:${port}`, + ) + + res.writeHead(200) + res.end() + } + }) + + server.on('request', (req, res) => { + const url = new URL(req.url ?? '/', `http://localhost`) + + if (req.method === 'GET' && url.pathname.startsWith('/posts')) { + const parts = url.pathname.split('/') + + if (parts.length === 2) { + res.writeHead(200, { 'content-type': 'application/json' }) + res.end(JSON.stringify(posts)) + return + } + + if (parts[2]) { + const postId = parseInt(parts[2]) + + if (isNaN(postId)) { + res.writeHead(404) + res.end(JSON.stringify({ error: 'invalid post id' })) + return + } + + const post = posts.find((post) => post.id === postId) + + res.writeHead(200, { 'content-type': 'application/json' }) + res.end(JSON.stringify(post)) + return + } + + res.writeHead(404) + res.end(JSON.stringify({ error: 'invalid posts path' })) + return + } + }) + + server.on('request', (req, res) => { + const url = new URL(req.url ?? '/', `http://localhost`) + + if (req.method === 'GET' && url.pathname.startsWith('/users')) { + const parts = url.pathname.split('/') + + if (parts.length === 2) { + res.writeHead(200, { 'content-type': 'application/json' }) + res.end(JSON.stringify(users)) + return + } + + if (parts[2]) { + const userId = parseInt(parts[2]) + + if (isNaN(userId)) { + res.writeHead(404) + res.end(JSON.stringify({ error: 'invalid user id' })) + return + } + + const user = users.find((user) => user.id === userId) + + res.writeHead(200, { 'content-type': 'application/json' }) + res.end(JSON.stringify(user)) + return + } + + res.writeHead(404) + res.end(JSON.stringify({ error: 'invalid users path' })) + return + } + }) + + const startServer = new Promise((resolve) => { + server.listen(port, 'localhost', () => { + console.info( + `started local dummy server running at http://localhost:${port}`, + ) + resolve() + }) + }) + + await startServer + + await new Promise((r) => setTimeout(r, 500)) + return server +} diff --git a/e2e/e2e-utils/src/webServer.ts b/e2e/e2e-utils/src/webServer.ts deleted file mode 100644 index 77536e4c69..0000000000 --- a/e2e/e2e-utils/src/webServer.ts +++ /dev/null @@ -1,9 +0,0 @@ -// Vite, Rsbuild, srvx, serve, and the custom E2E servers print their bound -// address only after listening. Playwright exports named captures to workers. -export const appServerReadyPattern = - /(?:Local:|Listening on|Accepting connections at|E2E app:)[^\n]*?https?:\/\/(?:localhost|127\.0\.0\.1|\[::\]):(?\d+)/ - -export const appServerReady = { - stdout: appServerReadyPattern, - stderr: appServerReadyPattern, -} diff --git a/e2e/e2e-utils/tests/mock-api.test.ts b/e2e/e2e-utils/tests/mock-api.test.ts deleted file mode 100644 index ba25c1254d..0000000000 --- a/e2e/e2e-utils/tests/mock-api.test.ts +++ /dev/null @@ -1,53 +0,0 @@ -import { execFile } from 'node:child_process' -import { promisify } from 'node:util' -import { fileURLToPath } from 'node:url' -import { expect, test } from 'vitest' - -const execFileAsync = promisify(execFile) -const preload = fileURLToPath(new URL('../mock-api.mjs', import.meta.url)) - -test('independent Node processes mock the API with networking disabled', async () => { - const script = ` - const { Socket } = await import('node:net') - Socket.prototype.connect = () => { throw new Error('Network disabled') } - const posts = await fetch('https://jsonplaceholder.typicode.com/posts').then(r => r.json()) - const user = await fetch('https://jsonplaceholder.typicode.com/users/1').then(r => r.json()) - const invalid = await fetch('https://jsonplaceholder.typicode.com/posts/invalid') - const missing = await fetch('https://jsonplaceholder.typicode.com/posts/999') - console.log(JSON.stringify({ post: posts[0].id, user: user.id, invalid: invalid.status, missing: await missing.text() })) - ` - const results = await Promise.all( - [0, 1].map(() => - execFileAsync(process.execPath, ['--import', preload, '--eval', script]), - ), - ) - for (const result of results) { - expect(JSON.parse(result.stdout)).toEqual({ - post: 1, - user: 1, - invalid: 404, - missing: '', - }) - } -}) - -test('unhandled API requests fail without reaching the network', async () => { - const script = ` - const { Socket } = await import('node:net') - let connections = 0 - Socket.prototype.connect = () => { connections++; throw new Error('Network disabled') } - try { - await fetch('https://jsonplaceholder.typicode.com/unhandled') - process.exitCode = 1 - } catch { - console.log(JSON.stringify({ connections })) - } - ` - const result = await execFileAsync(process.execPath, [ - '--import', - preload, - '--eval', - script, - ]) - expect(JSON.parse(result.stdout)).toEqual({ connections: 0 }) -}) diff --git a/e2e/e2e-utils/tests/webServer.test.ts b/e2e/e2e-utils/tests/webServer.test.ts deleted file mode 100644 index fd3a8b239c..0000000000 --- a/e2e/e2e-utils/tests/webServer.test.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { stripVTControlCharacters } from 'node:util' -import { expect, test } from 'vitest' -import { appServerReadyPattern } from '../src/webServer' - -test.each([ - '➜ Local: http://localhost:49152/', - '\u001b[32m➜\u001b[39m \u001b[1mLocal\u001b[22m: \u001b[36mhttp://localhost:\u001b[1m49152\u001b[22m/\u001b[39m', - 'Listening on http://[::]:49152', - 'E2E app: http://localhost:49152', - 'Accepting connections at http://localhost:49152', - 'Local: https://localhost:49152/', -])('captures a bound application port from %s', (line) => { - expect( - appServerReadyPattern.exec(stripVTControlCharacters(line))?.groups - ?.E2E_APP_PORT, - ).toBe('49152') -}) - -test('does not confuse an arbitrary URL with app readiness', () => { - expect(appServerReadyPattern.test('fetching http://localhost:49152')).toBe( - false, - ) -}) diff --git a/e2e/e2e-utils/tsconfig.json b/e2e/e2e-utils/tsconfig.json index 5561f5d28f..9b21ee123b 100644 --- a/e2e/e2e-utils/tsconfig.json +++ b/e2e/e2e-utils/tsconfig.json @@ -1,7 +1,4 @@ { "extends": "../../tsconfig.json", - "include": ["src", "vite.config.ts", "tests"], - "compilerOptions": { - "rewriteRelativeImportExtensions": true - } + "include": ["src", "vite.config.ts", "tests"] } diff --git a/e2e/react-router/basepath-file-based/package.json b/e2e/react-router/basepath-file-based/package.json index 3dfbb58180..a155cc2173 100644 --- a/e2e/react-router/basepath-file-based/package.json +++ b/e2e/react-router/basepath-file-based/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", diff --git a/e2e/react-router/basepath-file-based/playwright.config.ts b/e2e/react-router/basepath-file-based/playwright.config.ts index 4eead86444..6069bbe59f 100644 --- a/e2e/react-router/basepath-file-based/playwright.config.ts +++ b/e2e/react-router/basepath-file-based/playwright.config.ts @@ -1,7 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -12,15 +17,18 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `pnpm build && pnpm preview --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/react-router/basepath-file-based/tests/scroll-restoration-session-storage-error.test.ts b/e2e/react-router/basepath-file-based/tests/scroll-restoration-session-storage-error.test.ts index d6a50de840..06b90f6528 100644 --- a/e2e/react-router/basepath-file-based/tests/scroll-restoration-session-storage-error.test.ts +++ b/e2e/react-router/basepath-file-based/tests/scroll-restoration-session-storage-error.test.ts @@ -1,41 +1,5 @@ -import { expect } from '@playwright/test' -import { test } from '@tanstack/router-e2e-utils' -import type { Page } from '@playwright/test' - -async function reloadAfterStorageFailure(page: Page) { - const errors: Array = [] - page.on('pageerror', (error) => errors.push(error.message)) - const snapshot = await page.evaluate(async () => { - let failures = 0 - const setItem = Storage.prototype.setItem - Storage.prototype.setItem = function (...args) { - try { - return setItem.apply(this, args) - } catch (error) { - failures++ - throw error - } - } - const scrolled = new Promise((resolve) => - addEventListener('scroll', () => resolve(), { once: true }), - ) - scrollTo(0, 200) - await scrolled - // Handler integration; genuine reload handoff is covered by the Start suite. - dispatchEvent(new PageTransitionEvent('pagehide', { persisted: false })) - return { mode: history.scrollRestoration, failures } - }) - expect(snapshot.failures).toBeGreaterThan(0) - // Storage failure must still allow native fallback; failure to restore is not a requirement. - expect(snapshot.mode).toBe('auto') - await page.reload() - await page.waitForLoadState('networkidle') - await expect( - page.getByRole('heading', { name: 'Scroll Error Test' }), - ).toBeVisible() - expect(await page.evaluate(() => history.scrollRestoration)).toBe('manual') - expect(errors).toEqual([]) -} +/* eslint-disable */ +import { expect, test } from '@playwright/test' test.describe('Scroll Restoration with Session Storage Error', () => { test('should not crash when sessionStorage.setItem throws an error', async ({ @@ -45,12 +9,22 @@ test.describe('Scroll Restoration with Session Storage Error', () => { await page.waitForLoadState('networkidle') await page.evaluate(() => { - Storage.prototype.setItem = () => { + sessionStorage.setItem = () => { throw new Error('Test Error') } }) - await reloadAfterStorageFailure(page) + await page.evaluate(() => window.scrollTo(0, 200)) + await page.waitForTimeout(150) + + await page.reload() + await page.waitForLoadState('networkidle') + + const heading = page.locator('h1:has-text("Scroll Error Test")') + await expect(heading).toBeVisible() + + const scrollPosition = await page.evaluate(() => window.scrollY) + expect(scrollPosition).not.toBe(200) }) test('should not crash when sessionStorage quota is exceeded', async ({ @@ -73,6 +47,16 @@ test.describe('Scroll Restoration with Session Storage Error', () => { } }) - await reloadAfterStorageFailure(page) + await page.evaluate(() => window.scrollTo(0, 200)) + await page.waitForTimeout(150) + + await page.reload() + await page.waitForLoadState('networkidle') + + const heading = page.locator('h1:has-text("Scroll Error Test")') + await expect(heading).toBeVisible() + + const scrollPosition = await page.evaluate(() => window.scrollY) + expect(scrollPosition).not.toBe(200) }) }) diff --git a/e2e/react-router/basepath-file-based/tests/setup/global.setup.ts b/e2e/react-router/basepath-file-based/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/react-router/basepath-file-based/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/react-router/basepath-file-based/tests/setup/global.teardown.ts b/e2e/react-router/basepath-file-based/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/react-router/basepath-file-based/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/react-router/basic-esbuild-file-based/package.json b/e2e/react-router/basic-esbuild-file-based/package.json index 59210c24d7..9421e4666c 100644 --- a/e2e/react-router/basic-esbuild-file-based/package.json +++ b/e2e/react-router/basic-esbuild-file-based/package.json @@ -7,7 +7,7 @@ "build": "esbuild src/main.tsx --bundle --outfile=dist/main.js && tsc --noEmit", "serve": "esbuild src/main.tsx --bundle --outfile=dist/main.js --servedir=.", "start": "dev", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", diff --git a/e2e/react-router/basic-esbuild-file-based/playwright.config.ts b/e2e/react-router/basic-esbuild-file-based/playwright.config.ts index a38252921f..ca0fb7a1da 100644 --- a/e2e/react-router/basic-esbuild-file-based/playwright.config.ts +++ b/e2e/react-router/basic-esbuild-file-based/playwright.config.ts @@ -1,8 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' - -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -13,15 +17,18 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `pnpm run build && pnpm run serve --serve=${PORT} --define:process.env.NODE_ENV=\\"test\\"`, - wait: appServerReady, - reuseExistingServer: false, + command: `pnpm run build && pnpm run serve --serve=${PORT} --define:process.env.NODE_ENV=\\"test\\" --define:process.env.EXTERNAL_PORT="${EXTERNAL_PORT}"`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, 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 954ddc026f..5f0f4fce03 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,5 +2,9 @@ import { tanstackRouter } from '@tanstack/router-plugin/esbuild' export default { // ... - plugins: [tanstackRouter()], + plugins: [ + tanstackRouter({ + autoCodeSplitting: true, + }), + ], } diff --git a/e2e/react-router/basic-esbuild-file-based/src/posts.tsx b/e2e/react-router/basic-esbuild-file-based/src/posts.tsx index 97c96d77eb..8f74b8c9aa 100644 --- a/e2e/react-router/basic-esbuild-file-based/src/posts.tsx +++ b/e2e/react-router/basic-esbuild-file-based/src/posts.tsx @@ -7,7 +7,11 @@ export type PostType = { body: string } -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (process.env.NODE_ENV === 'test') { + queryURL = `http://localhost:${process.env.EXTERNAL_PORT}` +} export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/react-router/basic-esbuild-file-based/tests/app.spec.ts b/e2e/react-router/basic-esbuild-file-based/tests/app.spec.ts index c52191a7d4..7b322a8b1d 100644 --- a/e2e/react-router/basic-esbuild-file-based/tests/app.spec.ts +++ b/e2e/react-router/basic-esbuild-file-based/tests/app.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/react-router/basic-esbuild-file-based/tests/setup/global.setup.ts b/e2e/react-router/basic-esbuild-file-based/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/react-router/basic-esbuild-file-based/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/react-router/basic-esbuild-file-based/tests/setup/global.teardown.ts b/e2e/react-router/basic-esbuild-file-based/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/react-router/basic-esbuild-file-based/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/react-router/basic-file-based-code-splitting/package.json b/e2e/react-router/basic-file-based-code-splitting/package.json index 82ebb90e93..8355ed79ab 100644 --- a/e2e/react-router/basic-file-based-code-splitting/package.json +++ b/e2e/react-router/basic-file-based-code-splitting/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/react-router/basic-file-based-code-splitting/playwright.config.ts b/e2e/react-router/basic-file-based-code-splitting/playwright.config.ts index 4eead86444..22c9bdcd7e 100644 --- a/e2e/react-router/basic-file-based-code-splitting/playwright.config.ts +++ b/e2e/react-router/basic-file-based-code-splitting/playwright.config.ts @@ -1,7 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -12,15 +17,18 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `pnpm build && pnpm preview --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && pnpm preview --port ${PORT}`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/react-router/basic-file-based-code-splitting/src/posts.tsx b/e2e/react-router/basic-file-based-code-splitting/src/posts.tsx index 97c96d77eb..ae7142c5b6 100644 --- a/e2e/react-router/basic-file-based-code-splitting/src/posts.tsx +++ b/e2e/react-router/basic-file-based-code-splitting/src/posts.tsx @@ -7,7 +7,11 @@ export type PostType = { body: string } -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/react-router/basic-file-based-code-splitting/tests/app.spec.ts b/e2e/react-router/basic-file-based-code-splitting/tests/app.spec.ts index fbf093cd51..3e5a69ccaa 100644 --- a/e2e/react-router/basic-file-based-code-splitting/tests/app.spec.ts +++ b/e2e/react-router/basic-file-based-code-splitting/tests/app.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/react-router/basic-file-based-code-splitting/tests/preload.spec.ts b/e2e/react-router/basic-file-based-code-splitting/tests/preload.spec.ts index fd17fcc47b..0bc3265760 100644 --- a/e2e/react-router/basic-file-based-code-splitting/tests/preload.spec.ts +++ b/e2e/react-router/basic-file-based-code-splitting/tests/preload.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/react-router/basic-file-based-code-splitting/tests/setup/global.setup.ts b/e2e/react-router/basic-file-based-code-splitting/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/react-router/basic-file-based-code-splitting/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/react-router/basic-file-based-code-splitting/tests/setup/global.teardown.ts b/e2e/react-router/basic-file-based-code-splitting/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/react-router/basic-file-based-code-splitting/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/react-router/basic-file-based-code-splitting/tests/shared-bindings.spec.ts b/e2e/react-router/basic-file-based-code-splitting/tests/shared-bindings.spec.ts index 2ad4ec3e78..512943c10d 100644 --- a/e2e/react-router/basic-file-based-code-splitting/tests/shared-bindings.spec.ts +++ b/e2e/react-router/basic-file-based-code-splitting/tests/shared-bindings.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/react-router/basic-file-based/package.json b/e2e/react-router/basic-file-based/package.json index 0f3d243432..9868755b87 100644 --- a/e2e/react-router/basic-file-based/package.json +++ b/e2e/react-router/basic-file-based/package.json @@ -9,7 +9,7 @@ "preview": "vite preview", "start": "vite", "test:e2e": "pnpm run test:e2e:default", - "test:e2e:default": "playwright test --project=chromium" + "test:e2e:default": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/react-router/basic-file-based/playwright.config.ts b/e2e/react-router/basic-file-based/playwright.config.ts index ea3ef9ffec..6e4e1d7703 100644 --- a/e2e/react-router/basic-file-based/playwright.config.ts +++ b/e2e/react-router/basic-file-based/playwright.config.ts @@ -1,9 +1,14 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` -const command = `pnpm build && pnpm preview --host 0.0.0.0 --port ${PORT}` +const command = `pnpm build && pnpm preview --port ${PORT}` console.info('Running with mode: ', process.env.MODE || 'default') @@ -16,6 +21,9 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, @@ -23,12 +31,15 @@ export default defineConfig({ webServer: { command, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', env: { MODE: process.env.MODE || '', VITE_MODE: process.env.MODE || '', + VITE_NODE_ENV: 'test', + VITE_EXTERNAL_PORT: String(EXTERNAL_PORT), + VITE_SERVER_PORT: String(PORT), PORT: String(PORT), }, }, diff --git a/e2e/react-router/basic-file-based/public/external.html b/e2e/react-router/basic-file-based/public/external.html deleted file mode 100644 index 3b4062b778..0000000000 --- a/e2e/react-router/basic-file-based/public/external.html +++ /dev/null @@ -1,9 +0,0 @@ - - - - External destination - - - Hello World - - diff --git a/e2e/react-router/basic-file-based/src/main.tsx b/e2e/react-router/basic-file-based/src/main.tsx index d6a5aef382..f16505bf21 100644 --- a/e2e/react-router/basic-file-based/src/main.tsx +++ b/e2e/react-router/basic-file-based/src/main.tsx @@ -27,7 +27,9 @@ const router = createRouter({ rewrite: { output: ({ url }) => { if (url.pathname === '/document-navigation-target') { - return new URL(`http://127.0.0.1:${window.location.port}/external.html`) + return new URL( + `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}/`, + ) } return url }, diff --git a/e2e/react-router/basic-file-based/src/posts.tsx b/e2e/react-router/basic-file-based/src/posts.tsx index 97c96d77eb..ae7142c5b6 100644 --- a/e2e/react-router/basic-file-based/src/posts.tsx +++ b/e2e/react-router/basic-file-based/src/posts.tsx @@ -7,7 +7,11 @@ export type PostType = { body: string } -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) 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 83b504992f..0d17f94eb0 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-file-based/src/routes/document-navigation.tsx b/e2e/react-router/basic-file-based/src/routes/document-navigation.tsx index 66c2b704d1..65c43d8809 100644 --- a/e2e/react-router/basic-file-based/src/routes/document-navigation.tsx +++ b/e2e/react-router/basic-file-based/src/routes/document-navigation.tsx @@ -5,7 +5,7 @@ export const Route = createFileRoute('/document-navigation')({ component: DocumentNavigation, }) -const adminHref = `http://127.0.0.1:${window.location.port}/external.html` +const adminHref = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}/` function DocumentNavigation() { const navigate = Route.useNavigate() diff --git a/e2e/react-router/basic-file-based/tests/app.spec.ts b/e2e/react-router/basic-file-based/tests/app.spec.ts index bd9c365484..ae87d350ce 100644 --- a/e2e/react-router/basic-file-based/tests/app.spec.ts +++ b/e2e/react-router/basic-file-based/tests/app.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' import type { Page } from '@playwright/test' test.beforeEach(async ({ page }) => { diff --git a/e2e/react-router/basic-file-based/tests/document-navigation.spec.ts b/e2e/react-router/basic-file-based/tests/document-navigation.spec.ts index bd81eaa44b..80cb110e8a 100644 --- a/e2e/react-router/basic-file-based/tests/document-navigation.spec.ts +++ b/e2e/react-router/basic-file-based/tests/document-navigation.spec.ts @@ -1,8 +1,9 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' +import { getDummyServerPort } from '@tanstack/router-e2e-utils' +import packageJson from '../package.json' with { type: 'json' } -const appPort = Number(process.env.E2E_APP_PORT ?? 0) -const adminHref = `http://127.0.0.1:${appPort}/external.html` +const externalPort = await getDummyServerPort(packageJson.name) +const adminHref = `http://localhost:${externalPort}/` for (const role of ['button', 'link'] as const) { for (const { name, href, replace } of [ @@ -23,7 +24,7 @@ for (const role of ['button', 'link'] as const) { await page.goto('/') await page.goto('/document-navigation') const historyLength = await page.evaluate(() => window.history.length) - const response = page.waitForResponse(href.split('#')[0]) + const response = page.waitForResponse(href.split('#')[0]!) const control = page.getByRole(role, { name, exact: true }) if (role === 'link') { diff --git a/e2e/react-router/basic-file-based/tests/fullpath-types.spec.ts b/e2e/react-router/basic-file-based/tests/fullpath-types.spec.ts index 8f4df9f966..d1bd9c1c41 100644 --- a/e2e/react-router/basic-file-based/tests/fullpath-types.spec.ts +++ b/e2e/react-router/basic-file-based/tests/fullpath-types.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' test.describe('FullPath type/runtime match (Issues #4892, #2675, #6403)', () => { test.describe('Pathless layout routes should have parent fullPath, not empty string', () => { diff --git a/e2e/react-router/basic-file-based/tests/history-blocking.spec.ts b/e2e/react-router/basic-file-based/tests/history-blocking.spec.ts index df1f863a03..244456a2ab 100644 --- a/e2e/react-router/basic-file-based/tests/history-blocking.spec.ts +++ b/e2e/react-router/basic-file-based/tests/history-blocking.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' import type { Page } from '@playwright/test' async function prepareDocumentTraversal(page: Page, delta: number) { diff --git a/e2e/react-router/basic-file-based/tests/hover-preload-hash.spec.ts b/e2e/react-router/basic-file-based/tests/hover-preload-hash.spec.ts index 1263faf391..b090c2a6b7 100644 --- a/e2e/react-router/basic-file-based/tests/hover-preload-hash.spec.ts +++ b/e2e/react-router/basic-file-based/tests/hover-preload-hash.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' import { toRuntimePath } from '@tanstack/router-e2e-utils' test('clicking hash link then hovering another link does not scroll back to hash', async ({ diff --git a/e2e/react-router/basic-file-based/tests/mask.spec.ts b/e2e/react-router/basic-file-based/tests/mask.spec.ts index d5076a5854..1b77760de6 100644 --- a/e2e/react-router/basic-file-based/tests/mask.spec.ts +++ b/e2e/react-router/basic-file-based/tests/mask.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' test('route masks transform params and expose masked pathname in the browser (react)', async ({ page, diff --git a/e2e/react-router/basic-file-based/tests/non-nested-paths.spec.ts b/e2e/react-router/basic-file-based/tests/non-nested-paths.spec.ts index ea0e585c75..dccdfd4acf 100644 --- a/e2e/react-router/basic-file-based/tests/non-nested-paths.spec.ts +++ b/e2e/react-router/basic-file-based/tests/non-nested-paths.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' const testCases: Array<{ name: string diff --git a/e2e/react-router/basic-file-based/tests/open-redirect-prevention.spec.ts b/e2e/react-router/basic-file-based/tests/open-redirect-prevention.spec.ts index bbb2dac7a1..2f0fe256cd 100644 --- a/e2e/react-router/basic-file-based/tests/open-redirect-prevention.spec.ts +++ b/e2e/react-router/basic-file-based/tests/open-redirect-prevention.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' test.describe('Open redirect prevention', () => { test.describe('CRLF injection attacks', () => { diff --git a/e2e/react-router/basic-file-based/tests/params.spec.ts b/e2e/react-router/basic-file-based/tests/params.spec.ts index fa0377f3ca..a867696ff8 100644 --- a/e2e/react-router/basic-file-based/tests/params.spec.ts +++ b/e2e/react-router/basic-file-based/tests/params.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' import type { Page } from '@playwright/test' test.beforeEach(async ({ page }) => { diff --git a/e2e/react-router/basic-file-based/tests/redirect.spec.ts b/e2e/react-router/basic-file-based/tests/redirect.spec.ts index aaa9c1a6b6..1845cc16a4 100644 --- a/e2e/react-router/basic-file-based/tests/redirect.spec.ts +++ b/e2e/react-router/basic-file-based/tests/redirect.spec.ts @@ -1,13 +1,17 @@ import queryString from 'node:querystring' -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' import combinateImport from 'combinate' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from '../package.json' with { type: 'json' } // somehow playwright does not correctly import default exports const combinate = (combinateImport as any).default as typeof combinateImport -const PORT = Number(process.env.E2E_APP_PORT ?? 0) -const EXTERNAL_ORIGIN = `http://127.0.0.1:${PORT}` +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_HOST_PORT = await getDummyServerPort(packageJson.name) test.describe('redirects', () => { const internalNavigationTestMatrix = combinate({ @@ -35,7 +39,7 @@ test.describe('redirects', () => { const requestPromise = new Promise((resolve) => { page.on('request', (request) => { if ( - request.url() === 'https://jsonplaceholder.typicode.com/posts' + request.url() === `http://localhost:${EXTERNAL_HOST_PORT}/posts` ) { requestHappened = true resolve() @@ -104,7 +108,7 @@ test.describe('redirects', () => { await page.waitForLoadState('networkidle') const q = queryString.stringify({ - externalHost: `${EXTERNAL_ORIGIN}/`, + externalHost: `http://localhost:${EXTERNAL_HOST_PORT}/`, }) if (scenario === 'navigate') { @@ -114,7 +118,7 @@ test.describe('redirects', () => { await page.goto(`/redirect/external/via-${thrower}?${q}`) } - const url = `${EXTERNAL_ORIGIN}/` + const url = `http://localhost:${EXTERNAL_HOST_PORT}/` await page.waitForURL(url) expect(page.url()).toBe(url) @@ -180,7 +184,7 @@ test.describe('redirects', () => { page, }) => { const q = queryString.stringify({ - externalHost: `${EXTERNAL_ORIGIN}/`, + externalHost: `http://localhost:${EXTERNAL_HOST_PORT}/`, }) if (scenario === 'navigate') { @@ -193,7 +197,7 @@ test.describe('redirects', () => { ) } - const url = `${EXTERNAL_ORIGIN}/` + const url = `http://localhost:${EXTERNAL_HOST_PORT}/` await page.waitForURL(url) expect(page.url()).toBe(url) }) @@ -250,7 +254,7 @@ test.describe('redirects', () => { page, }) => { const q = queryString.stringify({ - externalHost: `${EXTERNAL_ORIGIN}/`, + externalHost: `http://localhost:${EXTERNAL_HOST_PORT}/`, }) if (scenario === 'navigate') { @@ -263,7 +267,7 @@ test.describe('redirects', () => { ) } - const url = `${EXTERNAL_ORIGIN}/` + const url = `http://localhost:${EXTERNAL_HOST_PORT}/` await page.waitForURL(url) expect(page.url()).toBe(url) }) diff --git a/e2e/react-router/basic-file-based/tests/relative.spec.ts b/e2e/react-router/basic-file-based/tests/relative.spec.ts index f62c248680..4850d3630d 100644 --- a/e2e/react-router/basic-file-based/tests/relative.spec.ts +++ b/e2e/react-router/basic-file-based/tests/relative.spec.ts @@ -1,11 +1,12 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' import combinateImport from 'combinate' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from '../package.json' with { type: 'json' } // somehow playwright does not correctly import default exports const combinate = (combinateImport as any).default as typeof combinateImport -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) test.describe('relative_routing', () => { const internalNavigationTestMatrix = combinate({ diff --git a/e2e/react-router/basic-file-based/tests/scroll-into-view.spec.ts b/e2e/react-router/basic-file-based/tests/scroll-into-view.spec.ts index 68dfededc2..d14c2d156b 100644 --- a/e2e/react-router/basic-file-based/tests/scroll-into-view.spec.ts +++ b/e2e/react-router/basic-file-based/tests/scroll-into-view.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' import type { Page } from '@playwright/test' const anchors = { diff --git a/e2e/react-router/basic-file-based/tests/search-params.spec.ts b/e2e/react-router/basic-file-based/tests/search-params.spec.ts index a99488a47a..d6307cbcf8 100644 --- a/e2e/react-router/basic-file-based/tests/search-params.spec.ts +++ b/e2e/react-router/basic-file-based/tests/search-params.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' test.describe('/search-params/default', () => { test('Directly visiting the route without search param set', async ({ diff --git a/e2e/react-router/basic-file-based/tests/setup/global.setup.ts b/e2e/react-router/basic-file-based/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/react-router/basic-file-based/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/react-router/basic-file-based/tests/setup/global.teardown.ts b/e2e/react-router/basic-file-based/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/react-router/basic-file-based/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/react-router/basic-react-query-file-based/package.json b/e2e/react-router/basic-react-query-file-based/package.json index 3a90a3cd6d..568313a6c3 100644 --- a/e2e/react-router/basic-react-query-file-based/package.json +++ b/e2e/react-router/basic-react-query-file-based/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/react-router/basic-react-query-file-based/playwright.config.ts b/e2e/react-router/basic-react-query-file-based/playwright.config.ts index fbda9bd451..f3083ff8b6 100644 --- a/e2e/react-router/basic-react-query-file-based/playwright.config.ts +++ b/e2e/react-router/basic-react-query-file-based/playwright.config.ts @@ -1,7 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -12,15 +17,17 @@ export default defineConfig({ workers: 1, reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `pnpm build && pnpm preview --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && pnpm preview --port ${PORT}`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/react-router/basic-react-query-file-based/src/posts.tsx b/e2e/react-router/basic-react-query-file-based/src/posts.tsx index 1f6cb8e308..1becc2c242 100644 --- a/e2e/react-router/basic-react-query-file-based/src/posts.tsx +++ b/e2e/react-router/basic-react-query-file-based/src/posts.tsx @@ -8,7 +8,11 @@ export type PostType = { export class PostNotFoundError extends Error {} -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/react-router/basic-react-query-file-based/tests/app.spec.ts b/e2e/react-router/basic-react-query-file-based/tests/app.spec.ts index 2b42d6d589..d80e8dada5 100644 --- a/e2e/react-router/basic-react-query-file-based/tests/app.spec.ts +++ b/e2e/react-router/basic-react-query-file-based/tests/app.spec.ts @@ -1,23 +1,24 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' +import { getDummyServerPort } from '@tanstack/router-e2e-utils' +import packageJson from '../package.json' with { type: 'json' } test.beforeEach(async ({ page }) => { await page.goto('/') }) -test('GetPosts with networking disabled', async ({ page, context }) => { - await page.goto('about:blank') - await context.setOffline(true) - const { status, posts, post } = await page.evaluate(async () => { - const response = await fetch('https://jsonplaceholder.typicode.com/posts') - const posts = await response.json() - const post = await fetch( - 'https://jsonplaceholder.typicode.com/posts/1', - ).then((r) => r.json()) - return { status: response.status, posts, post } - }) - expect(status).toBe(200) +test('GetPosts', async () => { + const port = await getDummyServerPort(packageJson.name) + const res = await fetch(`http://localhost:${port}/posts`) + + expect(res.status).toBe(200) + + const posts = await res.json() + expect(posts.length).toBeGreaterThan(0) + + const postRes = await fetch(`http://localhost:${port}/posts/1`) + expect(postRes.status).toBe(200) + const post = await postRes.json() expect(post).toEqual(posts[0]) }) diff --git a/e2e/react-router/basic-react-query-file-based/tests/setup/global.setup.ts b/e2e/react-router/basic-react-query-file-based/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/react-router/basic-react-query-file-based/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/react-router/basic-react-query-file-based/tests/setup/global.teardown.ts b/e2e/react-router/basic-react-query-file-based/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/react-router/basic-react-query-file-based/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/react-router/basic-react-query/package.json b/e2e/react-router/basic-react-query/package.json index 8f28340f56..a0af3b6c21 100644 --- a/e2e/react-router/basic-react-query/package.json +++ b/e2e/react-router/basic-react-query/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/react-router/basic-react-query/playwright.config.ts b/e2e/react-router/basic-react-query/playwright.config.ts index 4eead86444..ab42c7c607 100644 --- a/e2e/react-router/basic-react-query/playwright.config.ts +++ b/e2e/react-router/basic-react-query/playwright.config.ts @@ -1,7 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -12,15 +17,18 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `pnpm build && pnpm preview --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/react-router/basic-react-query/src/posts.ts b/e2e/react-router/basic-react-query/src/posts.ts index ffc5a274b7..5e2a2d3aa3 100644 --- a/e2e/react-router/basic-react-query/src/posts.ts +++ b/e2e/react-router/basic-react-query/src/posts.ts @@ -9,7 +9,11 @@ type PostType = { body: string } -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} const fetchPosts = async () => { console.info('Fetching posts...') diff --git a/e2e/react-router/basic-react-query/tests/app.spec.ts b/e2e/react-router/basic-react-query/tests/app.spec.ts index fbf093cd51..3e5a69ccaa 100644 --- a/e2e/react-router/basic-react-query/tests/app.spec.ts +++ b/e2e/react-router/basic-react-query/tests/app.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/react-router/basic-react-query/tests/setup/global.setup.ts b/e2e/react-router/basic-react-query/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/react-router/basic-react-query/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/react-router/basic-react-query/tests/setup/global.teardown.ts b/e2e/react-router/basic-react-query/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/react-router/basic-react-query/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/react-router/basic-scroll-restoration/package.json b/e2e/react-router/basic-scroll-restoration/package.json index c13e92cec8..2ddbafc37f 100644 --- a/e2e/react-router/basic-scroll-restoration/package.json +++ b/e2e/react-router/basic-scroll-restoration/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/react-router/basic-scroll-restoration/playwright.config.ts b/e2e/react-router/basic-scroll-restoration/playwright.config.ts index 6a684ac89e..0c5cee43e4 100644 --- a/e2e/react-router/basic-scroll-restoration/playwright.config.ts +++ b/e2e/react-router/basic-scroll-restoration/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,8 +20,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/react-router/basic-virtual-file-based/package.json b/e2e/react-router/basic-virtual-file-based/package.json index 0343de0846..65122dd2a7 100644 --- a/e2e/react-router/basic-virtual-file-based/package.json +++ b/e2e/react-router/basic-virtual-file-based/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/react-router/basic-virtual-file-based/playwright.config.ts b/e2e/react-router/basic-virtual-file-based/playwright.config.ts index 4eead86444..c5de6b5611 100644 --- a/e2e/react-router/basic-virtual-file-based/playwright.config.ts +++ b/e2e/react-router/basic-virtual-file-based/playwright.config.ts @@ -1,7 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -17,10 +22,13 @@ export default defineConfig({ baseURL, }, + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + webServer: { - command: `pnpm build && pnpm preview --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && pnpm preview --port ${PORT}`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/react-router/basic-virtual-file-based/src/posts.tsx b/e2e/react-router/basic-virtual-file-based/src/posts.tsx index cc3cb0f9c8..01831e335c 100644 --- a/e2e/react-router/basic-virtual-file-based/src/posts.tsx +++ b/e2e/react-router/basic-virtual-file-based/src/posts.tsx @@ -7,7 +7,11 @@ export type PostType = { body: string } -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/react-router/basic-virtual-file-based/tests/app.spec.ts b/e2e/react-router/basic-virtual-file-based/tests/app.spec.ts index fbf093cd51..3e5a69ccaa 100644 --- a/e2e/react-router/basic-virtual-file-based/tests/app.spec.ts +++ b/e2e/react-router/basic-virtual-file-based/tests/app.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/react-router/basic-virtual-file-based/tests/setup/global.setup.ts b/e2e/react-router/basic-virtual-file-based/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/react-router/basic-virtual-file-based/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/react-router/basic-virtual-file-based/tests/setup/global.teardown.ts b/e2e/react-router/basic-virtual-file-based/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/react-router/basic-virtual-file-based/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/react-router/basic-virtual-named-export-config-file-based/package.json b/e2e/react-router/basic-virtual-named-export-config-file-based/package.json index 6bdb1248f6..7738971eb6 100644 --- a/e2e/react-router/basic-virtual-named-export-config-file-based/package.json +++ b/e2e/react-router/basic-virtual-named-export-config-file-based/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/react-router/basic-virtual-named-export-config-file-based/playwright.config.ts b/e2e/react-router/basic-virtual-named-export-config-file-based/playwright.config.ts index 4eead86444..ab42c7c607 100644 --- a/e2e/react-router/basic-virtual-named-export-config-file-based/playwright.config.ts +++ b/e2e/react-router/basic-virtual-named-export-config-file-based/playwright.config.ts @@ -1,7 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -12,15 +17,18 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `pnpm build && pnpm preview --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/react-router/basic-virtual-named-export-config-file-based/src/posts.tsx b/e2e/react-router/basic-virtual-named-export-config-file-based/src/posts.tsx index 97c96d77eb..ae7142c5b6 100644 --- a/e2e/react-router/basic-virtual-named-export-config-file-based/src/posts.tsx +++ b/e2e/react-router/basic-virtual-named-export-config-file-based/src/posts.tsx @@ -7,7 +7,11 @@ export type PostType = { body: string } -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/react-router/basic-virtual-named-export-config-file-based/tests/app.spec.ts b/e2e/react-router/basic-virtual-named-export-config-file-based/tests/app.spec.ts index 7d2074182f..0aedada786 100644 --- a/e2e/react-router/basic-virtual-named-export-config-file-based/tests/app.spec.ts +++ b/e2e/react-router/basic-virtual-named-export-config-file-based/tests/app.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/react-router/basic-virtual-named-export-config-file-based/tests/setup/global.setup.ts b/e2e/react-router/basic-virtual-named-export-config-file-based/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/react-router/basic-virtual-named-export-config-file-based/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/react-router/basic-virtual-named-export-config-file-based/tests/setup/global.teardown.ts b/e2e/react-router/basic-virtual-named-export-config-file-based/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/react-router/basic-virtual-named-export-config-file-based/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/react-router/basic/package.json b/e2e/react-router/basic/package.json index 4ff68f5cda..6eba409188 100644 --- a/e2e/react-router/basic/package.json +++ b/e2e/react-router/basic/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", @@ -17,8 +17,7 @@ "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "catalog:", - "tailwindcss": "^4.2.2", - "zod": "catalog:" + "tailwindcss": "^4.2.2" }, "devDependencies": { "@playwright/test": "^1.61.0", diff --git a/e2e/react-router/basic/playwright.config.ts b/e2e/react-router/basic/playwright.config.ts index 4eead86444..22c9bdcd7e 100644 --- a/e2e/react-router/basic/playwright.config.ts +++ b/e2e/react-router/basic/playwright.config.ts @@ -1,7 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -12,15 +17,18 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `pnpm build && pnpm preview --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && pnpm preview --port ${PORT}`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/react-router/basic/src/main.tsx b/e2e/react-router/basic/src/main.tsx index 49fa054776..36e5106654 100644 --- a/e2e/react-router/basic/src/main.tsx +++ b/e2e/react-router/basic/src/main.tsx @@ -1,5 +1,3 @@ -import { useState } from 'react' -import { createPortal } from 'react-dom' import ReactDOM from 'react-dom/client' import { ErrorComponent, @@ -11,19 +9,12 @@ import { createRouter, redirect, } from '@tanstack/react-router' -import { - TanStackRouterDevtoolsInProd as TanStackRouterDevtools, - TanStackRouterDevtoolsPanelInProd as TanStackRouterDevtoolsPanel, -} from '@tanstack/react-router-devtools' -import { z } from 'zod' +import { TanStackRouterDevtools } from '@tanstack/react-router-devtools' 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 ( @@ -36,8 +27,6 @@ const rootRoute = createRootRoute({ }) function RootComponent() { - const { devtools } = rootRoute.useSearch() - return ( <>
@@ -97,57 +86,12 @@ 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/src/posts.ts b/e2e/react-router/basic/src/posts.ts index f72d16fee3..e859645746 100644 --- a/e2e/react-router/basic/src/posts.ts +++ b/e2e/react-router/basic/src/posts.ts @@ -8,7 +8,11 @@ type PostType = { body: string } -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export const fetchPosts = async () => { console.info('Fetching posts...') diff --git a/e2e/react-router/basic/tests/app.spec.ts b/e2e/react-router/basic/tests/app.spec.ts index 9c0a6b6901..ec0e24d8a4 100644 --- a/e2e/react-router/basic/tests/app.spec.ts +++ b/e2e/react-router/basic/tests/app.spec.ts @@ -1,7 +1,8 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from '../package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/react-router/basic/tests/devtools.spec.ts b/e2e/react-router/basic/tests/devtools.spec.ts deleted file mode 100644 index b8a7e803e6..0000000000 --- a/e2e/react-router/basic/tests/devtools.spec.ts +++ /dev/null @@ -1,42 +0,0 @@ -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/basic/tests/params.spec.ts b/e2e/react-router/basic/tests/params.spec.ts index f673138047..ac18f39864 100644 --- a/e2e/react-router/basic/tests/params.spec.ts +++ b/e2e/react-router/basic/tests/params.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' test.describe('params operations + prefix/suffix', () => { test.beforeEach(async ({ page }) => { diff --git a/e2e/react-router/basic/tests/setup/global.setup.ts b/e2e/react-router/basic/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/react-router/basic/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/react-router/basic/tests/setup/global.teardown.ts b/e2e/react-router/basic/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/react-router/basic/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/react-router/escaped-special-strings/package.json b/e2e/react-router/escaped-special-strings/package.json index af401c49d3..71a3cb08ca 100644 --- a/e2e/react-router/escaped-special-strings/package.json +++ b/e2e/react-router/escaped-special-strings/package.json @@ -9,7 +9,7 @@ "preview": "vite preview", "start": "vite", "test:e2e": "pnpm run test:e2e:default", - "test:e2e:default": "playwright test --project=chromium" + "test:e2e:default": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", diff --git a/e2e/react-router/escaped-special-strings/playwright.config.ts b/e2e/react-router/escaped-special-strings/playwright.config.ts index 629ddefccf..6e4e1d7703 100644 --- a/e2e/react-router/escaped-special-strings/playwright.config.ts +++ b/e2e/react-router/escaped-special-strings/playwright.config.ts @@ -1,7 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` const command = `pnpm build && pnpm preview --port ${PORT}` @@ -16,6 +21,9 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, @@ -23,12 +31,15 @@ export default defineConfig({ webServer: { command, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', env: { MODE: process.env.MODE || '', VITE_MODE: process.env.MODE || '', + VITE_NODE_ENV: 'test', + VITE_EXTERNAL_PORT: String(EXTERNAL_PORT), + VITE_SERVER_PORT: String(PORT), PORT: String(PORT), }, }, diff --git a/e2e/react-router/escaped-special-strings/tests/setup/global.setup.ts b/e2e/react-router/escaped-special-strings/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/react-router/escaped-special-strings/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/react-router/escaped-special-strings/tests/setup/global.teardown.ts b/e2e/react-router/escaped-special-strings/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/react-router/escaped-special-strings/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/react-router/generator-cli-only/package.json b/e2e/react-router/generator-cli-only/package.json index 159ba05500..f7ff46d958 100644 --- a/e2e/react-router/generator-cli-only/package.json +++ b/e2e/react-router/generator-cli-only/package.json @@ -8,7 +8,7 @@ "build": "tsr generate && vite build && tsc --noEmit", "preview": "vite preview", "start": "tsr generate && vite", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/react-router/generator-cli-only/playwright.config.ts b/e2e/react-router/generator-cli-only/playwright.config.ts index 4eead86444..c9d9a76ae7 100644 --- a/e2e/react-router/generator-cli-only/playwright.config.ts +++ b/e2e/react-router/generator-cli-only/playwright.config.ts @@ -1,7 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -12,15 +17,18 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `pnpm build && pnpm preview --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/react-router/generator-cli-only/src/posts.ts b/e2e/react-router/generator-cli-only/src/posts.ts index f72d16fee3..e859645746 100644 --- a/e2e/react-router/generator-cli-only/src/posts.ts +++ b/e2e/react-router/generator-cli-only/src/posts.ts @@ -8,7 +8,11 @@ type PostType = { body: string } -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export const fetchPosts = async () => { console.info('Fetching posts...') diff --git a/e2e/react-router/generator-cli-only/tests/app.spec.ts b/e2e/react-router/generator-cli-only/tests/app.spec.ts index ced5ac9310..5a83a314f2 100644 --- a/e2e/react-router/generator-cli-only/tests/app.spec.ts +++ b/e2e/react-router/generator-cli-only/tests/app.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/react-router/generator-cli-only/tests/setup/global.setup.ts b/e2e/react-router/generator-cli-only/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/react-router/generator-cli-only/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/react-router/generator-cli-only/tests/setup/global.teardown.ts b/e2e/react-router/generator-cli-only/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/react-router/generator-cli-only/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/react-router/i18n-paraglide/package.json b/e2e/react-router/i18n-paraglide/package.json index d1af160f10..a100d58e85 100644 --- a/e2e/react-router/i18n-paraglide/package.json +++ b/e2e/react-router/i18n-paraglide/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", @@ -29,23 +29,5 @@ "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" - }, - "nx": { - "targets": { - "build": { - "outputs": [ - "...", - "{projectRoot}/src/paraglide", - "{projectRoot}/project.inlang/cache" - ] - }, - "test:e2e": { - "outputs": [ - "...", - "{projectRoot}/src/paraglide", - "{projectRoot}/project.inlang/cache" - ] - } - } } } diff --git a/e2e/react-router/i18n-paraglide/playwright.config.ts b/e2e/react-router/i18n-paraglide/playwright.config.ts index 8e94d5f9a1..91ef8fbd9f 100644 --- a/e2e/react-router/i18n-paraglide/playwright.config.ts +++ b/e2e/react-router/i18n-paraglide/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -20,8 +21,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/react-router/issue-4759/package.json b/e2e/react-router/issue-4759/package.json index ee6a105ad5..91a7a5053e 100644 --- a/e2e/react-router/issue-4759/package.json +++ b/e2e/react-router/issue-4759/package.json @@ -8,7 +8,7 @@ "dev:e2e": "vite", "preview": "vite preview", "start": "vite", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", diff --git a/e2e/react-router/issue-4759/playwright.config.ts b/e2e/react-router/issue-4759/playwright.config.ts index a301f62881..b5e8249edc 100644 --- a/e2e/react-router/issue-4759/playwright.config.ts +++ b/e2e/react-router/issue-4759/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -11,8 +12,8 @@ export default defineConfig({ use: { baseURL }, webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm dev:e2e --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, projects: [ diff --git a/e2e/react-router/issue-7120/package.json b/e2e/react-router/issue-7120/package.json index 979b32556c..a16155eb61 100644 --- a/e2e/react-router/issue-7120/package.json +++ b/e2e/react-router/issue-7120/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", diff --git a/e2e/react-router/issue-7120/playwright.config.ts b/e2e/react-router/issue-7120/playwright.config.ts index a8ba116fb4..61a995a815 100644 --- a/e2e/react-router/issue-7120/playwright.config.ts +++ b/e2e/react-router/issue-7120/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -11,8 +12,8 @@ export default defineConfig({ use: { baseURL }, webServer: { command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm dev:e2e --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, projects: [ diff --git a/e2e/react-router/issue-7457/package.json b/e2e/react-router/issue-7457/package.json index 838f5173e2..3220a4dbb4 100644 --- a/e2e/react-router/issue-7457/package.json +++ b/e2e/react-router/issue-7457/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/react-query": "^5.99.0", diff --git a/e2e/react-router/issue-7457/playwright.config.ts b/e2e/react-router/issue-7457/playwright.config.ts index a8ba116fb4..61a995a815 100644 --- a/e2e/react-router/issue-7457/playwright.config.ts +++ b/e2e/react-router/issue-7457/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -11,8 +12,8 @@ export default defineConfig({ use: { baseURL }, webServer: { command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm dev:e2e --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, projects: [ diff --git a/e2e/react-router/js-only-file-based/package.json b/e2e/react-router/js-only-file-based/package.json index 39742d9c84..a8fbe87b8f 100644 --- a/e2e/react-router/js-only-file-based/package.json +++ b/e2e/react-router/js-only-file-based/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/react-router/js-only-file-based/playwright.config.ts b/e2e/react-router/js-only-file-based/playwright.config.ts index 0925936d55..4f93bc1413 100644 --- a/e2e/react-router/js-only-file-based/playwright.config.ts +++ b/e2e/react-router/js-only-file-based/playwright.config.ts @@ -1,7 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -13,15 +18,18 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `pnpm build && pnpm preview --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/react-router/js-only-file-based/src/posts.js b/e2e/react-router/js-only-file-based/src/posts.js index 36c1c281f6..979e5e381c 100644 --- a/e2e/react-router/js-only-file-based/src/posts.js +++ b/e2e/react-router/js-only-file-based/src/posts.js @@ -2,7 +2,11 @@ import axios from 'redaxios' export class NotFoundError extends Error {} -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export const fetchPosts = async () => { console.info('Fetching posts...') diff --git a/e2e/react-router/js-only-file-based/tests/app.spec.ts b/e2e/react-router/js-only-file-based/tests/app.spec.ts index ced5ac9310..5a83a314f2 100644 --- a/e2e/react-router/js-only-file-based/tests/app.spec.ts +++ b/e2e/react-router/js-only-file-based/tests/app.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/react-router/js-only-file-based/tests/setup/global.setup.ts b/e2e/react-router/js-only-file-based/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/react-router/js-only-file-based/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/react-router/js-only-file-based/tests/setup/global.teardown.ts b/e2e/react-router/js-only-file-based/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/react-router/js-only-file-based/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/react-router/match-params/package.json b/e2e/react-router/match-params/package.json index 908be67a9d..3282e5e5c2 100644 --- a/e2e/react-router/match-params/package.json +++ b/e2e/react-router/match-params/package.json @@ -6,7 +6,7 @@ "dev": "vite --port 3000", "build": "vite build && tsc --noEmit", "preview": "vite preview", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", diff --git a/e2e/react-router/match-params/playwright.config.ts b/e2e/react-router/match-params/playwright.config.ts index 9e8c1fab2b..246cf40060 100644 --- a/e2e/react-router/match-params/playwright.config.ts +++ b/e2e/react-router/match-params/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -13,8 +14,8 @@ export default defineConfig({ }, webServer: { command: `pnpm build && pnpm preview --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, projects: [ diff --git a/e2e/react-router/react-compiler/package.json b/e2e/react-router/react-compiler/package.json index 82e6fbf86b..d4d0e6473a 100644 --- a/e2e/react-router/react-compiler/package.json +++ b/e2e/react-router/react-compiler/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", diff --git a/e2e/react-router/react-compiler/playwright.config.ts b/e2e/react-router/react-compiler/playwright.config.ts index a8ba116fb4..61a995a815 100644 --- a/e2e/react-router/react-compiler/playwright.config.ts +++ b/e2e/react-router/react-compiler/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -11,8 +12,8 @@ export default defineConfig({ use: { baseURL }, webServer: { command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm dev:e2e --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, projects: [ diff --git a/e2e/react-router/rspack-basic-file-based/package.json b/e2e/react-router/rspack-basic-file-based/package.json index 5ec9ed9862..af7c78ec7b 100644 --- a/e2e/react-router/rspack-basic-file-based/package.json +++ b/e2e/react-router/rspack-basic-file-based/package.json @@ -7,7 +7,7 @@ "build": "rsbuild build && tsc --noEmit", "preview": "rsbuild preview", "start": "rsbuild preview", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", @@ -18,7 +18,7 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.3.1", + "@rsbuild/core": "^2.1.0", "@rsbuild/plugin-react": "^2.0.0", "@tailwindcss/postcss": "^4.2.2", "@tanstack/router-e2e-utils": "workspace:^", diff --git a/e2e/react-router/rspack-basic-file-based/playwright.config.ts b/e2e/react-router/rspack-basic-file-based/playwright.config.ts index 4eead86444..decceaef2f 100644 --- a/e2e/react-router/rspack-basic-file-based/playwright.config.ts +++ b/e2e/react-router/rspack-basic-file-based/playwright.config.ts @@ -1,7 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -12,15 +17,18 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `pnpm build && pnpm preview --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + command: `PUBLIC_NODE_ENV="test" PUBLIC_EXTERNAL_PORT=${EXTERNAL_PORT} PUBLIC_SERVER_PORT=${PORT} pnpm build && PUBLIC_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/react-router/rspack-basic-file-based/src/posts.tsx b/e2e/react-router/rspack-basic-file-based/src/posts.tsx index 97c96d77eb..a1225b7fe7 100644 --- a/e2e/react-router/rspack-basic-file-based/src/posts.tsx +++ b/e2e/react-router/rspack-basic-file-based/src/posts.tsx @@ -7,7 +7,11 @@ export type PostType = { body: string } -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.PUBLIC_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.PUBLIC_EXTERNAL_PORT}` +} export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/react-router/rspack-basic-file-based/tests/app.spec.ts b/e2e/react-router/rspack-basic-file-based/tests/app.spec.ts index d230263bfe..10beff655f 100644 --- a/e2e/react-router/rspack-basic-file-based/tests/app.spec.ts +++ b/e2e/react-router/rspack-basic-file-based/tests/app.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/react-router/rspack-basic-file-based/tests/setup/global.setup.ts b/e2e/react-router/rspack-basic-file-based/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/react-router/rspack-basic-file-based/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/react-router/rspack-basic-file-based/tests/setup/global.teardown.ts b/e2e/react-router/rspack-basic-file-based/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/react-router/rspack-basic-file-based/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} 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 30c62d0af1..07daac365c 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 @@ -7,7 +7,7 @@ "build": "rsbuild build && tsc --noEmit", "preview": "rsbuild preview", "start": "rsbuild preview", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", @@ -18,7 +18,7 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.3.1", + "@rsbuild/core": "^2.1.0", "@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/playwright.config.ts b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/playwright.config.ts index 1c1d021f2f..bf3adc082c 100644 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/playwright.config.ts +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/playwright.config.ts @@ -1,7 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -12,15 +17,18 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `pnpm build && pnpm start --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + command: `PUBLIC_NODE_ENV="test" PUBLIC_EXTERNAL_PORT=${EXTERNAL_PORT} PUBLIC_SERVER_PORT=${PORT} pnpm build && PUBLIC_SERVER_PORT=${PORT} pnpm start --port ${PORT}`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/posts.tsx b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/posts.tsx index cc3cb0f9c8..b196982420 100644 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/posts.tsx +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/src/posts.tsx @@ -7,7 +7,11 @@ export type PostType = { body: string } -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.PUBLIC_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.PUBLIC_EXTERNAL_PORT}` +} export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/tests/app.spec.ts b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/tests/app.spec.ts index 8b808782f6..a689f459e3 100644 --- a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/tests/app.spec.ts +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/tests/app.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/tests/setup/global.setup.ts b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/tests/setup/global.teardown.ts b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/react-router/rspack-basic-virtual-named-export-config-file-based/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/package.json b/e2e/react-router/scroll-restoration-sandbox-vite/package.json index 51e9e70cc5..a4ad2e8121 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/package.json +++ b/e2e/react-router/scroll-restoration-sandbox-vite/package.json @@ -11,7 +11,7 @@ "start": "vite", "test:e2e:browser": "VITE_APP_HISTORY=browser playwright test --config=playwright.browser.config.ts --project=chromium", "test:e2e:hash": "VITE_APP_HISTORY=hash playwright test --config=playwright.hash.config.ts --project=chromium", - "test:e2e": "pnpm run test:e2e:browser && pnpm run test:e2e:hash" + "test:e2e": "rm -rf port*.txt; pnpm run test:e2e:browser && pnpm run test:e2e:hash" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", @@ -31,15 +31,5 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", "vite": "^8.0.14" - }, - "nx": { - "targets": { - "test:e2e": { - "outputs": [ - "...", - "{projectRoot}/dist-hash" - ] - } - } } } diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/playwright.browser.config.ts b/e2e/react-router/scroll-restoration-sandbox-vite/playwright.browser.config.ts index eb31d94080..972124647c 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/playwright.browser.config.ts +++ b/e2e/react-router/scroll-restoration-sandbox-vite/playwright.browser.config.ts @@ -1,7 +1,15 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, + resolveRuntimeSuffix, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort( + packageJson.name + `-${resolveRuntimeSuffix('browser')}`, +) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -13,15 +21,18 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_APP_HISTORY=browser pnpm build && VITE_APP_HISTORY=browser pnpm preview --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=browser pnpm build && VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=browser pnpm preview --port ${PORT}`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/playwright.hash.config.ts b/e2e/react-router/scroll-restoration-sandbox-vite/playwright.hash.config.ts index 6b160e3908..a6fa77afbf 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/playwright.hash.config.ts +++ b/e2e/react-router/scroll-restoration-sandbox-vite/playwright.hash.config.ts @@ -1,7 +1,15 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, + resolveRuntimeSuffix, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort( + packageJson.name + `-${resolveRuntimeSuffix('hash')}`, +) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -13,15 +21,18 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_APP_HISTORY=hash vite build --outDir dist-hash && VITE_APP_HISTORY=hash pnpm preview --port ${PORT} --outDir dist-hash`, - wait: appServerReady, - reuseExistingServer: false, + command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=hash vite build --outDir dist-hash && VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=hash pnpm preview --port ${PORT} --outDir dist-hash`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/src/posts.tsx b/e2e/react-router/scroll-restoration-sandbox-vite/src/posts.tsx index c4a2d0dcca..e45ef52969 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/src/posts.tsx +++ b/e2e/react-router/scroll-restoration-sandbox-vite/src/posts.tsx @@ -10,7 +10,11 @@ export type PostType = { body: string } -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export class PostNotFoundError extends Error {} diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/tests/app.spec.ts b/e2e/react-router/scroll-restoration-sandbox-vite/tests/app.spec.ts index e396c28686..9c2d944dd5 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/tests/app.spec.ts +++ b/e2e/react-router/scroll-restoration-sandbox-vite/tests/app.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' import { linkOptions } from '@tanstack/react-router' import { toRuntimePath } from '@tanstack/router-e2e-utils' diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/tests/issue-7040.repro.spec.ts b/e2e/react-router/scroll-restoration-sandbox-vite/tests/issue-7040.repro.spec.ts index 2db25517c8..db335f8e2e 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/tests/issue-7040.repro.spec.ts +++ b/e2e/react-router/scroll-restoration-sandbox-vite/tests/issue-7040.repro.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' import type { Page } from '@playwright/test' import { toRuntimePath } from '@tanstack/router-e2e-utils' @@ -27,7 +26,7 @@ type ReproAttempt = { async function openFreshSourcePage(page: Page) { await page.goto(toRuntimePath('/issue-7040-source')) - await expect(page.getByTestId('issue-7040-source-top')).toBeVisible() + await page.waitForLoadState('networkidle') await page.evaluate(() => { sessionStorage.clear() @@ -35,7 +34,7 @@ async function openFreshSourcePage(page: Page) { }) await page.reload() - await expect(page.getByTestId('issue-7040-source-top')).toBeVisible() + await page.waitForLoadState('networkidle') } async function fastScrollSourcePage(page: Page) { @@ -97,7 +96,7 @@ async function clickTargetLinkImmediatelyAfterScroll(page: Page) { async function waitForTargetPageToSettle(page: Page) { await page.waitForURL('**/issue-7040-target') - await expect(page.getByTestId('issue-7040-target-top')).toBeVisible() + await page.waitForLoadState('networkidle') await page.waitForFunction(() => window.scrollY === 0) } diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/tests/setup/global.setup.ts b/e2e/react-router/scroll-restoration-sandbox-vite/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/react-router/scroll-restoration-sandbox-vite/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/tests/setup/global.teardown.ts b/e2e/react-router/scroll-restoration-sandbox-vite/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/react-router/scroll-restoration-sandbox-vite/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/react-router/scroll-restoration-sandbox-vite/tsconfig.json b/e2e/react-router/scroll-restoration-sandbox-vite/tsconfig.json index 5d58406b2e..f33b5a7aa3 100644 --- a/e2e/react-router/scroll-restoration-sandbox-vite/tsconfig.json +++ b/e2e/react-router/scroll-restoration-sandbox-vite/tsconfig.json @@ -11,5 +11,5 @@ "allowJs": true, "types": ["vite/client", "node"] }, - "exclude": ["node_modules", "dist", "dist-hash"] + "exclude": ["node_modules", "dist"] } diff --git a/e2e/react-router/sentry-integration/package.json b/e2e/react-router/sentry-integration/package.json index 5ebbdf31d9..b136e4f9a4 100644 --- a/e2e/react-router/sentry-integration/package.json +++ b/e2e/react-router/sentry-integration/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@sentry/react": "^10.32.0", diff --git a/e2e/react-router/sentry-integration/playwright.config.ts b/e2e/react-router/sentry-integration/playwright.config.ts index 6a684ac89e..0c5cee43e4 100644 --- a/e2e/react-router/sentry-integration/playwright.config.ts +++ b/e2e/react-router/sentry-integration/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,8 +20,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/react-router/view-transitions/package.json b/e2e/react-router/view-transitions/package.json index e2d7a181e1..03ed5c3be9 100644 --- a/e2e/react-router/view-transitions/package.json +++ b/e2e/react-router/view-transitions/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/react-router/view-transitions/playwright.config.ts b/e2e/react-router/view-transitions/playwright.config.ts index 4eead86444..c5de6b5611 100644 --- a/e2e/react-router/view-transitions/playwright.config.ts +++ b/e2e/react-router/view-transitions/playwright.config.ts @@ -1,7 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -17,10 +22,13 @@ export default defineConfig({ baseURL, }, + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + webServer: { - command: `pnpm build && pnpm preview --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && pnpm preview --port ${PORT}`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/react-router/view-transitions/tests/app.spec.ts b/e2e/react-router/view-transitions/tests/app.spec.ts index 6c1ccf1a6e..472bd6ed0b 100644 --- a/e2e/react-router/view-transitions/tests/app.spec.ts +++ b/e2e/react-router/view-transitions/tests/app.spec.ts @@ -1,4 +1,4 @@ -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { test } from '@playwright/test' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/react-router/view-transitions/tests/setup/global.setup.ts b/e2e/react-router/view-transitions/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/react-router/view-transitions/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/react-router/view-transitions/tests/setup/global.teardown.ts b/e2e/react-router/view-transitions/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/react-router/view-transitions/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/react-start/basic-auth/package.json b/e2e/react-start/basic-auth/package.json index f7ff609e76..b434d3f305 100644 --- a/e2e/react-start/basic-auth/package.json +++ b/e2e/react-start/basic-auth/package.json @@ -10,7 +10,7 @@ "preview": "vite preview", "start": "node .output/server/index.mjs", "prisma-generate": "prisma generate", - "test:e2e": "exit 0; pnpm run prisma-generate && playwright test --project=chromium" + "test:e2e": "exit 0; rm -rf port*.txt; pnpm run prisma-generate && playwright test --project=chromium" }, "dependencies": { "@libsql/client": "^0.15.15", @@ -19,7 +19,6 @@ "@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/playwright.config.ts b/e2e/react-start/basic-auth/playwright.config.ts index 82678ac00b..18b8905468 100644 --- a/e2e/react-start/basic-auth/playwright.config.ts +++ b/e2e/react-start/basic-auth/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,8 +20,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/react-start/basic-auth/src/routes/__root.tsx b/e2e/react-start/basic-auth/src/routes/__root.tsx index fb7868435d..76e5f8b1d6 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 { getAppSession } from '~/utils/session.js' +import { useAppSession } 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 getAppSession() + const session = await useAppSession() - if (!session.userEmail) { + if (!session.data.userEmail) { return null } return { - email: session.userEmail, + email: session.data.userEmail, } }) diff --git a/e2e/react-start/basic-auth/src/routes/_authed.tsx b/e2e/react-start/basic-auth/src/routes/_authed.tsx index fe73185136..0d87cfbacb 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 { getAppSession } from '~/utils/session' +import { useAppSession } from '~/utils/session' export const loginFn = createServerFn({ method: 'POST', @@ -37,11 +37,12 @@ export const loginFn = createServerFn({ } // Create a session - const session = await getAppSession() + const session = await useAppSession() // Store the user's email in the session - session.userEmail = user.email - await session.save() + await session.update({ + userEmail: user.email, + }) }) 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 0f86b0d4e3..a08f9c737e 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 { getAppSession } from '~/utils/session' +import { useAppSession } from '~/utils/session' const logoutFn = createServerFn({ method: 'POST' }).handler(async () => { - const session = await getAppSession() + const session = await useAppSession() - session.destroy() + session.clear() 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 d7d5d40129..817362dc05 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 { getAppSession } from '~/utils/session' +import { useAppSession } 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 getAppSession() + const session = await useAppSession() if (found) { if (found.password !== password) { @@ -36,8 +36,9 @@ export const signupFn = createServerFn({ } // Store the user's email in the session - session.userEmail = found.email - await session.save() + await session.update({ + userEmail: found.email, + }) // Redirect to the prev page stored in the "redirect" search param throw redirect({ @@ -54,8 +55,9 @@ export const signupFn = createServerFn({ }) // Store the user's email in the session - session.userEmail = user.email - await session.save() + await session.update({ + userEmail: user.email, + }) // 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 f1deacf85b..c38bac1e48 100644 --- a/e2e/react-start/basic-auth/src/utils/session.ts +++ b/e2e/react-start/basic-auth/src/utils/session.ts @@ -1,25 +1,13 @@ -import { getIronSession } from 'iron-session' -import { getCookie, setCookie } from '@tanstack/react-start/server' +// src/services/session.server.ts +import { useSession } from '@tanstack/react-start/server' import type { User } from '@prisma/client' type SessionUser = { userEmail: User['email'] } -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: '/', - }, - }, - ) +export function useAppSession() { + return useSession({ + password: 'ChangeThisBeforeShippingToProdOrYouWillBeFired', + }) } diff --git a/e2e/react-start/basic-cloudflare/package.json b/e2e/react-start/basic-cloudflare/package.json index b9b8031ac4..7baa24073b 100644 --- a/e2e/react-start/basic-cloudflare/package.json +++ b/e2e/react-start/basic-cloudflare/package.json @@ -10,7 +10,7 @@ "preview": "vite preview", "cf-typegen": "wrangler types", "postinstall": "WRANGLER_LOG=warn npm run --silent cf-typegen", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", @@ -33,15 +33,5 @@ "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", "wrangler": "^4.74.0" - }, - "nx": { - "targets": { - "test:e2e": { - "outputs": [ - "...", - "{projectRoot}/.wrangler/deploy" - ] - } - } } } diff --git a/e2e/react-start/basic-cloudflare/playwright.config.ts b/e2e/react-start/basic-cloudflare/playwright.config.ts index 0925936d55..a545dff891 100644 --- a/e2e/react-start/basic-cloudflare/playwright.config.ts +++ b/e2e/react-start/basic-cloudflare/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -13,6 +14,9 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, @@ -20,8 +24,8 @@ export default defineConfig({ webServer: { command: `pnpm build && pnpm preview --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/react-start/basic-cloudflare/tests/app.spec.ts b/e2e/react-start/basic-cloudflare/tests/app.spec.ts index c9497070dd..add28cb73e 100644 --- a/e2e/react-start/basic-cloudflare/tests/app.spec.ts +++ b/e2e/react-start/basic-cloudflare/tests/app.spec.ts @@ -1,5 +1,3 @@ -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' @@ -31,19 +29,3 @@ 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-cloudflare/tests/setup/global.setup.ts b/e2e/react-start/basic-cloudflare/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/react-start/basic-cloudflare/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/react-start/basic-cloudflare/tests/setup/global.teardown.ts b/e2e/react-start/basic-cloudflare/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/react-start/basic-cloudflare/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/react-start/basic-react-query/package.json b/e2e/react-start/basic-react-query/package.json index ee37b82ba6..87789282ec 100644 --- a/e2e/react-start/basic-react-query/package.json +++ b/e2e/react-start/basic-react-query/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/react-query": "^5.90.0", @@ -32,7 +32,7 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "srvx": "^1.0.0", + "srvx": "^0.11.9", "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-react-query/playwright.config.ts b/e2e/react-start/basic-react-query/playwright.config.ts index 216fade4d5..fd2150e435 100644 --- a/e2e/react-start/basic-react-query/playwright.config.ts +++ b/e2e/react-start/basic-react-query/playwright.config.ts @@ -1,7 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -13,19 +18,19 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `pnpm build && PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', - env: { - NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, - }, }, projects: [ diff --git a/e2e/react-start/basic-react-query/src/routes/api.users.ts b/e2e/react-start/basic-react-query/src/routes/api.users.ts index 924c5b6860..bb37c6e68d 100644 --- a/e2e/react-start/basic-react-query/src/routes/api.users.ts +++ b/e2e/react-start/basic-react-query/src/routes/api.users.ts @@ -2,7 +2,11 @@ import { createFileRoute } from '@tanstack/react-router' import axios from 'redaxios' import type { User } from '../utils/users' -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export const Route = createFileRoute('/api/users')({ server: { diff --git a/e2e/react-start/basic-react-query/src/routes/api/users.$id.ts b/e2e/react-start/basic-react-query/src/routes/api/users.$id.ts index febea309ea..e11e039652 100644 --- a/e2e/react-start/basic-react-query/src/routes/api/users.$id.ts +++ b/e2e/react-start/basic-react-query/src/routes/api/users.$id.ts @@ -2,7 +2,11 @@ import { createFileRoute } from '@tanstack/react-router' import axios from 'redaxios' import type { User } from '../../utils/users' -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export const Route = createFileRoute('/api/users/$id')({ server: { diff --git a/e2e/react-start/basic-react-query/src/utils/posts.tsx b/e2e/react-start/basic-react-query/src/utils/posts.tsx index abb6e95b92..3fd16db69a 100644 --- a/e2e/react-start/basic-react-query/src/utils/posts.tsx +++ b/e2e/react-start/basic-react-query/src/utils/posts.tsx @@ -9,7 +9,11 @@ export type PostType = { body: string } -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export const fetchPosts = createServerFn({ method: 'GET' }).handler( async () => { diff --git a/e2e/react-start/basic-react-query/src/utils/users.tsx b/e2e/react-start/basic-react-query/src/utils/users.tsx index 15216680e9..26b934fcb3 100644 --- a/e2e/react-start/basic-react-query/src/utils/users.tsx +++ b/e2e/react-start/basic-react-query/src/utils/users.tsx @@ -1,6 +1,4 @@ import { queryOptions } from '@tanstack/react-query' -import { createIsomorphicFn } from '@tanstack/react-start' -import { getRequestUrl } from '@tanstack/react-start/server' import axios from 'redaxios' export type User = { @@ -9,16 +7,17 @@ export type User = { email: string } -const getOrigin = createIsomorphicFn() - .server(() => getRequestUrl().origin) - .client(() => window.location.origin) +const PORT = + import.meta.env.VITE_SERVER_PORT || process.env.VITE_SERVER_PORT || 3000 + +export const DEPLOY_URL = `http://localhost:${PORT}` export const usersQueryOptions = () => queryOptions({ queryKey: ['users'], queryFn: () => axios - .get>(getOrigin() + '/api/users') + .get>(DEPLOY_URL + '/api/users') .then((r) => r.data) .catch(() => { throw new Error('Failed to fetch users') @@ -30,7 +29,7 @@ export const userQueryOptions = (id: string) => queryKey: ['users', id], queryFn: () => axios - .get(getOrigin() + '/api/users/' + id) + .get(DEPLOY_URL + '/api/users/' + id) .then((r) => r.data) .catch(() => { throw new Error('Failed to fetch user') diff --git a/e2e/react-start/basic-react-query/tests/setup/global.setup.ts b/e2e/react-start/basic-react-query/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/react-start/basic-react-query/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/react-start/basic-react-query/tests/setup/global.teardown.ts b/e2e/react-start/basic-react-query/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/react-start/basic-react-query/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/react-start/basic-tsr-config/package.json b/e2e/react-start/basic-tsr-config/package.json index 99e681ac9d..6aaacfefd4 100644 --- a/e2e/react-start/basic-tsr-config/package.json +++ b/e2e/react-start/basic-tsr-config/package.json @@ -8,7 +8,7 @@ "dev:e2e": "vite dev", "build": "rimraf ./count.txt && vite build && tsc --noEmit", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", @@ -21,7 +21,7 @@ "@types/node": "^22.10.2", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", - "srvx": "^1.0.0", + "srvx": "^0.11.9", "@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-tsr-config/playwright.config.ts b/e2e/react-start/basic-tsr-config/playwright.config.ts index 82678ac00b..18b8905468 100644 --- a/e2e/react-start/basic-tsr-config/playwright.config.ts +++ b/e2e/react-start/basic-tsr-config/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,8 +20,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/react-start/basic/package.json b/e2e/react-start/basic/package.json index 3a1a4ea9c8..f0a15aa274 100644 --- a/e2e/react-start/basic/package.json +++ b/e2e/react-start/basic/package.json @@ -14,6 +14,8 @@ "preview": "vite preview", "preview:rsbuild": "rsbuild preview", "start": "node server.js", + "test:e2e:startDummyServer": "node -e 'import(\"./tests/setup/global.setup.ts\").then(m => m.default())' & node -e 'import(\"./tests/setup/waitForDummyServer.ts\").then(m => m.default())'", + "test:e2e:stopDummyServer": "node -e 'import(\"./tests/setup/global.teardown.ts\").then(m => m.default())'", "test:e2e:local": "playwright test --project=chromium" }, "dependencies": { @@ -22,7 +24,6 @@ "@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", @@ -31,7 +32,7 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.3.1", + "@rsbuild/core": "^2.1.0", "@rsbuild/plugin-react": "^2.0.0", "@tailwindcss/postcss": "^4.2.2", "@tailwindcss/vite": "^4.2.2", @@ -42,7 +43,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", "combinate": "^1.1.11", - "srvx": "^1.0.0", + "srvx": "^0.11.9", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", @@ -50,18 +51,6 @@ "zod": "^4.4.3" }, "nx": { - "targets": { - "test:e2e--vite-spa--dev": { - "dependsOn": [ - "^build" - ] - }, - "test:e2e--rsbuild-spa--dev": { - "dependsOn": [ - "^build" - ] - } - }, "metadata": { "playwrightModes": [ { @@ -74,18 +63,7 @@ }, { "toolchain": "vite", - "mode": "spa", - "name": "dev", - "env": { - "E2E_DEV_SERVER": "true" - } - }, - { - "toolchain": "vite", - "mode": "prerender", - "env": { - "NODE_OPTIONS": "--import=@tanstack/router-e2e-utils/mock-api" - } + "mode": "prerender" }, { "toolchain": "vite", @@ -109,18 +87,7 @@ }, { "toolchain": "rsbuild", - "mode": "spa", - "name": "dev", - "env": { - "E2E_DEV_SERVER": "true" - } - }, - { - "toolchain": "rsbuild", - "mode": "prerender", - "env": { - "NODE_OPTIONS": "--import=@tanstack/router-e2e-utils/mock-api" - } + "mode": "prerender" }, { "toolchain": "rsbuild", diff --git a/e2e/react-start/basic/playwright.config.ts b/e2e/react-start/basic/playwright.config.ts index bb4c2cb761..db07d18608 100644 --- a/e2e/react-start/basic/playwright.config.ts +++ b/e2e/react-start/basic/playwright.config.ts @@ -1,42 +1,48 @@ +import fs from 'node:fs' import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } const mode = process.env.MODE ?? 'ssr' const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' - +const e2ePortKey = process.env.E2E_PORT_KEY ?? packageJson.name 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) +if (process.env.TEST_WORKER_INDEX === undefined) { + for (const portFile of [ + `port-${e2ePortKey}.txt`, + `port-${e2ePortKey}_start.txt`, + `port-${e2ePortKey}-external.txt`, + ]) { + fs.rmSync(portFile, { force: true }) + } +} + +const PORT = await getTestServerPort(e2ePortKey) +const START_PORT = await getTestServerPort(`${e2ePortKey}_start`) +const EXTERNAL_PORT = await getDummyServerPort(e2ePortKey) const baseURL = `http://localhost:${PORT}` 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 devCommand = - toolchain === 'rsbuild' - ? `pnpm dev:rsbuild --port ${PORT}` - : `pnpm dev:vite --port ${PORT}` -const commandByMode = devServer - ? devCommand - : mode === 'preview' - ? previewCommand - : 'pnpm start' + ? `pnpm preview:rsbuild --port ${PORT}` + : `pnpm preview --outDir ${distDir} --port ${PORT}` +const commandByMode = + mode === 'preview' + ? `pnpm run test:e2e:startDummyServer && ${previewCommand}` + : `pnpm run test:e2e:startDummyServer && 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']], + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, @@ -44,16 +50,19 @@ export default defineConfig({ webServer: { command: commandByMode, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', env: { - NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, MODE: mode, E2E_TOOLCHAIN: toolchain, - START_PORT: '0', + VITE_NODE_ENV: 'test', + VITE_EXTERNAL_PORT: String(EXTERNAL_PORT), + VITE_SERVER_PORT: String(PORT), + START_PORT: String(START_PORT), PORT: String(PORT), E2E_DIST_DIR: distDir, + E2E_PORT_KEY: e2ePortKey, ...(process.env.TSS_RSB_CLIENT_OUTPUT ? { TSS_RSB_CLIENT_OUTPUT: process.env.TSS_RSB_CLIENT_OUTPUT } : {}), diff --git a/e2e/react-start/basic/server.js b/e2e/react-start/basic/server.js index 3e1ddab400..69c1e4ca91 100644 --- a/e2e/react-start/basic/server.js +++ b/e2e/react-start/basic/server.js @@ -1,12 +1,12 @@ +import { toNodeHandler } from 'srvx/node' import fs from 'node:fs' import path from 'node:path' -import { toNodeHandler } from 'srvx/node' import express from 'express' import { createProxyMiddleware } from 'http-proxy-middleware' -const port = Number(process.env.PORT ?? 3000) +const port = process.env.PORT || 3000 -const startPort = Number(process.env.START_PORT ?? 0) +const startPort = process.env.START_PORT || 3001 const isSpaMode = process.env.MODE === 'spa' const isPrerender = process.env.MODE === 'prerender' @@ -49,13 +49,13 @@ export async function createStartServer() { return { app } } -export async function createSpaServer(backendPort) { +export async function createSpaServer() { const app = express() app.use( '/api', createProxyMiddleware({ - target: `http://localhost:${backendPort}/api`, // Replace with your target server's URL + target: `http://localhost:${startPort}/api`, // Replace with your target server's URL changeOrigin: false, // Needed for virtual hosted sites, }), ) @@ -63,7 +63,7 @@ export async function createSpaServer(backendPort) { app.use( '/_serverFn', createProxyMiddleware({ - target: `http://localhost:${backendPort}/_serverFn`, // Replace with your target server's URL + target: `http://localhost:${startPort}/_serverFn`, // Replace with your target server's URL changeOrigin: false, // Needed for virtual hosted sites, }), ) @@ -71,28 +71,31 @@ export async function createSpaServer(backendPort) { app.use(express.static(distClientDir)) app.get('/{*splat}', (req, res) => { - res.sendFile('index.html', { root: distClientDir }) + res.sendFile(path.resolve(distClientDir, 'index.html')) }) return { app } } -// Bind the backend first so the SPA proxy receives the port actually held by it. -const { app: startApp } = await createStartServer() -const backend = startApp.listen(isSpaMode ? startPort : port, async (error) => { - if (error) { - throw error - } - const backendPort = backend.address().port - if (isSpaMode) { - const { app } = await createSpaServer(backendPort) - const frontend = app.listen(port, (frontendError) => { - if (frontendError) { - throw frontendError - } - console.info(`E2E app: http://localhost:${frontend.address().port}`) - }) - } else { - console.info(`E2E app: http://localhost:${backendPort}`) - } -}) +if (isSpaMode) { + createSpaServer().then(async ({ app }) => + app.listen(port, (error) => { + if (error) throw error + console.info(`Client Server: http://localhost:${port}`) + }), + ) + + createStartServer().then(async ({ app }) => + app.listen(startPort, (error) => { + if (error) throw error + console.info(`Start Server: http://localhost:${startPort}`) + }), + ) +} else { + createStartServer().then(async ({ app }) => + app.listen(port, (error) => { + if (error) throw error + console.info(`Start Server: http://localhost:${port}`) + }), + ) +} diff --git a/e2e/react-start/basic/src/routeTree.gen.ts b/e2e/react-start/basic/src/routeTree.gen.ts index b6603dd01d..ea09864d8e 100644 --- a/e2e/react-start/basic/src/routeTree.gen.ts +++ b/e2e/react-start/basic/src/routeTree.gen.ts @@ -12,11 +12,8 @@ import { Route as rootRouteImport } from './routes/__root' import { Route as IndexRouteImport } from './routes/index' import { Route as LayoutRouteImport } from './routes/_layout' 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' @@ -32,7 +29,6 @@ import { Route as TypeOnlyReexportRouteImport } from './routes/type-only-reexpor import { Route as UsersRouteImport } from './routes/users' import { Route as LayoutLayout2RouteImport } from './routes/_layout/_layout-2' import { Route as ApiUsersRouteImport } from './routes/api.users' -import { Route as AuthDocsPrivateRouteImport } from './routes/auth-docs.private' import { Route as Issue6221DashboardRouteImport } from './routes/issue-6221.dashboard' import { Route as MultiCookieRedirectIndexRouteImport } from './routes/multi-cookie-redirect/index' import { Route as MultiCookieRedirectTargetRouteImport } from './routes/multi-cookie-redirect/target' @@ -100,11 +96,6 @@ const AsyncScriptsRoute = AsyncScriptsRouteImport.update({ path: '/async-scripts', getParentRoute: () => rootRouteImport, } as any) -const AuthDocsRoute = AuthDocsRouteImport.update({ - id: '/auth-docs', - path: '/auth-docs', - getParentRoute: () => rootRouteImport, -} as any) const ClientOnlyRoute = ClientOnlyRouteImport.update({ id: '/client-only', path: '/client-only', @@ -115,16 +106,6 @@ 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', @@ -200,11 +181,6 @@ const ApiUsersRoute = ApiUsersRouteImport.update({ path: '/api/users', getParentRoute: () => rootRouteImport, } as any) -const AuthDocsPrivateRoute = AuthDocsPrivateRouteImport.update({ - id: '/private', - path: '/private', - getParentRoute: () => AuthDocsRoute, -} as any) const Issue6221DashboardRoute = Issue6221DashboardRouteImport.update({ id: '/issue-6221/dashboard', path: '/issue-6221/dashboard', @@ -488,11 +464,8 @@ export interface FileRoutesByFullPath { '/search-params': typeof SearchParamsRouteRouteWithChildren '/specialChars': typeof SpecialCharsRouteRouteWithChildren '/async-scripts': typeof AsyncScriptsRoute - '/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 @@ -507,7 +480,6 @@ export interface FileRoutesByFullPath { '/not-found/parent-boundary': typeof NotFoundParentBoundaryRouteRouteWithChildren '/specialChars/malformed': typeof SpecialCharsMalformedRouteRouteWithChildren '/api/users': typeof ApiUsersRouteWithChildren - '/auth-docs/private': typeof AuthDocsPrivateRoute '/issue-6221/dashboard': typeof Issue6221DashboardRoute '/multi-cookie-redirect/target': typeof MultiCookieRedirectTargetRoute '/not-found/via-beforeLoad': typeof NotFoundViaBeforeLoadRoute @@ -562,11 +534,8 @@ export interface FileRoutesByTo { '/': typeof IndexRoute '/specialChars': typeof SpecialCharsRouteRouteWithChildren '/async-scripts': typeof AsyncScriptsRoute - '/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 @@ -576,7 +545,6 @@ export interface FileRoutesByTo { '/type-only-reexport': typeof TypeOnlyReexportRoute '/specialChars/malformed': typeof SpecialCharsMalformedRouteRouteWithChildren '/api/users': typeof ApiUsersRouteWithChildren - '/auth-docs/private': typeof AuthDocsPrivateRoute '/issue-6221/dashboard': typeof Issue6221DashboardRoute '/multi-cookie-redirect/target': typeof MultiCookieRedirectTargetRoute '/not-found/via-beforeLoad': typeof NotFoundViaBeforeLoadRoute @@ -633,11 +601,8 @@ export interface FileRoutesById { '/specialChars': typeof SpecialCharsRouteRouteWithChildren '/_layout': typeof LayoutRouteWithChildren '/async-scripts': typeof AsyncScriptsRoute - '/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 @@ -653,7 +618,6 @@ export interface FileRoutesById { '/specialChars/malformed': typeof SpecialCharsMalformedRouteRouteWithChildren '/_layout/_layout-2': typeof LayoutLayout2RouteWithChildren '/api/users': typeof ApiUsersRouteWithChildren - '/auth-docs/private': typeof AuthDocsPrivateRoute '/issue-6221/dashboard': typeof Issue6221DashboardRoute '/multi-cookie-redirect/target': typeof MultiCookieRedirectTargetRoute '/not-found/via-beforeLoad': typeof NotFoundViaBeforeLoadRoute @@ -712,11 +676,8 @@ export interface FileRouteTypes { | '/search-params' | '/specialChars' | '/async-scripts' - | '/auth-docs' | '/client-only' | '/deferred' - | '/execution-local' - | '/execution-rpc' | '/inline-scripts' | '/links' | '/plain-ts-type-assertion' @@ -731,7 +692,6 @@ export interface FileRouteTypes { | '/not-found/parent-boundary' | '/specialChars/malformed' | '/api/users' - | '/auth-docs/private' | '/issue-6221/dashboard' | '/multi-cookie-redirect/target' | '/not-found/via-beforeLoad' @@ -786,11 +746,8 @@ export interface FileRouteTypes { | '/' | '/specialChars' | '/async-scripts' - | '/auth-docs' | '/client-only' | '/deferred' - | '/execution-local' - | '/execution-rpc' | '/inline-scripts' | '/links' | '/plain-ts-type-assertion' @@ -800,7 +757,6 @@ export interface FileRouteTypes { | '/type-only-reexport' | '/specialChars/malformed' | '/api/users' - | '/auth-docs/private' | '/issue-6221/dashboard' | '/multi-cookie-redirect/target' | '/not-found/via-beforeLoad' @@ -856,11 +812,8 @@ export interface FileRouteTypes { | '/specialChars' | '/_layout' | '/async-scripts' - | '/auth-docs' | '/client-only' | '/deferred' - | '/execution-local' - | '/execution-rpc' | '/inline-scripts' | '/links' | '/plain-ts-type-assertion' @@ -876,7 +829,6 @@ export interface FileRouteTypes { | '/specialChars/malformed' | '/_layout/_layout-2' | '/api/users' - | '/auth-docs/private' | '/issue-6221/dashboard' | '/multi-cookie-redirect/target' | '/not-found/via-beforeLoad' @@ -935,11 +887,8 @@ export interface RootRouteChildren { SpecialCharsRouteRoute: typeof SpecialCharsRouteRouteWithChildren LayoutRoute: typeof LayoutRouteWithChildren AsyncScriptsRoute: typeof AsyncScriptsRoute - AuthDocsRoute: typeof AuthDocsRouteWithChildren ClientOnlyRoute: typeof ClientOnlyRoute DeferredRoute: typeof DeferredRoute - ExecutionLocalRoute: typeof ExecutionLocalRoute - ExecutionRpcRoute: typeof ExecutionRpcRoute InlineScriptsRoute: typeof InlineScriptsRoute LinksRoute: typeof LinksRoute PlainTsTypeAssertionRoute: typeof PlainTsTypeAssertionRoute @@ -984,13 +933,6 @@ declare module '@tanstack/react-router' { preLoaderRoute: typeof AsyncScriptsRouteImport parentRoute: typeof rootRouteImport } - '/auth-docs': { - id: '/auth-docs' - path: '/auth-docs' - fullPath: '/auth-docs' - preLoaderRoute: typeof AuthDocsRouteImport - parentRoute: typeof rootRouteImport - } '/client-only': { id: '/client-only' path: '/client-only' @@ -1005,20 +947,6 @@ 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' @@ -1124,13 +1052,6 @@ declare module '@tanstack/react-router' { preLoaderRoute: typeof ApiUsersRouteImport parentRoute: typeof rootRouteImport } - '/auth-docs/private': { - id: '/auth-docs/private' - path: '/private' - fullPath: '/auth-docs/private' - preLoaderRoute: typeof AuthDocsPrivateRouteImport - parentRoute: typeof AuthDocsRoute - } '/issue-6221/dashboard': { id: '/issue-6221/dashboard' path: '/issue-6221/dashboard' @@ -1649,18 +1570,6 @@ const LayoutRouteChildren: LayoutRouteChildren = { const LayoutRouteWithChildren = LayoutRoute._addFileChildren(LayoutRouteChildren) -interface AuthDocsRouteChildren { - AuthDocsPrivateRoute: typeof AuthDocsPrivateRoute -} - -const AuthDocsRouteChildren: AuthDocsRouteChildren = { - AuthDocsPrivateRoute: AuthDocsPrivateRoute, -} - -const AuthDocsRouteWithChildren = AuthDocsRoute._addFileChildren( - AuthDocsRouteChildren, -) - interface PostsRouteChildren { PostsPostIdRoute: typeof PostsPostIdRoute PostsIndexRoute: typeof PostsIndexRoute @@ -1766,11 +1675,8 @@ const rootRouteChildren: RootRouteChildren = { SpecialCharsRouteRoute: SpecialCharsRouteRouteWithChildren, LayoutRoute: LayoutRouteWithChildren, AsyncScriptsRoute: AsyncScriptsRoute, - 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 ed521817d6..d8fc0d3b24 100644 --- a/e2e/react-start/basic/src/routes/__root.tsx +++ b/e2e/react-start/basic/src/routes/__root.tsx @@ -197,9 +197,6 @@ function RootDocument({ children }: { children: React.ReactNode }) { > Client Only {' '} - - Server function loader - {' '} { console.info('Fetching users... @', request.url) - const res = await axios.get>( - 'https://jsonplaceholder.typicode.com/users', - ) + const res = await axios.get>(`${queryURL}/users`) const list = res.data.slice(0, 10) diff --git a/e2e/react-start/basic/src/routes/api/users.$id.ts b/e2e/react-start/basic/src/routes/api/users.$id.ts index 797dffb637..ac665381f1 100644 --- a/e2e/react-start/basic/src/routes/api/users.$id.ts +++ b/e2e/react-start/basic/src/routes/api/users.$id.ts @@ -2,15 +2,19 @@ import { createFileRoute } from '@tanstack/react-router' import axios from 'redaxios' import type { User } from '~/utils/users' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} + export const Route = createFileRoute('/api/users/$id')({ server: { handlers: { GET: async ({ request, params }) => { console.info(`Fetching users by id=${params.id}... @`, request.url) try { - const res = await axios.get( - `https://jsonplaceholder.typicode.com/users/${params.id}`, - ) + const res = await axios.get(`${queryURL}/users/` + params.id) return Response.json({ id: res.data.id, diff --git a/e2e/react-start/basic/src/routes/auth-docs.private.tsx b/e2e/react-start/basic/src/routes/auth-docs.private.tsx deleted file mode 100644 index 85fc8a0fc9..0000000000 --- a/e2e/react-start/basic/src/routes/auth-docs.private.tsx +++ /dev/null @@ -1,17 +0,0 @@ -import { createFileRoute, redirect } from '@tanstack/react-router' -import { getPrivateDataFn } from '../utils/auth-docs' - -export const Route = createFileRoute('/auth-docs/private')({ - beforeLoad: ({ context }) => { - if (!context.user) { - throw redirect({ to: '/auth-docs' }) - } - }, - loader: () => getPrivateDataFn(), - component: PrivatePage, -}) - -function PrivatePage() { - const message = Route.useLoaderData() - return

{message}

-} diff --git a/e2e/react-start/basic/src/routes/auth-docs.tsx b/e2e/react-start/basic/src/routes/auth-docs.tsx deleted file mode 100644 index 6ea1b813ef..0000000000 --- a/e2e/react-start/basic/src/routes/auth-docs.tsx +++ /dev/null @@ -1,100 +0,0 @@ -import { - createFileRoute, - Outlet, - useHydrated, - useRouter, -} from '@tanstack/react-router' -import { useServerFn } from '@tanstack/react-start' -import { useState } from 'react' -import type { FormEvent } from 'react' -import { - getCurrentUserFn, - getPrivateDataFn, - loginFn, - logoutFn, -} from '../utils/auth-docs' - -export const Route = createFileRoute('/auth-docs')({ - beforeLoad: async () => ({ user: await getCurrentUserFn() }), - headers: () => ({ 'Cache-Control': 'private, no-store' }), - component: AuthDocs, -}) - -function AuthDocs() { - const hydrated = useHydrated() - const { user } = Route.useRouteContext() - const router = useRouter() - const login = useServerFn(loginFn) - const logout = useServerFn(logoutFn) - const getPrivateData = useServerFn(getPrivateDataFn) - const [isLoading, setIsLoading] = useState(false) - const [error, setError] = useState('') - const [privateResult, setPrivateResult] = useState('') - - const handleSubmit = async (event: FormEvent) => { - event.preventDefault() - const formData = new FormData(event.currentTarget) - const email = formData.get('email') - const password = formData.get('password') - if (typeof email !== 'string' || typeof password !== 'string') { - return - } - setIsLoading(true) - setError('') - try { - const result = await login({ data: { email, password } }) - if (result?.error) { - setError(result.error) - return - } - await router.invalidate() - } catch { - setError('Login failed. Please try again.') - } finally { - setIsLoading(false) - } - } - - return ( -
-

{user?.email ?? 'Signed out'}

-
-
- - - -
-

{error}

-
- - -

{privateResult}

- -
- ) -} diff --git a/e2e/react-start/basic/src/routes/execution-local.tsx b/e2e/react-start/basic/src/routes/execution-local.tsx deleted file mode 100644 index 477cd81740..0000000000 --- a/e2e/react-start/basic/src/routes/execution-local.tsx +++ /dev/null @@ -1,16 +0,0 @@ -import { createFileRoute } from '@tanstack/react-router' -import { readOnlyOnServer } from '~/utils/execution-functions' - -// This intentionally fails during browser navigation. It is the negative case -// for the environment-functions troubleshooting guide. -export const Route = createFileRoute('/execution-local')({ - 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 deleted file mode 100644 index f934015522..0000000000 --- a/e2e/react-start/basic/src/routes/execution-rpc.tsx +++ /dev/null @@ -1,18 +0,0 @@ -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 deleted file mode 100644 index 22b36ee808..0000000000 --- a/e2e/react-start/basic/src/utils/auth-docs.ts +++ /dev/null @@ -1,60 +0,0 @@ -import { createServerFn } from '@tanstack/react-start' -import { redirect } from '@tanstack/react-router' -import { getCookie, setCookie } from '@tanstack/react-start/server' -import { getIronSession } from 'iron-session' - -function getSession() { - 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.email ? { email: session.email } : null - }, -) - -export const loginFn = createServerFn({ method: 'POST' }) - .validator((data: { email: string; password: string }) => data) - .handler(async ({ data }) => { - // Fixed credentials belong only to this browser-test fixture. - if ( - data.email !== 'reader@example.com' || - data.password !== 'test-password' - ) { - return { error: 'Invalid credentials' } - } - const session = await getSession() - 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() - session.destroy() - throw redirect({ to: '/auth-docs' }) -}) - -export const getPrivateDataFn = createServerFn({ method: 'GET' }).handler( - async () => { - const session = await getSession() - 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 deleted file mode 100644 index 97e66573d8..0000000000 --- a/e2e/react-start/basic/src/utils/execution-functions.ts +++ /dev/null @@ -1,5 +0,0 @@ -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/src/utils/posts.tsx b/e2e/react-start/basic/src/utils/posts.tsx index 9fdff27673..4cc5dcc4c6 100644 --- a/e2e/react-start/basic/src/utils/posts.tsx +++ b/e2e/react-start/basic/src/utils/posts.tsx @@ -8,12 +8,18 @@ export type PostType = { body: string } +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} + export const fetchPost = createServerFn({ method: 'GET' }) .validator((postId: string) => postId) .handler(async ({ data: postId }) => { console.info(`Fetching post with id ${postId}...`) const post = await axios - .get(`https://jsonplaceholder.typicode.com/posts/${postId}`) + .get(`${queryURL}/posts/${postId}`) .then((r) => r.data) .catch((err) => { console.error(err) @@ -30,7 +36,7 @@ export const fetchPosts = createServerFn({ method: 'GET' }).handler( async () => { console.info('Fetching posts...') return axios - .get>('https://jsonplaceholder.typicode.com/posts') + .get>(`${queryURL}/posts`) .then((r) => r.data.slice(0, 10)) }, ) diff --git a/e2e/react-start/basic/src/utils/users.tsx b/e2e/react-start/basic/src/utils/users.tsx index 7ba645b383..46be4b1580 100644 --- a/e2e/react-start/basic/src/utils/users.tsx +++ b/e2e/react-start/basic/src/utils/users.tsx @@ -3,3 +3,7 @@ export type User = { name: string email: string } + +const PORT = process.env.VITE_SERVER_PORT || 3000 + +export const DEPLOY_URL = `http://localhost:${PORT}` diff --git a/e2e/react-start/basic/tests/auth-docs.spec.ts b/e2e/react-start/basic/tests/auth-docs.spec.ts deleted file mode 100644 index 47a57c9da2..0000000000 --- a/e2e/react-start/basic/tests/auth-docs.spec.ts +++ /dev/null @@ -1,89 +0,0 @@ -import { expect, test } from '@playwright/test' -import { isSpaMode } from './utils/isSpaMode' - -test('authentication docs pattern handles login, logout, route context, and server authorization', async ({ - page, -}) => { - await page.goto('/auth-docs/private') - await expect(page).toHaveURL(/\/auth-docs$/) - await expect(page.getByTestId('auth-docs-user')).toHaveText('Signed out') - - await page - .getByRole('button', { name: 'Request private data directly' }) - .click() - await expect(page.getByTestId('auth-docs-private-result')).toHaveText( - 'Access denied', - ) - - await page.getByLabel('Email', { exact: true }).fill('reader@example.com') - await page.getByLabel('Password', { exact: true }).fill('wrong-password') - await page.getByRole('button', { name: 'Login', exact: true }).click() - await expect(page.getByRole('alert')).toHaveText('Invalid credentials') - await expect(page.getByTestId('auth-docs-user')).toHaveText('Signed out') - - await page.getByLabel('Password', { exact: true }).fill('test-password') - await page.getByRole('button', { name: 'Login', exact: true }).click() - await expect(page).toHaveURL(/\/auth-docs\/private$/) - await expect(page.getByTestId('auth-docs-user')).toHaveText( - 'reader@example.com', - ) - await expect(page.getByTestId('auth-docs-private-page')).toHaveText( - 'Private account data', - ) - - const response = await page.reload() - expect(response?.status()).toBe(200) - if (isSpaMode) { - // The shared SPA shell must not contain authenticated account data. - expect(await response?.text()).not.toContain('reader@example.com') - expect(await response?.text()).not.toContain('Private account data') - } else { - expect(response?.headers()['cache-control']).toBe('private, no-store') - } - await expect(page.getByTestId('auth-docs-user')).toHaveText( - 'reader@example.com', - ) - await page.getByRole('button', { name: 'Logout', exact: true }).click() - await expect(page).toHaveURL(/\/auth-docs$/) - await expect(page.getByTestId('auth-docs-user')).toHaveText('Signed out') - await page - .getByRole('button', { name: 'Request private data directly' }) - .click() - await expect(page.getByTestId('auth-docs-private-result')).toHaveText( - 'Access denied', - ) - await page.goto('/auth-docs/private') - await expect(page).toHaveURL(/\/auth-docs$/) -}) - -test('the authentication form cannot submit credentials before hydration', async ({ - browser, - baseURL, -}) => { - const context = await browser.newContext({ - javaScriptEnabled: false, - baseURL, - }) - const page = await context.newPage() - try { - await page.goto('/auth-docs') - if (isSpaMode) { - // Without JavaScript, the SPA shell cannot render credential controls. - await expect(page.locator('form')).toHaveCount(0) - await expect(page.getByLabel('Email', { exact: true })).toHaveCount(0) - await expect(page.getByLabel('Password', { exact: true })).toHaveCount(0) - await expect( - page.getByRole('button', { name: 'Login', exact: true }), - ).toHaveCount(0) - } else { - await expect(page.locator('form')).toHaveAttribute('method', 'post') - await expect(page.getByLabel('Email', { exact: true })).toBeDisabled() - await expect(page.getByLabel('Password', { exact: true })).toBeDisabled() - await expect( - page.getByRole('button', { name: 'Login', exact: true }), - ).toBeDisabled() - } - } finally { - await context.close() - } -}) diff --git a/e2e/react-start/basic/tests/client-only.spec.ts b/e2e/react-start/basic/tests/client-only.spec.ts index 299744f636..a3b6f99442 100644 --- a/e2e/react-start/basic/tests/client-only.spec.ts +++ b/e2e/react-start/basic/tests/client-only.spec.ts @@ -1,6 +1,5 @@ import { expect } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' -import { isSpaMode } from './utils/isSpaMode' /** * These tests verify the compiler optimization. @@ -16,15 +15,7 @@ import { isSpaMode } from './utils/isSpaMode' 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 deleted file mode 100644 index 410b1d999e..0000000000 --- a/e2e/react-start/basic/tests/environment-functions.spec.ts +++ /dev/null @@ -1,46 +0,0 @@ -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/fixture-api.spec.ts b/e2e/react-start/basic/tests/fixture-api.spec.ts deleted file mode 100644 index 6c9b26dc4c..0000000000 --- a/e2e/react-start/basic/tests/fixture-api.spec.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { expect, test } from '@playwright/test' - -test('server API receives canned users without a fixture listener', async ({ - request, -}) => { - const response = await request.get('/api/users') - expect(response.ok()).toBe(true) - const users = await response.json() - expect(users).toHaveLength(10) - expect(users[0]).toMatchObject({ id: 1, name: 'Leanne Graham' }) -}) diff --git a/e2e/react-start/basic/tests/redirect.spec.ts b/e2e/react-start/basic/tests/redirect.spec.ts index 010ecec155..34ba7b6ea9 100644 --- a/e2e/react-start/basic/tests/redirect.spec.ts +++ b/e2e/react-start/basic/tests/redirect.spec.ts @@ -1,15 +1,20 @@ import queryString from 'node:querystring' -import { expect } from '@playwright/test' -import { test } from '@tanstack/router-e2e-utils' +import { expect, type Page } from '@playwright/test' import combinateImport from 'combinate' -import type { Page } from '@playwright/test' +import { + getDummyServerPort, + getTestServerPort, + test, +} from '@tanstack/router-e2e-utils' +import { getE2EPortKey } from './utils/getE2EPortKey.ts' // somehow playwright does not correctly import default exports const combinate = (combinateImport as any).default as typeof combinateImport +const e2ePortKey = getE2EPortKey() -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(e2ePortKey) -const EXTERNAL_ORIGIN = `http://127.0.0.1:${PORT}` +const EXTERNAL_HOST_PORT = await getDummyServerPort(e2ePortKey) const POSTS_URL = `http://localhost:${PORT}/posts` async function waitForRouterIdle(page: Page) { @@ -106,7 +111,7 @@ test.describe('redirects', () => { page, }) => { const q = queryString.stringify({ - externalHost: `${EXTERNAL_ORIGIN}/`, + externalHost: `http://localhost:${EXTERNAL_HOST_PORT}/`, }) if (scenario === 'navigate') { @@ -119,7 +124,7 @@ test.describe('redirects', () => { await page.goto(`/redirect/external/via-${thrower}?${q}`) } - const url = `${EXTERNAL_ORIGIN}/` + const url = `http://localhost:${EXTERNAL_HOST_PORT}/` await page.waitForURL(url) expect(page.url()).toBe(url) @@ -142,7 +147,7 @@ test.describe('redirects', () => { }) => { let fullPageLoad = false const q = queryString.stringify({ - externalHost: `${EXTERNAL_ORIGIN}/`, + externalHost: `http://localhost:${EXTERNAL_HOST_PORT}/`, reloadDocument, }) @@ -165,7 +170,10 @@ test.describe('redirects', () => { await page.goto(`/redirect/${target}/serverFn/via-${thrower}?${q}`) } - const url = target === 'internal' ? POSTS_URL : `${EXTERNAL_ORIGIN}/` + const url = + target === 'internal' + ? POSTS_URL + : `http://localhost:${EXTERNAL_HOST_PORT}/` await page.waitForURL(url) @@ -194,7 +202,7 @@ test.describe('redirects', () => { page, }) => { const q = queryString.stringify({ - externalHost: `${EXTERNAL_ORIGIN}/`, + externalHost: `http://localhost:${EXTERNAL_HOST_PORT}/`, reloadDocument, }) @@ -211,7 +219,10 @@ test.describe('redirects', () => { await button.click() - const url = target === 'internal' ? POSTS_URL : `${EXTERNAL_ORIGIN}/` + const url = + target === 'internal' + ? POSTS_URL + : `http://localhost:${EXTERNAL_HOST_PORT}/` await page.waitForURL(url) expect(page.url()).toBe(url) if (target === 'internal') { diff --git a/e2e/react-start/basic/tests/setup/dev-server.setup.ts b/e2e/react-start/basic/tests/setup/dev-server.setup.ts deleted file mode 100644 index d16ff0bb54..0000000000 --- a/e2e/react-start/basic/tests/setup/dev-server.setup.ts +++ /dev/null @@ -1,19 +0,0 @@ -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/setup/global.setup.ts b/e2e/react-start/basic/tests/setup/global.setup.ts new file mode 100644 index 0000000000..cd38c35885 --- /dev/null +++ b/e2e/react-start/basic/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import { getE2EPortKey } from '../utils/getE2EPortKey.ts' + +export default async function setup() { + await e2eStartDummyServer(getE2EPortKey()) +} diff --git a/e2e/react-start/basic/tests/setup/global.teardown.ts b/e2e/react-start/basic/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..36e5c92858 --- /dev/null +++ b/e2e/react-start/basic/tests/setup/global.teardown.ts @@ -0,0 +1,8 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import { getE2EPortKey } from '../utils/getE2EPortKey.ts' + +export default async function teardown() { + try { + await e2eStopDummyServer(getE2EPortKey()) + } catch {} +} diff --git a/e2e/react-start/basic/tests/setup/waitForDummyServer.ts b/e2e/react-start/basic/tests/setup/waitForDummyServer.ts new file mode 100644 index 0000000000..88c18fd79e --- /dev/null +++ b/e2e/react-start/basic/tests/setup/waitForDummyServer.ts @@ -0,0 +1,24 @@ +import { getDummyServerPort } from '@tanstack/router-e2e-utils' +import { getE2EPortKey } from '../utils/getE2EPortKey.ts' + +const timeoutMs = 10_000 +const retryIntervalMs = 100 + +export default async function waitForDummyServer() { + const port = await getDummyServerPort(getE2EPortKey()) + const deadline = Date.now() + timeoutMs + + while (Date.now() < deadline) { + try { + const response = await fetch(`http://localhost:${port}/`) + + if (response.ok) { + return + } + } catch {} + + await new Promise((resolve) => setTimeout(resolve, retryIntervalMs)) + } + + throw new Error(`Timed out waiting for dummy server on port ${port}`) +} diff --git a/e2e/react-start/basic/tests/spa-shell.spec.ts b/e2e/react-start/basic/tests/spa-shell.spec.ts deleted file mode 100644 index f42195e762..0000000000 --- a/e2e/react-start/basic/tests/spa-shell.spec.ts +++ /dev/null @@ -1,53 +0,0 @@ -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/basic/tests/utils/getE2EPortKey.ts b/e2e/react-start/basic/tests/utils/getE2EPortKey.ts new file mode 100644 index 0000000000..48be6a9027 --- /dev/null +++ b/e2e/react-start/basic/tests/utils/getE2EPortKey.ts @@ -0,0 +1,5 @@ +import { getPackageName } from './getPackageName.ts' + +export function getE2EPortKey() { + return process.env.E2E_PORT_KEY ?? getPackageName() +} diff --git a/e2e/react-start/clerk-basic/package.json b/e2e/react-start/clerk-basic/package.json index 7838b4cee1..65f405eb69 100644 --- a/e2e/react-start/clerk-basic/package.json +++ b/e2e/react-start/clerk-basic/package.json @@ -8,7 +8,7 @@ "dev:e2e": "vite dev", "build": "exit 0; vite build", "start": "node .output/server/index.mjs", - "test:e2e": "exit 0; playwright test --project=chromium" + "test:e2e": "exit 0; rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@clerk/tanstack-react-start": "^0.19.0", diff --git a/e2e/react-start/clerk-basic/playwright.config.ts b/e2e/react-start/clerk-basic/playwright.config.ts index 82678ac00b..18b8905468 100644 --- a/e2e/react-start/clerk-basic/playwright.config.ts +++ b/e2e/react-start/clerk-basic/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,8 +20,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/react-start/csp/package.json b/e2e/react-start/csp/package.json index fd8987bcef..bbe4df9bbc 100644 --- a/e2e/react-start/csp/package.json +++ b/e2e/react-start/csp/package.json @@ -8,7 +8,7 @@ "dev:e2e": "vite dev", "build": "vite build && tsc --noEmit", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", @@ -22,7 +22,7 @@ "@types/node": "^22.10.2", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", - "srvx": "^1.0.0", + "srvx": "^0.11.9", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" diff --git a/e2e/react-start/csp/playwright.config.ts b/e2e/react-start/csp/playwright.config.ts index 87b32e1f50..5f9de5709e 100644 --- a/e2e/react-start/csp/playwright.config.ts +++ b/e2e/react-start/csp/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -20,8 +21,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/react-start/css-inline/package.json b/e2e/react-start/css-inline/package.json index 6c5dd031c6..7d9c0520fc 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": "^1.0.0" + "srvx": "^0.11.9" }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.3.1", + "@rsbuild/core": "^2.1.0", "@rsbuild/plugin-react": "^2.0.0", "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", @@ -38,47 +38,7 @@ "nx": { "targets": { "test:e2e": { - "parallelism": false, - "outputs": [ - "...", - "{projectRoot}/dist-vite-ssr", - "{projectRoot}/dist-vite-ssr-transform-assets", - "{projectRoot}/dist-vite-transform-assets-ssr", - "{projectRoot}/dist-rsbuild-ssr", - "{projectRoot}/dist-rsbuild-ssr-transform-assets", - "{projectRoot}/dist-rsbuild-transform-assets-ssr" - ] - }, - "build": { - "outputs": [ - "...", - "{projectRoot}/dist-vite-ssr", - "{projectRoot}/dist-rsbuild-ssr" - ] - }, - "test:e2e--vite-ssr": { - "outputs": [ - "...", - "{projectRoot}/dist-vite-ssr" - ] - }, - "test:e2e--vite-ssr--transform-assets": { - "outputs": [ - "...", - "{projectRoot}/dist-vite-ssr-transform-assets" - ] - }, - "test:e2e--rsbuild-ssr": { - "outputs": [ - "...", - "{projectRoot}/dist-rsbuild-ssr" - ] - }, - "test:e2e--rsbuild-ssr--transform-assets": { - "outputs": [ - "...", - "{projectRoot}/dist-rsbuild-ssr-transform-assets" - ] + "parallelism": false } }, "metadata": { diff --git a/e2e/react-start/css-inline/playwright.config.ts b/e2e/react-start/css-inline/playwright.config.ts index 78e7b75252..b5d78f3608 100644 --- a/e2e/react-start/css-inline/playwright.config.ts +++ b/e2e/react-start/css-inline/playwright.config.ts @@ -1,5 +1,7 @@ +import fs from 'node:fs' import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' const inlineCssTransformAssets = @@ -16,8 +18,15 @@ const transformAssetsSuffix = isInlineCssTransformAssets : '' const distDir = process.env.E2E_DIST_DIR ?? `dist-${toolchain}${transformAssetsSuffix}-ssr` +const e2ePortKey = + process.env.E2E_PORT_KEY ?? + `${packageJson.name}-${toolchain}${transformAssetsSuffix}` -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +if (process.env.TEST_WORKER_INDEX === undefined) { + fs.rmSync(`port-${e2ePortKey}.txt`, { force: true }) +} + +const PORT = await getTestServerPort(e2ePortKey) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -31,8 +40,8 @@ export default defineConfig({ webServer: { command: `pnpm build:${toolchain} && pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', env: { E2E_DIST_DIR: distDir, diff --git a/e2e/react-start/css-inline/server.js b/e2e/react-start/css-inline/server.js index 27b2357284..fcdec3b888 100644 --- a/e2e/react-start/css-inline/server.js +++ b/e2e/react-start/css-inline/server.js @@ -3,7 +3,7 @@ import path from 'node:path' import express from 'express' import { toNodeHandler } from 'srvx/node' -const port = Number(process.env.PORT ?? 3000) +const port = process.env.PORT || 3000 const distDir = process.env.E2E_DIST_DIR || 'dist-vite-ssr' const distClientDir = path.resolve(distDir, 'client') @@ -37,10 +37,8 @@ async function createStartServer() { } createStartServer().then((app) => { - const httpServer = app.listen(port, (error) => { - if (error) { - throw error - } - console.info(`E2E app: http://localhost:${httpServer.address().port}`) + app.listen(port, (error) => { + if (error) throw error + console.info(`Start Server: http://localhost:${port}`) }) }) diff --git a/e2e/react-start/css-modules/.gitignore b/e2e/react-start/css-modules/.gitignore index a1fbca128d..229709a89d 100644 --- a/e2e/react-start/css-modules/.gitignore +++ b/e2e/react-start/css-modules/.gitignore @@ -3,4 +3,3 @@ 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 deleted file mode 100644 index e2bd5e13f1..0000000000 --- a/e2e/react-start/css-modules/cloudflare.config.ts +++ /dev/null @@ -1,11 +0,0 @@ -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 25c11d7321..2591161d66 100644 --- a/e2e/react-start/css-modules/package.json +++ b/e2e/react-start/css-modules/package.json @@ -12,8 +12,6 @@ "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", @@ -21,16 +19,13 @@ "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", - "build:rsbuild": "rsbuild build && tsc --noEmit" + "test:e2e": "rm -rf port*.txt; pnpm run test:e2e:dev && pnpm run test:e2e:prod", + "test:e2e:nitro": "rm -rf port*.txt; pnpm run test:e2e:dev:nitro", + "test:e2e:basepath": "rm -rf port*.txt; pnpm run test:e2e:dev:basepath", + "_test:e2e:cloudflare": "echo 'Cloudflare dev mode disabled - React duplication issues' && exit 0" }, "dependencies": { "@tanstack/react-router": "workspace:*", @@ -41,36 +36,17 @@ "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", - "@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", + "nitro": "^3.0.260311-beta", "sass": "^1.97.2", - "srvx": "^1.0.0", + "srvx": "^0.11.9", + "@typescript/native": "npm:typescript@^7.0.2", "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 7e7ad3d9b3..644798ca99 100644 --- a/e2e/react-start/css-modules/playwright.config.ts +++ b/e2e/react-start/css-modules/playwright.config.ts @@ -1,41 +1,37 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } 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) +const PORT = await getTestServerPort( + viteConfig ? `${packageJson.name}-${viteConfig}` : packageJson.name, +) // When using basepath config, the app is served at /my-app const basePath = viteConfig === 'basepath' ? '/my-app' : '' const baseURL = `http://localhost:${PORT}${basePath}` // Select the appropriate dev command based on VITE_CONFIG -const devCommand = viteConfig - ? `pnpm dev:e2e:${viteConfig}` - : 'pnpm dev:e2e --port 0' +const devCommand = viteConfig ? `pnpm dev:e2e:${viteConfig}` : 'pnpm dev:e2e' export default defineConfig({ testDir: './tests', - testMatch: isDev ? '**/*.dev.spec.ts' : '**/*.prod.spec.ts', workers: 1, reporter: [['line']], globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', use: { baseURL, }, webServer: { - 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, + command: isDev ? devCommand : `pnpm build && PORT=${PORT} pnpm start`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', env: { VITE_NODE_ENV: 'test', diff --git a/e2e/react-start/css-modules/rsbuild.config.ts b/e2e/react-start/css-modules/rsbuild.config.ts deleted file mode 100644 index 499ed67ebc..0000000000 --- a/e2e/react-start/css-modules/rsbuild.config.ts +++ /dev/null @@ -1,63 +0,0 @@ -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 deleted file mode 100644 index e6878a5410..0000000000 --- a/e2e/react-start/css-modules/src/components/Header.module.css +++ /dev/null @@ -1,14 +0,0 @@ -.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 deleted file mode 100644 index f16b12e8ff..0000000000 --- a/e2e/react-start/css-modules/src/components/Header.tsx +++ /dev/null @@ -1,11 +0,0 @@ -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 2789a3490a..822118990d 100644 --- a/e2e/react-start/css-modules/src/routeTree.gen.ts +++ b/e2e/react-start/css-modules/src/routeTree.gen.ts @@ -10,9 +10,6 @@ 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' @@ -22,21 +19,6 @@ 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', @@ -55,18 +37,12 @@ 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 @@ -74,36 +50,20 @@ 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: - '/' | '/alpha' | '/beta' | '/gamma' | '/modules' | '/quotes' | '/sass-mixin' + fullPaths: '/' | '/modules' | '/quotes' | '/sass-mixin' fileRoutesByTo: FileRoutesByTo - to: - '/' | '/alpha' | '/beta' | '/gamma' | '/modules' | '/quotes' | '/sass-mixin' - id: - | '__root__' - | '/' - | '/alpha' - | '/beta' - | '/gamma' - | '/modules' - | '/quotes' - | '/sass-mixin' + to: '/' | '/modules' | '/quotes' | '/sass-mixin' + id: '__root__' | '/' | '/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 @@ -118,27 +78,6 @@ 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' @@ -165,9 +104,6 @@ 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 deleted file mode 100644 index e894cd758f..0000000000 --- a/e2e/react-start/css-modules/src/routes/alpha.tsx +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 4f139ac41a..0000000000 --- a/e2e/react-start/css-modules/src/routes/beta.tsx +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index a8e036b85f..0000000000 --- a/e2e/react-start/css-modules/src/routes/gamma.tsx +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 12a606a8d3..0000000000 --- a/e2e/react-start/css-modules/src/styles/alpha.module.css +++ /dev/null @@ -1,4 +0,0 @@ -.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 deleted file mode 100644 index 719686a76b..0000000000 --- a/e2e/react-start/css-modules/src/styles/beta.module.css +++ /dev/null @@ -1,4 +0,0 @@ -.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 deleted file mode 100644 index d0325ac63e..0000000000 --- a/e2e/react-start/css-modules/src/utils/formatTitle.ts +++ /dev/null @@ -1,3 +0,0 @@ -export function formatTitle(title: string) { - return `${title} (repro-format-title)` -} diff --git a/e2e/react-start/css-modules/tests/setup/global.setup.ts b/e2e/react-start/css-modules/tests/setup/global.setup.ts index 7c0fce762a..e8879c0165 100644 --- a/e2e/react-start/css-modules/tests/setup/global.setup.ts +++ b/e2e/react-start/css-modules/tests/setup/global.setup.ts @@ -1,10 +1,20 @@ -import { preOptimizeDevServer, waitForServer } from '@tanstack/router-e2e-utils' +import { + e2eStartDummyServer, + getTestServerPort, + preOptimizeDevServer, + waitForServer, +} from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } export default async function setup() { + await e2eStartDummyServer(packageJson.name) + if (process.env.MODE !== 'dev') return const viteConfig = process.env.VITE_CONFIG // 'nitro' | 'basepath' | 'cloudflare' | undefined - const port = Number(process.env.E2E_APP_PORT ?? 0) + const port = await getTestServerPort( + viteConfig ? `${packageJson.name}-${viteConfig}` : packageJson.name, + ) const basePath = viteConfig === 'basepath' ? '/my-app' : '' const baseURL = `http://localhost:${port}${basePath}` diff --git a/e2e/react-start/css-modules/tests/setup/global.teardown.ts b/e2e/react-start/css-modules/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/react-start/css-modules/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} 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 deleted file mode 100644 index 9a9595f819..0000000000 --- a/e2e/react-start/css-modules/tests/shared-css.prod.spec.ts +++ /dev/null @@ -1,94 +0,0 @@ -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 c9c27f7f9a..9923ab3384 100644 --- a/e2e/react-start/css-modules/vite.config.ts +++ b/e2e/react-start/css-modules/vite.config.ts @@ -21,7 +21,6 @@ export default defineConfig(async () => { port: 3000, }, build: { - outDir: process.env.E2E_DIST_DIR ?? 'dist', cssCodeSplit, }, plugins: [ diff --git a/e2e/react-start/custom-basepath/express-server.ts b/e2e/react-start/custom-basepath/express-server.ts index b9bf393466..1884c5eb5a 100644 --- a/e2e/react-start/custom-basepath/express-server.ts +++ b/e2e/react-start/custom-basepath/express-server.ts @@ -1,6 +1,5 @@ import express from 'express' import { toNodeHandler } from 'srvx/node' -import type { AddressInfo } from 'node:net' import type { NodeHttp1Handler } from 'srvx' const DEVELOPMENT = process.env.NODE_ENV === 'development' @@ -41,11 +40,7 @@ if (DEVELOPMENT) { }) } -const httpServer = app.listen(PORT, (error) => { - if (error) { - throw error - } - console.log( - `E2E app: http://localhost:${(httpServer.address() as AddressInfo).port}`, - ) +app.listen(PORT, (error) => { + if (error) throw error + console.log(`Server is running on http://localhost:${PORT}`) }) diff --git a/e2e/react-start/custom-basepath/package.json b/e2e/react-start/custom-basepath/package.json index e93949eea2..f665ba0598 100644 --- a/e2e/react-start/custom-basepath/package.json +++ b/e2e/react-start/custom-basepath/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "tsx express-server.ts", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", @@ -29,7 +29,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", "cross-env": "^10.0.0", - "srvx": "^1.0.0", + "srvx": "^0.11.9", "tailwindcss": "^4.2.2", "tsx": "^4.20.3", "@typescript/native": "npm:typescript@^7.0.2", diff --git a/e2e/react-start/custom-basepath/playwright.config.ts b/e2e/react-start/custom-basepath/playwright.config.ts index e113ce64ad..5095425f47 100644 --- a/e2e/react-start/custom-basepath/playwright.config.ts +++ b/e2e/react-start/custom-basepath/playwright.config.ts @@ -1,7 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}/custom/basepath` /** @@ -13,19 +18,19 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `pnpm build && PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', - env: { - NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, - }, }, projects: [ diff --git a/e2e/react-start/custom-basepath/src/routes/api.users.ts b/e2e/react-start/custom-basepath/src/routes/api.users.ts index 6fc8cde830..9e055549ef 100644 --- a/e2e/react-start/custom-basepath/src/routes/api.users.ts +++ b/e2e/react-start/custom-basepath/src/routes/api.users.ts @@ -3,7 +3,11 @@ import axios from 'redaxios' import type { User } from '~/utils/users' -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export const Route = createFileRoute('/api/users')({ server: { diff --git a/e2e/react-start/custom-basepath/src/routes/api/users.$id.ts b/e2e/react-start/custom-basepath/src/routes/api/users.$id.ts index 81c071afb5..57682660fd 100644 --- a/e2e/react-start/custom-basepath/src/routes/api/users.$id.ts +++ b/e2e/react-start/custom-basepath/src/routes/api/users.$id.ts @@ -2,7 +2,11 @@ import axios from 'redaxios' import type { User } from '~/utils/users' import { createFileRoute } from '@tanstack/react-router' -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export const Route = createFileRoute('/api/users/$id')({ server: { diff --git a/e2e/react-start/custom-basepath/src/utils/posts.tsx b/e2e/react-start/custom-basepath/src/utils/posts.tsx index d9b98a8c9c..4cc5dcc4c6 100644 --- a/e2e/react-start/custom-basepath/src/utils/posts.tsx +++ b/e2e/react-start/custom-basepath/src/utils/posts.tsx @@ -8,7 +8,11 @@ export type PostType = { body: string } -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export const fetchPost = createServerFn({ method: 'GET' }) .validator((postId: string) => postId) diff --git a/e2e/react-start/custom-basepath/src/utils/users.tsx b/e2e/react-start/custom-basepath/src/utils/users.tsx index 7ba645b383..46be4b1580 100644 --- a/e2e/react-start/custom-basepath/src/utils/users.tsx +++ b/e2e/react-start/custom-basepath/src/utils/users.tsx @@ -3,3 +3,7 @@ export type User = { name: string email: string } + +const PORT = process.env.VITE_SERVER_PORT || 3000 + +export const DEPLOY_URL = `http://localhost:${PORT}` diff --git a/e2e/react-start/custom-basepath/tests/setup/global.setup.ts b/e2e/react-start/custom-basepath/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/react-start/custom-basepath/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/react-start/custom-basepath/tests/setup/global.teardown.ts b/e2e/react-start/custom-basepath/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/react-start/custom-basepath/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/react-start/custom-server-rsbuild/express-server.ts b/e2e/react-start/custom-server-rsbuild/express-server.ts index 68537956b4..23784f2efc 100644 --- a/e2e/react-start/custom-server-rsbuild/express-server.ts +++ b/e2e/react-start/custom-server-rsbuild/express-server.ts @@ -1,6 +1,5 @@ import express from 'express' import { toNodeHandler } from 'srvx/node' -import type { AddressInfo } from 'node:net' import type { NodeHttp1Handler } from 'srvx' const DEVELOPMENT = process.env.NODE_ENV === 'development' @@ -59,13 +58,9 @@ if (DEVELOPMENT) { }) const httpServer = app.listen(PORT, async (error) => { - if (error) { - throw error - } + if (error) throw error await devServer.afterListen() - console.log( - `E2E app: http://localhost:${(httpServer.address() as AddressInfo).port}`, - ) + console.log(`Server is running on http://localhost:${PORT}`) }) devServer.connectWebSocket({ server: httpServer }) } else { @@ -80,12 +75,8 @@ if (DEVELOPMENT) { next(error) } }) - const httpServer = app.listen(PORT, (error) => { - if (error) { - throw error - } - console.log( - `E2E app: http://localhost:${(httpServer.address() as AddressInfo).port}`, - ) + app.listen(PORT, (error) => { + if (error) throw error + console.log(`Server is running on http://localhost:${PORT}`) }) } diff --git a/e2e/react-start/custom-server-rsbuild/package.json b/e2e/react-start/custom-server-rsbuild/package.json index 1c5b3af393..865e424daa 100644 --- a/e2e/react-start/custom-server-rsbuild/package.json +++ b/e2e/react-start/custom-server-rsbuild/package.json @@ -10,7 +10,7 @@ "start": "tsx express-server.ts", "test:e2e:dev": "cross-env MODE=dev playwright test --project=chromium", "test:e2e:prod": "cross-env MODE=prod playwright test --project=chromium", - "test:e2e": "pnpm run test:e2e:dev && pnpm run test:e2e:prod" + "test:e2e": "rm -rf port*.txt && pnpm run test:e2e:dev && pnpm run test:e2e:prod" }, "dependencies": { "@tanstack/react-router": "workspace:^", @@ -21,7 +21,7 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.3.1", + "@rsbuild/core": "^2.1.0", "@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": "^1.0.0", + "srvx": "^0.11.9", "tailwindcss": "^4.2.2", "tsx": "^4.20.3", "@typescript/native": "npm:typescript@^7.0.2", diff --git a/e2e/react-start/custom-server-rsbuild/playwright.config.ts b/e2e/react-start/custom-server-rsbuild/playwright.config.ts index f0542500fd..eb8b43f648 100644 --- a/e2e/react-start/custom-server-rsbuild/playwright.config.ts +++ b/e2e/react-start/custom-server-rsbuild/playwright.config.ts @@ -1,9 +1,11 @@ import { defineConfig, devices } from '@playwright/test' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } const mode = process.env.MODE ?? 'prod' const isDev = mode === 'dev' -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(`${packageJson.name}-${mode}`) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -13,8 +15,8 @@ export default defineConfig({ use: { baseURL }, webServer: { command: isDev ? 'pnpm dev:e2e' : 'pnpm build && pnpm start', - wait: { stdout: /E2E app: http:\/\/localhost:(?\d+)/ }, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', env: { PORT: String(PORT), diff --git a/e2e/react-start/deferred-hydration/package.json b/e2e/react-start/deferred-hydration/package.json index 5a33407435..fb8a99c8e3 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.3.1", + "@rsbuild/core": "^2.1.0", "@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": "^1.0.0", + "srvx": "^0.11.9", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" @@ -42,12 +42,6 @@ "targets": { "test:e2e": { "parallelism": false - }, - "build": { - "outputs": [ - "...", - "{projectRoot}/dist-vite-ssr" - ] } }, "metadata": { diff --git a/e2e/react-start/deferred-hydration/playwright.config.ts b/e2e/react-start/deferred-hydration/playwright.config.ts index d88c59fc9d..0125792d4b 100644 --- a/e2e/react-start/deferred-hydration/playwright.config.ts +++ b/e2e/react-start/deferred-hydration/playwright.config.ts @@ -1,9 +1,12 @@ +import fs from 'node:fs' import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' const distDir = process.env.E2E_DIST_DIR ?? `dist-${toolchain}-ssr` - +const e2ePortKey = + process.env.E2E_PORT_KEY ?? `${packageJson.name}-${toolchain}` const mode = process.env.MODE ?? 'prod' const isDev = mode === 'dev' const serverEntryFile = toolchain === 'rsbuild' ? 'index.js' : 'server.js' @@ -11,7 +14,11 @@ const startCommand = `pnpm exec srvx --prod --dir=. -s ${distDir}/client --entry const devCommand = toolchain === 'rsbuild' ? 'pnpm dev:rsbuild' : 'pnpm dev:vite' -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +if (process.env.TEST_WORKER_INDEX === undefined) { + fs.rmSync(`port-${e2ePortKey}.txt`, { force: true }) +} + +const PORT = await getTestServerPort(e2ePortKey) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -19,11 +26,12 @@ export default defineConfig({ workers: 1, reporter: [['line']], globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', use: { baseURL }, webServer: { command: isDev ? `${devCommand} --port ${PORT}` : startCommand, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', env: { E2E_DIST_DIR: distDir, @@ -32,6 +40,7 @@ export default defineConfig({ PORT: String(PORT), VITE_SERVER_PORT: String(PORT), E2E_TOOLCHAIN: toolchain, + E2E_PORT_KEY: e2ePortKey, }, }, projects: [ diff --git a/e2e/react-start/deferred-hydration/tests/setup/global.setup.ts b/e2e/react-start/deferred-hydration/tests/setup/global.setup.ts index 704bbef3e2..1117664a14 100644 --- a/e2e/react-start/deferred-hydration/tests/setup/global.setup.ts +++ b/e2e/react-start/deferred-hydration/tests/setup/global.setup.ts @@ -1,11 +1,24 @@ -import { preOptimizeDevServer, waitForServer } from '@tanstack/router-e2e-utils' +import { + e2eStartDummyServer, + getTestServerPort, + preOptimizeDevServer, + waitForServer, +} from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +function getE2EPortKey() { + const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' + return process.env.E2E_PORT_KEY ?? `${packageJson.name}-${toolchain}` +} 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 e2ePortKey = getE2EPortKey() + + await e2eStartDummyServer(e2ePortKey) + + const port = await getTestServerPort(e2ePortKey) const baseURL = `http://localhost:${port}` await waitForServer(baseURL) diff --git a/e2e/react-start/deferred-hydration/tests/setup/global.teardown.ts b/e2e/react-start/deferred-hydration/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..df79f50e82 --- /dev/null +++ b/e2e/react-start/deferred-hydration/tests/setup/global.teardown.ts @@ -0,0 +1,13 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +function getE2EPortKey() { + const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' + return process.env.E2E_PORT_KEY ?? `${packageJson.name}-${toolchain}` +} + +export default async function teardown() { + if (process.env.MODE !== 'dev') return + + await e2eStopDummyServer(getE2EPortKey()) +} diff --git a/e2e/react-start/dev-ssr-styles/package.json b/e2e/react-start/dev-ssr-styles/package.json index a5300e836e..c9c14943d4 100644 --- a/e2e/react-start/dev-ssr-styles/package.json +++ b/e2e/react-start/dev-ssr-styles/package.json @@ -22,9 +22,13 @@ "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": "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" + "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": "rm -rf port*.txt; 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": "rm -rf port*.txt; 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" }, "dependencies": { "@tanstack/react-router": "workspace:*", @@ -40,8 +44,8 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "nitro": "^3.0.260903-beta", - "srvx": "^1.0.0", + "nitro": "^3.0.260311-beta", + "srvx": "^0.11.9", "@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 71cc8ed2da..a1fdd7c3ef 100644 --- a/e2e/react-start/dev-ssr-styles/playwright.config.ts +++ b/e2e/react-start/dev-ssr-styles/playwright.config.ts @@ -1,5 +1,6 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } import { ssrStylesMode, useNitro, viteBundledDev } from './env' const mode = process.env.MODE ?? 'prod' @@ -8,13 +9,24 @@ const isDev = mode === 'dev' // Build a unique port key per dimension combination (ssrStyles mode + nitro) // e.g. "...dev-ssr-styles", "...dev-ssr-styles-disabled", "...dev-ssr-styles-nitro", // "...dev-ssr-styles-disabled-nitro" +function getPortKey() { + let key = packageJson.name + if (ssrStylesMode !== 'default') { + key += `-${ssrStylesMode}` + } + if (useNitro) { + key += '-nitro' + } + if (viteBundledDev) { + key += '-bundled-dev' + } + return key +} -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(getPortKey()) 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') { @@ -32,6 +44,7 @@ export default defineConfig({ reporter: [['line']], globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', use: { baseURL, @@ -39,8 +52,8 @@ export default defineConfig({ webServer: { command: isDev ? getDevCommand() : `pnpm build && PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', env: { VITE_NODE_ENV: 'test', diff --git a/e2e/react-start/dev-ssr-styles/src/components/CodeSplitStyledBox.tsx b/e2e/react-start/dev-ssr-styles/src/components/CodeSplitStyledBox.tsx deleted file mode 100644 index 49d2f96c39..0000000000 --- a/e2e/react-start/dev-ssr-styles/src/components/CodeSplitStyledBox.tsx +++ /dev/null @@ -1,9 +0,0 @@ -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 96c0a37142..dceedffdc1 100644 --- a/e2e/react-start/dev-ssr-styles/src/routeTree.gen.ts +++ b/e2e/react-start/dev-ssr-styles/src/routeTree.gen.ts @@ -10,63 +10,33 @@ 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: '/' | '/css-import-order' | '/inline-css' | '/module-state' + fullPaths: '/' fileRoutesByTo: FileRoutesByTo - to: '/' | '/css-import-order' | '/inline-css' | '/module-state' - id: '__root__' | '/' | '/css-import-order' | '/inline-css' | '/module-state' + to: '/' + id: '__root__' | '/' fileRoutesById: FileRoutesById } export interface RootRouteChildren { IndexRoute: typeof IndexRoute - CssImportOrderRoute: typeof CssImportOrderRoute - InlineCssRoute: typeof InlineCssRoute - ModuleStateRoute: typeof ModuleStateRoute } declare module '@tanstack/react-router' { @@ -78,35 +48,11 @@ 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 deleted file mode 100644 index 345254bb8c..0000000000 --- a/e2e/react-start/dev-ssr-styles/src/routes/css-import-order.tsx +++ /dev/null @@ -1,17 +0,0 @@ -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 62fb237750..f5fadf464d 100644 --- a/e2e/react-start/dev-ssr-styles/src/routes/index.tsx +++ b/e2e/react-start/dev-ssr-styles/src/routes/index.tsx @@ -1,5 +1,4 @@ import { createFileRoute } from '@tanstack/react-router' -import { CodeSplitStyledBox } from '../components/CodeSplitStyledBox' export const Route = createFileRoute('/')({ component: Home, @@ -9,7 +8,9 @@ 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 deleted file mode 100644 index ffc59128e0..0000000000 --- a/e2e/react-start/dev-ssr-styles/src/routes/inline-css.tsx +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index 546217efc3..0000000000 --- a/e2e/react-start/dev-ssr-styles/src/routes/module-state.ts +++ /dev/null @@ -1,11 +0,0 @@ -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 4285da0c86..06b48f8a7c 100644 --- a/e2e/react-start/dev-ssr-styles/src/styles/app.css +++ b/e2e/react-start/dev-ssr-styles/src/styles/app.css @@ -5,10 +5,9 @@ body { background-color: #f0f4f8; } -@layer utilities { - .inline-css-layout { - margin: 12px; - padding: 24px; - border: 3px solid black; - } +.styled-box { + background-color: #3b82f6; + color: white; + padding: 24px; + border-radius: 12px; } 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 deleted file mode 100644 index d6a50211ee..0000000000 --- a/e2e/react-start/dev-ssr-styles/src/styles/code-split-route.module.css +++ /dev/null @@ -1,7 +0,0 @@ -.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 deleted file mode 100644 index 4f73ddab9c..0000000000 --- a/e2e/react-start/dev-ssr-styles/src/styles/css-import-base.css +++ /dev/null @@ -1,5 +0,0 @@ -.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 deleted file mode 100644 index afcb4797d9..0000000000 --- a/e2e/react-start/dev-ssr-styles/src/styles/css-import-order.css +++ /dev/null @@ -1,7 +0,0 @@ -@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 deleted file mode 100644 index 13810d6c98..0000000000 --- a/e2e/react-start/dev-ssr-styles/src/styles/embedded-preflight.css +++ /dev/null @@ -1,6 +0,0 @@ -* { - --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 deleted file mode 100644 index 171ed5e174..0000000000 --- a/e2e/react-start/dev-ssr-styles/src/styles/embedded-theme.css +++ /dev/null @@ -1,3 +0,0 @@ -: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 deleted file mode 100644 index 01f81c3b86..0000000000 --- a/e2e/react-start/dev-ssr-styles/src/styles/embedded-utilities.css +++ /dev/null @@ -1,3 +0,0 @@ -.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 deleted file mode 100644 index 7b6b68c48d..0000000000 --- a/e2e/react-start/dev-ssr-styles/src/styles/embedded.css +++ /dev/null @@ -1,3 +0,0 @@ -@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 deleted file mode 100644 index 7916b3ef16..0000000000 --- a/e2e/react-start/dev-ssr-styles/src/styles/ssr-background.svg +++ /dev/null @@ -1 +0,0 @@ - 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 f5b72a1bca..cb1ba0b29b 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 { createHmrFileEditor, test } from '@tanstack/router-e2e-utils' +import { test } from '@tanstack/router-e2e-utils' import { ssrStylesMode } from '../env' // Whitelist errors that can occur in CI: @@ -14,60 +14,14 @@ 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 }) @@ -98,9 +52,7 @@ test.describe(`dev.ssrStyles (mode=${ssrStylesMode})`, () => { expect(href).toMatch(/^\/@tanstack-start\/styles\.css/) }) - test('CSS from a code-split route component is applied during SSR', async ({ - page, - }) => { + test('CSS is applied on initial page load (SSR)', async ({ page }) => { await page.goto('/') const element = page.getByTestId('styled-box') @@ -112,81 +64,6 @@ 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 deleted file mode 100644 index c564a9977a..0000000000 --- a/e2e/react-start/dev-ssr-styles/tests/inline-css.spec.ts +++ /dev/null @@ -1,35 +0,0 @@ -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 43fad46254..2bfd33163d 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,45 +1,39 @@ -import { chromium, expect } from '@playwright/test' -import { preOptimizeDevServer, waitForServer } from '@tanstack/router-e2e-utils' -import { ssrStylesMode } from '../../env' +import { + e2eStartDummyServer, + getTestServerPort, + preOptimizeDevServer, + waitForServer, +} from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } +import { ssrStylesMode, useNitro, viteBundledDev } from '../../env' + +function getPortKey() { + let key = packageJson.name + if (ssrStylesMode !== 'default') { + key += `-${ssrStylesMode}` + } + if (useNitro) { + key += '-nitro' + } + if (viteBundledDev) { + key += '-bundled-dev' + } + return key +} export default async function setup() { - if (process.env.MODE !== 'dev') { - return - } + const portKey = getPortKey() - const port = Number(process.env.E2E_APP_PORT ?? 0) + await e2eStartDummyServer(portKey) + + if (process.env.MODE !== 'dev') return + + const port = await getTestServerPort(portKey) const baseURL = `http://localhost:${port}` await waitForServer(baseURL) - - // 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' }) + await preOptimizeDevServer({ + baseURL, + readyTestId: 'home-heading', + }) } diff --git a/e2e/react-start/dev-ssr-styles/tests/setup/global.teardown.ts b/e2e/react-start/dev-ssr-styles/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..0e44fca325 --- /dev/null +++ b/e2e/react-start/dev-ssr-styles/tests/setup/global.teardown.ts @@ -0,0 +1,21 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } +import { ssrStylesMode, useNitro, viteBundledDev } from '../../env' + +function getPortKey() { + let key = packageJson.name + if (ssrStylesMode !== 'default') { + key += `-${ssrStylesMode}` + } + if (useNitro) { + key += '-nitro' + } + if (viteBundledDev) { + key += '-bundled-dev' + } + return key +} + +export default async function teardown() { + await e2eStopDummyServer(getPortKey()) +} diff --git a/e2e/react-start/dev-ssr-styles/vite.config.ts b/e2e/react-start/dev-ssr-styles/vite.config.ts index df5ea34504..555137b543 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: { bundledDev: viteBundledDev }, + experimental: viteBundledDev ? { bundledDev: true } : undefined, server: { port: 3000, }, diff --git a/e2e/react-start/early-hints/package.json b/e2e/react-start/early-hints/package.json index 1615b99430..2945148950 100644 --- a/e2e/react-start/early-hints/package.json +++ b/e2e/react-start/early-hints/package.json @@ -10,7 +10,7 @@ "preview": "vite preview", "gen-certs": "node --import tsx tests/gen-certs.ts", "start": "pnpm gen-certs && srvx --prod --tls --cert=tests/.tmp/tls/server.crt --key=tests/.tmp/tls/server.key -s ../client dist/server/server.js", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", @@ -27,20 +27,10 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", "node-forge": "^1.3.1", - "srvx": "^1.0.0", + "srvx": "0.11.15", "tsx": "4.20.3", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" - }, - "nx": { - "targets": { - "test:e2e": { - "outputs": [ - "...", - "{projectRoot}/tests/.tmp/tls" - ] - } - } } } diff --git a/e2e/react-start/early-hints/playwright.config.ts b/e2e/react-start/early-hints/playwright.config.ts index b3606d5586..a2435bcf7b 100644 --- a/e2e/react-start/early-hints/playwright.config.ts +++ b/e2e/react-start/early-hints/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) const baseURL = `https://localhost:${PORT}` export default defineConfig({ @@ -16,8 +17,8 @@ export default defineConfig({ webServer: { command: `pnpm build && pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', ignoreHTTPSErrors: true, env: { 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 6d2d31d836..df0984079e 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 @@ -1,5 +1,7 @@ -import { connect } from 'node:http2' import { expect, test } from '@playwright/test' +import { connect } from 'node:http2' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from '../package.json' with { type: 'json' } import type { IncomingHttpHeaders } from 'node:http2' type Http2Response = { @@ -46,14 +48,14 @@ function linkHeader(headers: IncomingHttpHeaders): string { function earlyHintsLinkHeader(response: Http2Response): string { expect(response.earlyHints.length).toBe(1) - return linkHeader(response.earlyHints[0]) + return linkHeader(response.earlyHints[0]!) } test.describe('Early Hints - HTTP/2 Protocol', () => { let baseURL: string test.beforeAll(async () => { - const PORT = Number(process.env.E2E_APP_PORT ?? 0) + const PORT = await getTestServerPort(packageJson.name) baseURL = `https://localhost:${PORT}` }) @@ -103,9 +105,7 @@ 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;\s*fetchpriority=low/, - ) + expect(link).toMatch(/<[^>]+>;\s*rel=modulepreload;\s*as=script/) }) test('CSS module assets are included in early hints', async () => { @@ -137,7 +137,7 @@ test.describe('Early Hints - HTTP/2 Protocol', () => { expect(response.earlyHints.length).toBe(1) - const link = linkHeader(response.earlyHints[0]) + const link = linkHeader(response.earlyHints[0]!) expect(link).toContain('rel=modulepreload; as=script') expect(link).toContain('; rel=preconnect') @@ -147,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; fetchpriority=low') + expect(link).toContain('rel=modulepreload; as=script') expect(link).toContain('; rel=preconnect') }) diff --git a/e2e/react-start/flamegraph-bench/package.json b/e2e/react-start/flamegraph-bench/package.json index 72410b13e1..eb72de699a 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": "^1.0.0" + "srvx": "^0.11.9" }, "devDependencies": { "@platformatic/flame": "latest", "@vitejs/plugin-react": "^6.0.1", - "nitro": "^3.0.260903-beta", + "nitro": "^3.0.260311-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 76a5d86b1f..7a6dc23f76 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.3.1", + "@rsbuild/core": "^2.1.0", "@rsbuild/plugin-react": "^2.0.0", "@tailwindcss/postcss": "^4.2.2", "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/react-start/hmr/playwright.config.ts b/e2e/react-start/hmr/playwright.config.ts index 5840ec157a..c159aad328 100644 --- a/e2e/react-start/hmr/playwright.config.ts +++ b/e2e/react-start/hmr/playwright.config.ts @@ -1,11 +1,13 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' - +const e2ePortKey = + process.env.E2E_PORT_KEY ?? `${packageJson.name}-${toolchain}` const distDir = process.env.E2E_DIST_DIR ?? 'dist' const viteBundledDev = process.env.E2E_VITE_BUNDLED_DEV === 'true' -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(e2ePortKey) const baseURL = `http://localhost:${PORT}` const devCommand = toolchain === 'rsbuild' ? 'pnpm dev:rsbuild' : 'pnpm dev:vite' @@ -16,6 +18,7 @@ export default defineConfig({ reporter: [['line']], globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', use: { baseURL, @@ -23,14 +26,15 @@ export default defineConfig({ webServer: { command: `${devCommand} --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', env: { VITE_NODE_ENV: 'test', PORT: String(PORT), E2E_TOOLCHAIN: toolchain, E2E_DIST_DIR: distDir, + E2E_PORT_KEY: e2ePortKey, E2E_VITE_BUNDLED_DEV: String(viteBundledDev), }, }, diff --git a/e2e/react-start/hmr/tests/app.spec.ts b/e2e/react-start/hmr/tests/app.spec.ts index 645c9b06f3..fe6dd99389 100644 --- a/e2e/react-start/hmr/tests/app.spec.ts +++ b/e2e/react-start/hmr/tests/app.spec.ts @@ -607,18 +607,8 @@ 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') @@ -932,7 +922,6 @@ 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/hmr/tests/setup/global.setup.ts b/e2e/react-start/hmr/tests/setup/global.setup.ts index 32207ab79f..fb9aad22ae 100644 --- a/e2e/react-start/hmr/tests/setup/global.setup.ts +++ b/e2e/react-start/hmr/tests/setup/global.setup.ts @@ -1,7 +1,22 @@ -import { preOptimizeDevServer, waitForServer } from '@tanstack/router-e2e-utils' +import { + e2eStartDummyServer, + getTestServerPort, + preOptimizeDevServer, + waitForServer, +} from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +function getE2EPortKey() { + const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' + return process.env.E2E_PORT_KEY ?? `${packageJson.name}-${toolchain}` +} export default async function setup() { - const port = Number(process.env.E2E_APP_PORT ?? 0) + const e2ePortKey = getE2EPortKey() + + await e2eStartDummyServer(e2ePortKey) + + const port = await getTestServerPort(e2ePortKey) const baseURL = `http://localhost:${port}` await waitForServer(baseURL) diff --git a/e2e/react-start/hmr/tests/setup/global.teardown.ts b/e2e/react-start/hmr/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..e17856dd82 --- /dev/null +++ b/e2e/react-start/hmr/tests/setup/global.teardown.ts @@ -0,0 +1,11 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +function getE2EPortKey() { + const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' + return process.env.E2E_PORT_KEY ?? `${packageJson.name}-${toolchain}` +} + +export default async function teardown() { + await e2eStopDummyServer(getE2EPortKey()) +} diff --git a/e2e/react-start/i18n-paraglide/package.json b/e2e/react-start/i18n-paraglide/package.json index ca65ead76d..5b525891a6 100644 --- a/e2e/react-start/i18n-paraglide/package.json +++ b/e2e/react-start/i18n-paraglide/package.json @@ -8,7 +8,7 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js", "build": "vite build && tsc --noEmit", "preview": "vite preview", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", @@ -30,23 +30,5 @@ "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" - }, - "nx": { - "targets": { - "build": { - "outputs": [ - "...", - "{projectRoot}/src/paraglide", - "{projectRoot}/project.inlang/cache" - ] - }, - "test:e2e": { - "outputs": [ - "...", - "{projectRoot}/src/paraglide", - "{projectRoot}/project.inlang/cache" - ] - } - } } } diff --git a/e2e/react-start/i18n-paraglide/playwright.config.ts b/e2e/react-start/i18n-paraglide/playwright.config.ts index 972522350e..38690f09d8 100644 --- a/e2e/react-start/i18n-paraglide/playwright.config.ts +++ b/e2e/react-start/i18n-paraglide/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -20,8 +21,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/react-start/import-protection-custom-config/package.json b/e2e/react-start/import-protection-custom-config/package.json index c088eff106..25ff3f2738 100644 --- a/e2e/react-start/import-protection-custom-config/package.json +++ b/e2e/react-start/import-protection-custom-config/package.json @@ -8,8 +8,8 @@ "dev:e2e": "vite dev", "build": "vite build && tsc --noEmit", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e:mockMode": "playwright test --project=chromium", - "test:e2e:errorMode": "BEHAVIOR=error playwright test --project=chromium", + "test:e2e:mockMode": "rm -rf port*.txt; playwright test --project=chromium", + "test:e2e:errorMode": "rm -rf port*.txt; BEHAVIOR=error playwright test --project=chromium", "test:e2e": "pnpm run test:e2e:mockMode && pnpm run test:e2e:errorMode" }, "dependencies": { @@ -25,23 +25,9 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "srvx": "^1.0.0", + "srvx": "^0.11.9", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" - }, - "nx": { - "targets": { - "test:e2e": { - "outputs": [ - "{projectRoot}/dist", - "{projectRoot}/test-results", - "{projectRoot}/webserver-build.log", - "{projectRoot}/violations.*.json", - "{projectRoot}/error-build.log", - "{projectRoot}/error-*-result.json" - ] - } - } } } diff --git a/e2e/react-start/import-protection-custom-config/playwright.config.ts b/e2e/react-start/import-protection-custom-config/playwright.config.ts index ab90f2911f..31a55ba3bc 100644 --- a/e2e/react-start/import-protection-custom-config/playwright.config.ts +++ b/e2e/react-start/import-protection-custom-config/playwright.config.ts @@ -1,8 +1,9 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import { isErrorMode } from './tests/utils/isErrorMode' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` console.log('running in error mode:', isErrorMode.toString()) @@ -26,8 +27,8 @@ export default defineConfig({ : { webServer: { command: `rm -f webserver-build.log violations.build.json violations.dev.json && VITE_SERVER_PORT=${PORT} pnpm build > webserver-build.log 2>&1 && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', cwd: import.meta.dirname, }, diff --git a/e2e/react-start/import-protection-custom-config/tests/error-mode.setup.ts b/e2e/react-start/import-protection-custom-config/tests/error-mode.setup.ts index 5032988d0c..3e666ca1df 100644 --- a/e2e/react-start/import-protection-custom-config/tests/error-mode.setup.ts +++ b/e2e/react-start/import-protection-custom-config/tests/error-mode.setup.ts @@ -1,14 +1,14 @@ -import { execSync, spawn } from 'node:child_process' import fs from 'node:fs' import path from 'node:path' -import { stripVTControlCharacters } from 'node:util' -import { appServerReadyPattern } from '@tanstack/router-e2e-utils' -import { chromium, expect } from '@playwright/test' +import { execSync, spawn } from 'node:child_process' +import { chromium } from '@playwright/test' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from '../package.json' with { type: 'json' } import type { FullConfig } from '@playwright/test' async function waitForHttpOk(url: string, timeoutMs: number): Promise { const start = Date.now() - + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition while (true) { if (Date.now() - start > timeoutMs) { throw new Error(`Timed out waiting for ${url}`) @@ -84,7 +84,8 @@ function captureBuild(cwd: string): void { } async function captureDevErrors(cwd: string): Promise { - const port = 0 + const port = await getTestServerPort(`${packageJson.name}_error_dev`) + const baseURL = `http://localhost:${port}` const logChunks: Array = [] const child = spawn('pnpm', ['exec', 'vite', 'dev', '--port', String(port)], { @@ -98,23 +99,10 @@ async function captureDevErrors(cwd: string): Promise { stdio: ['ignore', 'pipe', 'pipe'], }) - child.stdout.on('data', (d: Buffer) => logChunks.push(d.toString())) - child.stderr.on('data', (d: Buffer) => logChunks.push(d.toString())) + child.stdout?.on('data', (d: Buffer) => logChunks.push(d.toString())) + child.stderr?.on('data', (d: Buffer) => logChunks.push(d.toString())) try { - await expect - .poll( - () => - appServerReadyPattern.exec( - stripVTControlCharacters(logChunks.join('')), - )?.groups?.E2E_APP_PORT, - { timeout: 30_000 }, - ) - .toBeTruthy() - const port = appServerReadyPattern.exec( - stripVTControlCharacters(logChunks.join('')), - )!.groups!.E2E_APP_PORT - const baseURL = `http://localhost:${port}` await waitForHttpOk(baseURL, 30_000) const browser = await chromium.launch() diff --git a/e2e/react-start/import-protection-custom-config/tests/violations.setup.ts b/e2e/react-start/import-protection-custom-config/tests/violations.setup.ts index 89c8bb2b9a..c5187fe074 100644 --- a/e2e/react-start/import-protection-custom-config/tests/violations.setup.ts +++ b/e2e/react-start/import-protection-custom-config/tests/violations.setup.ts @@ -1,9 +1,9 @@ -import { spawn } from 'node:child_process' import fs from 'node:fs' import path from 'node:path' -import { stripVTControlCharacters } from 'node:util' -import { chromium, expect } from '@playwright/test' -import { appServerReadyPattern } from '@tanstack/router-e2e-utils' +import { spawn } from 'node:child_process' +import { chromium } from '@playwright/test' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from '../package.json' with { type: 'json' } import { extractViolationsFromLog } from './violations.utils' import type { FullConfig } from '@playwright/test' @@ -12,6 +12,7 @@ import type { Violation } from './violations.utils' async function waitForHttpOk(url: string, timeoutMs: number): Promise { const start = Date.now() + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition while (true) { if (Date.now() - start > timeoutMs) { throw new Error(`Timed out waiting for ${url}`) @@ -118,6 +119,7 @@ async function runDevPass( cwd: string, port: number, ): Promise> { + const baseURL = `http://localhost:${port}` const logChunks: Array = [] const child = startDevServer(cwd, port) @@ -125,19 +127,6 @@ async function runDevPass( child.stderr?.on('data', (d: Buffer) => logChunks.push(d.toString())) try { - await expect - .poll( - () => - appServerReadyPattern.exec( - stripVTControlCharacters(logChunks.join('')), - )?.groups?.E2E_APP_PORT, - { timeout: 30_000 }, - ) - .toBeTruthy() - const port = appServerReadyPattern.exec( - stripVTControlCharacters(logChunks.join('')), - )!.groups!.E2E_APP_PORT - const baseURL = `http://localhost:${port}` await waitForHttpOk(baseURL, 30_000) const browser = await chromium.launch() @@ -157,7 +146,7 @@ async function runDevPass( } async function captureDevViolations(cwd: string): Promise { - const port = 0 + const port = await getTestServerPort(`${packageJson.name}_dev`) const coldViolations = await runDevPass(cwd, port) diff --git a/e2e/react-start/import-protection/package.json b/e2e/react-start/import-protection/package.json index ad06ba41ea..5459b84437 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.3.1", + "@rsbuild/core": "^2.1.0", "@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": "^1.0.0", + "srvx": "^0.11.9", "@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/playwright.config.ts b/e2e/react-start/import-protection/playwright.config.ts index 6a3df630c3..778e865125 100644 --- a/e2e/react-start/import-protection/playwright.config.ts +++ b/e2e/react-start/import-protection/playwright.config.ts @@ -1,12 +1,16 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' import { isErrorMode } from './tests/utils/isErrorMode' import { getViolationArtifactName } from './tests/violations.utils' +import packageJson from './package.json' with { type: 'json' } +const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' const viteBundledDev = process.env.E2E_VITE_BUNDLED_DEV === 'true' - +const e2ePortKey = + process.env.E2E_PORT_KEY ?? + `${packageJson.name}-${toolchain}${viteBundledDev ? '-bundled-dev' : ''}` const distDir = process.env.E2E_DIST_DIR ?? 'dist' -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(e2ePortKey) const baseURL = `http://localhost:${PORT}` const violationArtifacts = [ getViolationArtifactName('build'), @@ -38,14 +42,15 @@ export default defineConfig({ : { webServer: { command: `rm -f webserver-dev.log ${violationArtifacts} && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', cwd: import.meta.dirname, env: { PORT: String(PORT), VITE_SERVER_PORT: String(PORT), E2E_DIST_DIR: distDir, + E2E_PORT_KEY: e2ePortKey, E2E_VITE_BUNDLED_DEV: String(viteBundledDev), }, }, diff --git a/e2e/react-start/import-protection/src/routes/index.tsx b/e2e/react-start/import-protection/src/routes/index.tsx index ef8544dc3c..c05ed1a7e3 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, useHydrated } from '@tanstack/react-router' +import { createFileRoute } 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,12 +25,10 @@ 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 d74bc6430b..ab44237539 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 -// `getCookie` from `@tanstack/react-start/server`. +// `useSession` from `@tanstack/react-start/server`. export function getSessionData() { const req = getRequest() return { method: req.method } diff --git a/e2e/react-start/import-protection/tests/error-mode.setup.ts b/e2e/react-start/import-protection/tests/error-mode.setup.ts index e562128eea..c844d59e73 100644 --- a/e2e/react-start/import-protection/tests/error-mode.setup.ts +++ b/e2e/react-start/import-protection/tests/error-mode.setup.ts @@ -1,9 +1,9 @@ -import { execSync, spawn } from 'node:child_process' import fs from 'node:fs' import path from 'node:path' -import { stripVTControlCharacters } from 'node:util' -import { appServerReadyPattern } from '@tanstack/router-e2e-utils' -import { chromium, expect } from '@playwright/test' +import { execSync, spawn } from 'node:child_process' +import { chromium } from '@playwright/test' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from '../package.json' with { type: 'json' } import type { FullConfig } from '@playwright/test' /** @@ -20,10 +20,14 @@ import type { FullConfig } from '@playwright/test' */ const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' +const viteBundledDev = process.env.E2E_VITE_BUNDLED_DEV === 'true' +const e2ePortKey = + process.env.E2E_PORT_KEY ?? + `${packageJson.name}-${toolchain}${viteBundledDev ? '-bundled-dev' : ''}` async function waitForHttpOk(url: string, timeoutMs: number): Promise { const start = Date.now() - + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition while (true) { if (Date.now() - start > timeoutMs) { throw new Error(`Timed out waiting for ${url}`) @@ -118,7 +122,8 @@ async function captureDev(cwd: string): Promise { if (fs.existsSync(p)) fs.unlinkSync(p) } - const port = 0 + const port = await getTestServerPort(`${e2ePortKey}-error-dev`) + const baseURL = `http://localhost:${port}` const logFile = path.resolve(cwd, 'error-dev.log') const out = fs.createWriteStream(logFile) @@ -140,28 +145,10 @@ async function captureDev(cwd: string): Promise { stdio: ['ignore', 'pipe', 'pipe'], }) - const logChunks: Array = [] - const record = (data: Buffer) => { - logChunks.push(data.toString()) - out.write(data) - } - child.stdout.on('data', record) - child.stderr.on('data', record) + child.stdout?.on('data', (d: Buffer) => out.write(d)) + child.stderr?.on('data', (d: Buffer) => out.write(d)) try { - await expect - .poll( - () => - appServerReadyPattern.exec( - stripVTControlCharacters(logChunks.join('')), - )?.groups?.E2E_APP_PORT, - { timeout: 30_000 }, - ) - .toBeTruthy() - const port = appServerReadyPattern.exec( - stripVTControlCharacters(logChunks.join('')), - )!.groups!.E2E_APP_PORT - const baseURL = `http://localhost:${port}` await waitForHttpOk(baseURL, 30_000) const browser = await chromium.launch() diff --git a/e2e/react-start/import-protection/tests/violations.setup.ts b/e2e/react-start/import-protection/tests/violations.setup.ts index d0f4f70d03..2f863b398e 100644 --- a/e2e/react-start/import-protection/tests/violations.setup.ts +++ b/e2e/react-start/import-protection/tests/violations.setup.ts @@ -1,9 +1,9 @@ -import { spawn } from 'node:child_process' import fs from 'node:fs' import path from 'node:path' -import { stripVTControlCharacters } from 'node:util' -import { chromium, expect } from '@playwright/test' -import { appServerReadyPattern } from '@tanstack/router-e2e-utils' +import { spawn } from 'node:child_process' +import { chromium } from '@playwright/test' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from '../package.json' with { type: 'json' } import { extractViolationsFromLog, @@ -12,11 +12,16 @@ import { import type { FullConfig } from '@playwright/test' import type { Violation } from './violations.utils' +const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' const viteBundledDev = process.env.E2E_VITE_BUNDLED_DEV === 'true' +const e2ePortKey = + process.env.E2E_PORT_KEY ?? + `${packageJson.name}-${toolchain}${viteBundledDev ? '-bundled-dev' : ''}` async function waitForHttpOk(url: string, timeoutMs: number): Promise { const start = Date.now() + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition while (true) { if (Date.now() - start > timeoutMs) { throw new Error(`Timed out waiting for ${url}`) @@ -172,20 +177,6 @@ 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 @@ -223,6 +214,7 @@ async function runDevPass( cwd: string, port: number, ): Promise> { + const baseURL = `http://localhost:${port}` const logChunks: Array = [] const child = startDevServer(cwd, port) @@ -230,19 +222,6 @@ async function runDevPass( child.stderr?.on('data', (d: Buffer) => logChunks.push(d.toString())) try { - await expect - .poll( - () => - appServerReadyPattern.exec( - stripVTControlCharacters(logChunks.join('')), - )?.groups?.E2E_APP_PORT, - { timeout: 30_000 }, - ) - .toBeTruthy() - const port = appServerReadyPattern.exec( - stripVTControlCharacters(logChunks.join('')), - )!.groups!.E2E_APP_PORT - const baseURL = `http://localhost:${port}` await waitForHttpOk(baseURL, 30_000) const browser = await chromium.launch() @@ -268,7 +247,10 @@ async function runDevPass( * modules are pre-transformed so resolveId/transform paths differ. */ async function captureDevViolations(cwd: string): Promise { - const coldViolations = await runDevPass(cwd, 0) + const coldViolations = await runDevPass( + cwd, + await getTestServerPort(`${e2ePortKey}-violations-cold`), + ) fs.writeFileSync( path.resolve(cwd, getViolationArtifactName('dev')), @@ -280,7 +262,10 @@ async function captureDevViolations(cwd: string): Promise { ) // Warm pass: the .vite cache from the cold run is still on disk. - const warmViolations = await runDevPass(cwd, 0) + const warmViolations = await runDevPass( + cwd, + await getTestServerPort(`${e2ePortKey}-violations-warm`), + ) fs.writeFileSync( path.resolve(cwd, getViolationArtifactName('dev.warm')), diff --git a/e2e/react-start/issue-8049/package.json b/e2e/react-start/issue-8049/package.json index be848d434c..d76b23fc3b 100644 --- a/e2e/react-start/issue-8049/package.json +++ b/e2e/react-start/issue-8049/package.json @@ -6,7 +6,7 @@ "build": "vite build && tsc --noEmit", "dev": "vite dev --port 3000", "dev:e2e": "vite dev", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", diff --git a/e2e/react-start/issue-8049/playwright.config.ts b/e2e/react-start/issue-8049/playwright.config.ts index 46bfbe552e..04fa904ba6 100644 --- a/e2e/react-start/issue-8049/playwright.config.ts +++ b/e2e/react-start/issue-8049/playwright.config.ts @@ -1,8 +1,10 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } const PORT = - Number(process.env.VITE_SERVER_PORT) || Number(process.env.E2E_APP_PORT ?? 0) + Number(process.env.VITE_SERVER_PORT) || + (await getTestServerPort(packageJson.name)) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -12,8 +14,8 @@ export default defineConfig({ use: { baseURL }, webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm dev:e2e --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, projects: [ diff --git a/e2e/react-start/query-integration/package.json b/e2e/react-start/query-integration/package.json index 694289ccc2..4ad1839537 100644 --- a/e2e/react-start/query-integration/package.json +++ b/e2e/react-start/query-integration/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/react-query": "^5.90.0", diff --git a/e2e/react-start/query-integration/playwright.config.ts b/e2e/react-start/query-integration/playwright.config.ts index 82678ac00b..4d86a1dbe7 100644 --- a/e2e/react-start/query-integration/playwright.config.ts +++ b/e2e/react-start/query-integration/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { derivePort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await derivePort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,8 +20,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/react-start/response-reconciliation/.gitignore b/e2e/react-start/response-reconciliation/.gitignore deleted file mode 100644 index 16187ac1de..0000000000 --- a/e2e/react-start/response-reconciliation/.gitignore +++ /dev/null @@ -1,24 +0,0 @@ -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 deleted file mode 100644 index 40a96e8819..0000000000 --- a/e2e/react-start/response-reconciliation/.prettierignore +++ /dev/null @@ -1,4 +0,0 @@ -**/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 deleted file mode 100644 index 7ba0224962..0000000000 --- a/e2e/react-start/response-reconciliation/package.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "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 deleted file mode 100644 index d4c9c58f43..0000000000 --- a/e2e/react-start/response-reconciliation/playwright.config.ts +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index 38f44ef9fb..0000000000 --- a/e2e/react-start/response-reconciliation/rsbuild.config.ts +++ /dev/null @@ -1,20 +0,0 @@ -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 deleted file mode 100644 index 324a462bec..0000000000 --- a/e2e/react-start/response-reconciliation/server.js +++ /dev/null @@ -1,62 +0,0 @@ -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 deleted file mode 100644 index f3d691814f..0000000000 --- a/e2e/react-start/response-reconciliation/src/components/DefaultCatchBoundary.tsx +++ /dev/null @@ -1,20 +0,0 @@ -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 deleted file mode 100644 index 0b720f0e37..0000000000 --- a/e2e/react-start/response-reconciliation/src/components/NotFound.tsx +++ /dev/null @@ -1,10 +0,0 @@ -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 deleted file mode 100644 index db9733d5e6..0000000000 --- a/e2e/react-start/response-reconciliation/src/response-wrapper.ts +++ /dev/null @@ -1,33 +0,0 @@ -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 deleted file mode 100644 index 3dbb6301c3..0000000000 --- a/e2e/react-start/response-reconciliation/src/routeTree.gen.ts +++ /dev/null @@ -1,625 +0,0 @@ -/* 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 deleted file mode 100644 index c5c2209e5a..0000000000 --- a/e2e/react-start/response-reconciliation/src/router.tsx +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index a562991887..0000000000 --- a/e2e/react-start/response-reconciliation/src/routes/__root.tsx +++ /dev/null @@ -1,57 +0,0 @@ -/// -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 deleted file mode 100644 index 54082c10f6..0000000000 --- a/e2e/react-start/response-reconciliation/src/routes/api/-response.ts +++ /dev/null @@ -1,85 +0,0 @@ -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 deleted file mode 100644 index 1ccde76367..0000000000 --- a/e2e/react-start/response-reconciliation/src/routes/api/-tracked-streams.ts +++ /dev/null @@ -1,2 +0,0 @@ -// 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 deleted file mode 100644 index 0018376035..0000000000 --- a/e2e/react-start/response-reconciliation/src/routes/api/-upstream.ts +++ /dev/null @@ -1,14 +0,0 @@ -// 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 deleted file mode 100644 index 62f706a9f1..0000000000 --- a/e2e/react-start/response-reconciliation/src/routes/api/base.ts +++ /dev/null @@ -1,10 +0,0 @@ -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 deleted file mode 100644 index db7ded6c54..0000000000 --- a/e2e/react-start/response-reconciliation/src/routes/api/bulk-headers.ts +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index fd3b88c172..0000000000 --- a/e2e/react-start/response-reconciliation/src/routes/api/clear-returned-headers.ts +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 96823887e5..0000000000 --- a/e2e/react-start/response-reconciliation/src/routes/api/direct-mutation-visible.ts +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index 3ea2bc6d75..0000000000 --- a/e2e/react-start/response-reconciliation/src/routes/api/explicit-set-cookie-header.ts +++ /dev/null @@ -1,16 +0,0 @@ -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 deleted file mode 100644 index baeab15780..0000000000 --- a/e2e/react-start/response-reconciliation/src/routes/api/framing-error.ts +++ /dev/null @@ -1,16 +0,0 @@ -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 deleted file mode 100644 index b597882ff6..0000000000 --- a/e2e/react-start/response-reconciliation/src/routes/api/get-response-header-helper.ts +++ /dev/null @@ -1,17 +0,0 @@ -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 deleted file mode 100644 index 168d38bad4..0000000000 --- a/e2e/react-start/response-reconciliation/src/routes/api/get-response-headers-helper.ts +++ /dev/null @@ -1,20 +0,0 @@ -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 deleted file mode 100644 index eebf7a167e..0000000000 --- a/e2e/react-start/response-reconciliation/src/routes/api/multiple-cookies.ts +++ /dev/null @@ -1,14 +0,0 @@ -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 deleted file mode 100644 index d11056e7a8..0000000000 --- a/e2e/react-start/response-reconciliation/src/routes/api/null-body-status.ts +++ /dev/null @@ -1,18 +0,0 @@ -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 deleted file mode 100644 index 7b42955052..0000000000 --- a/e2e/react-start/response-reconciliation/src/routes/api/readonly-after-next.ts +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index 5b0072f35a..0000000000 --- a/e2e/react-start/response-reconciliation/src/routes/api/redirect-with-cookies.ts +++ /dev/null @@ -1,18 +0,0 @@ -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 deleted file mode 100644 index 96f82bf98d..0000000000 --- a/e2e/react-start/response-reconciliation/src/routes/api/remove-returned-header.ts +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 890280483d..0000000000 --- a/e2e/react-start/response-reconciliation/src/routes/api/replace-after-direct-mutation.ts +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index 97df27d915..0000000000 --- a/e2e/react-start/response-reconciliation/src/routes/api/replace-explicit-set-cookie.ts +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 7d3650147f..0000000000 --- a/e2e/react-start/response-reconciliation/src/routes/api/route-after-next.ts +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index b52c7642af..0000000000 --- a/e2e/react-start/response-reconciliation/src/routes/api/route-before-next.ts +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index 7ac086d652..0000000000 --- a/e2e/react-start/response-reconciliation/src/routes/api/same-boundary-conflict.ts +++ /dev/null @@ -1,21 +0,0 @@ -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 deleted file mode 100644 index 43fd72ec07..0000000000 --- a/e2e/react-start/response-reconciliation/src/routes/api/status-contracts.ts +++ /dev/null @@ -1,42 +0,0 @@ -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 deleted file mode 100644 index 9d93d75b61..0000000000 --- a/e2e/react-start/response-reconciliation/src/routes/api/throw-after-status.ts +++ /dev/null @@ -1,26 +0,0 @@ -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 deleted file mode 100644 index 1aaffd8d36..0000000000 --- a/e2e/react-start/response-reconciliation/src/routes/api/tracked-stream-status.ts +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 640074a035..0000000000 --- a/e2e/react-start/response-reconciliation/src/routes/api/tracked-stream.ts +++ /dev/null @@ -1,23 +0,0 @@ -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 deleted file mode 100644 index f433778fd8..0000000000 --- a/e2e/react-start/response-reconciliation/src/routes/api/two-returned-responses.ts +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index ab938397e9..0000000000 --- a/e2e/react-start/response-reconciliation/src/routes/index.tsx +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 580309b31e..0000000000 --- a/e2e/react-start/response-reconciliation/src/routes/server-functions.tsx +++ /dev/null @@ -1,285 +0,0 @@ -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 deleted file mode 100644 index c0cb69c8ec..0000000000 --- a/e2e/react-start/response-reconciliation/src/routes/ssr.tsx +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index 8d6a6227cd..0000000000 --- a/e2e/react-start/response-reconciliation/src/routes/streamed.tsx +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index cbee8ad31a..0000000000 --- a/e2e/react-start/response-reconciliation/src/server-entry.ts +++ /dev/null @@ -1,84 +0,0 @@ -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 deleted file mode 100644 index 2ac158b799..0000000000 --- a/e2e/react-start/response-reconciliation/src/start.ts +++ /dev/null @@ -1,170 +0,0 @@ -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 deleted file mode 100644 index a38fb439a6..0000000000 --- a/e2e/react-start/response-reconciliation/src/styles/app.css +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 728b0782c5..0000000000 --- a/e2e/react-start/response-reconciliation/tests/response-reconciliation.spec.ts +++ /dev/null @@ -1,1038 +0,0 @@ -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 deleted file mode 100644 index 3824b148e1..0000000000 --- a/e2e/react-start/response-reconciliation/tsconfig.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "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 deleted file mode 100644 index 355e12a2f7..0000000000 --- a/e2e/react-start/response-reconciliation/vite.config.ts +++ /dev/null @@ -1,19 +0,0 @@ -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 9dcfcb6fbc..d69ddfc0bf 100644 --- a/e2e/react-start/root-document-hydration/package.json +++ b/e2e/react-start/root-document-hydration/package.json @@ -10,7 +10,7 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js", "test:e2e:dev": "MODE=dev playwright test --project=chromium", "test:e2e:prod": "MODE=prod playwright test --project=chromium", - "test:e2e": "pnpm run test:e2e:dev && pnpm run test:e2e:prod" + "test:e2e": "rm -rf port*.txt; pnpm run test:e2e:dev && pnpm run test:e2e:prod" }, "dependencies": { "@tanstack/react-router": "workspace:*", @@ -25,7 +25,7 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "srvx": "^1.0.0", + "srvx": "^0.11.9", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" diff --git a/e2e/react-start/root-document-hydration/playwright.config.ts b/e2e/react-start/root-document-hydration/playwright.config.ts index 13dda4e328..18abea0ab1 100644 --- a/e2e/react-start/root-document-hydration/playwright.config.ts +++ b/e2e/react-start/root-document-hydration/playwright.config.ts @@ -1,8 +1,9 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } const isDev = process.env.MODE === 'dev' -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -15,11 +16,9 @@ export default defineConfig({ }, webServer: { - command: isDev - ? 'pnpm dev:e2e --port 0' - : `pnpm build && PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + command: isDev ? 'pnpm dev:e2e' : `pnpm build && PORT=${PORT} pnpm start`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', env: { PORT: String(PORT), diff --git a/e2e/react-start/rsbuild/package.json b/e2e/react-start/rsbuild/package.json index d03ef22542..d0b7566489 100644 --- a/e2e/react-start/rsbuild/package.json +++ b/e2e/react-start/rsbuild/package.json @@ -8,7 +8,7 @@ "dev:e2e": "rsbuild dev --port $PORT", "build": "rsbuild build && tsc --noEmit", "start": "node server.js", - "test:e2e-full": "pnpm build && playwright test --project=chromium" + "test:e2e-full": "pnpm build && sh -c 'rm -f \"port-${E2E_PORT_KEY:-$npm_package_name}.txt\" \"port-${E2E_PORT_KEY:-$npm_package_name}-syntax-error-overlay.txt\"' && playwright test --project=chromium" }, "nx": { "metadata": { @@ -28,13 +28,13 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.3.1", + "@rsbuild/core": "^2.1.0", "@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": "^1.0.0", + "srvx": "^0.10.0", "typescript": "^5.7.2" } } diff --git a/e2e/react-start/rsbuild/playwright.config.ts b/e2e/react-start/rsbuild/playwright.config.ts index e5c9004335..6e8f176361 100644 --- a/e2e/react-start/rsbuild/playwright.config.ts +++ b/e2e/react-start/rsbuild/playwright.config.ts @@ -1,4 +1,17 @@ +import fs from 'node:fs' import { defineConfig, devices } from '@playwright/test' +import packageJson from './package.json' with { type: 'json' } + +const e2ePortKey = process.env.E2E_PORT_KEY ?? packageJson.name + +if (process.env.TEST_WORKER_INDEX === undefined) { + for (const portFile of [ + `port-${e2ePortKey}.txt`, + `port-${e2ePortKey}-syntax-error-overlay.txt`, + ]) { + fs.rmSync(portFile, { force: true }) + } +} export default defineConfig({ testDir: './tests', diff --git a/e2e/react-start/rsbuild/tests/error-overlay.spec.ts b/e2e/react-start/rsbuild/tests/error-overlay.spec.ts index d90647314a..5d6497f740 100644 --- a/e2e/react-start/rsbuild/tests/error-overlay.spec.ts +++ b/e2e/react-start/rsbuild/tests/error-overlay.spec.ts @@ -1,11 +1,12 @@ -import { spawn } from 'node:child_process' import fs from 'node:fs' import path from 'node:path' -import { stripVTControlCharacters } from 'node:util' -import { appServerReadyPattern, test } from '@tanstack/router-e2e-utils' +import { spawn } from 'node:child_process' import { expect } from '@playwright/test' +import { getTestServerPort, test } from '@tanstack/router-e2e-utils' +import packageJson from '../package.json' with { type: 'json' } import type { Page } from '@playwright/test' +const e2ePortKey = process.env.E2E_PORT_KEY ?? packageJson.name const fixtureRoot = path.resolve(import.meta.dirname, '..') const workspaceRoot = path.resolve(import.meta.dirname, '../../../..') const errorOverlaySelector = 'rsbuild-error-overlay' @@ -14,7 +15,7 @@ const syntaxErrorRoutePatch = '\nexport const broken = ;\n' const devServerTimeout = 30_000 class DevServer { - url = '' + readonly url: string private stopPromise: Promise | null = null private startupError: Error | null = null private readonly startupErrorPromise: Promise @@ -23,16 +24,7 @@ class DevServer { readonly port: number, private readonly childProcess: ReturnType, ) { - let log = '' - const captureAddress = (data: Buffer) => { - log += data.toString() - const match = appServerReadyPattern.exec(stripVTControlCharacters(log)) - if (match?.groups?.E2E_APP_PORT) { - this.url = `http://localhost:${match.groups.E2E_APP_PORT}` - } - } - this.childProcess.stdout?.on('data', captureAddress) - this.childProcess.stderr?.on('data', captureAddress) + this.url = `http://localhost:${port}` this.startupErrorPromise = new Promise((_, reject) => { this.childProcess.once('error', (error) => { this.startupError = error @@ -53,7 +45,7 @@ class DevServer { VITE_SERVER_PORT: String(port), VITE_NODE_ENV: 'test', }, - stdio: ['ignore', 'pipe', 'pipe'], + stdio: 'ignore', }), ) @@ -359,7 +351,7 @@ test('shows a module syntax error through the error overlay', async ({ }) => { const homeRouteFile = path.resolve(fixtureRoot, 'src/routes/index.tsx') const originalSource = await fs.promises.readFile(homeRouteFile, 'utf-8') - const port = 0 + const port = await getTestServerPort(`${e2ePortKey}-syntax-error-overlay`) await using devServer = await DevServer.start(port) try { diff --git a/e2e/react-start/rsc-deferred-hydration/package.json b/e2e/react-start/rsc-deferred-hydration/package.json index 06317e59d0..434cabb24b 100644 --- a/e2e/react-start/rsc-deferred-hydration/package.json +++ b/e2e/react-start/rsc-deferred-hydration/package.json @@ -22,14 +22,6 @@ "shards": 1 } ] - }, - "targets": { - "test:e2e--vite-ssr": { - "outputs": [ - "...", - "{projectRoot}/dist-vite-ssr" - ] - } } }, "dependencies": { @@ -45,8 +37,8 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "@vitejs/plugin-rsc": "^0.5.39", - "srvx": "^1.0.0", + "@vitejs/plugin-rsc": "^0.5.30", + "srvx": "^0.11.9", "@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-deferred-hydration/playwright.config.ts b/e2e/react-start/rsc-deferred-hydration/playwright.config.ts index f3a22f1fff..10f41cd911 100644 --- a/e2e/react-start/rsc-deferred-hydration/playwright.config.ts +++ b/e2e/react-start/rsc-deferred-hydration/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` const mode = process.env.MODE ?? 'prod' const isDev = mode === 'dev' @@ -11,11 +12,12 @@ export default defineConfig({ workers: 1, reporter: [['line']], globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', use: { baseURL }, webServer: { - command: isDev ? 'pnpm dev:e2e --port 0' : 'pnpm build && pnpm start', - wait: appServerReady, - reuseExistingServer: false, + command: isDev ? 'pnpm dev:e2e' : 'pnpm build && pnpm start', + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', env: { VITE_NODE_ENV: 'test', diff --git a/e2e/react-start/rsc-deferred-hydration/tests/setup/global.setup.ts b/e2e/react-start/rsc-deferred-hydration/tests/setup/global.setup.ts index 40acaec113..3d1579ee87 100644 --- a/e2e/react-start/rsc-deferred-hydration/tests/setup/global.setup.ts +++ b/e2e/react-start/rsc-deferred-hydration/tests/setup/global.setup.ts @@ -1,9 +1,17 @@ -import { preOptimizeDevServer, waitForServer } from '@tanstack/router-e2e-utils' +import { + e2eStartDummyServer, + getTestServerPort, + preOptimizeDevServer, + waitForServer, +} from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } export default async function setup() { + await e2eStartDummyServer(packageJson.name) + if (process.env.MODE !== 'dev') return - const port = Number(process.env.E2E_APP_PORT ?? 0) + const port = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${port}` await waitForServer(baseURL) diff --git a/e2e/react-start/rsc-deferred-hydration/tests/setup/global.teardown.ts b/e2e/react-start/rsc-deferred-hydration/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/react-start/rsc-deferred-hydration/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/react-start/rsc-query/package.json b/e2e/react-start/rsc-query/package.json index 68a99cd432..24c7b488f6 100644 --- a/e2e/react-start/rsc-query/package.json +++ b/e2e/react-start/rsc-query/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/react-query": "^5.90.0", @@ -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.39", - "srvx": "^1.0.0", + "@vitejs/plugin-rsc": "^0.5.30", + "srvx": "^0.10.0", "typescript": "^5.7.2", "vite": "^8.0.14" } diff --git a/e2e/react-start/rsc-query/playwright.config.ts b/e2e/react-start/rsc-query/playwright.config.ts index 235a59f889..2cf7c1fe9b 100644 --- a/e2e/react-start/rsc-query/playwright.config.ts +++ b/e2e/react-start/rsc-query/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -9,15 +10,18 @@ export default defineConfig({ workers: 1, reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { baseURL, }, webServer: { // RSC production builds are not yet supported, use dev mode - command: `pnpm dev:e2e --port 0`, - wait: appServerReady, - reuseExistingServer: false, + command: `pnpm dev:e2e`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', env: { VITE_NODE_ENV: 'test', diff --git a/e2e/react-start/rsc-query/tests/setup/global.setup.ts b/e2e/react-start/rsc-query/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/react-start/rsc-query/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/react-start/rsc-query/tests/setup/global.teardown.ts b/e2e/react-start/rsc-query/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/react-start/rsc-query/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/react-start/rsc-rsbuild/package.json b/e2e/react-start/rsc-rsbuild/package.json index 067394fc08..e3800f291a 100644 --- a/e2e/react-start/rsc-rsbuild/package.json +++ b/e2e/react-start/rsc-rsbuild/package.json @@ -8,7 +8,7 @@ "dev:e2e": "rsbuild dev --port $PORT", "build": "rsbuild build && tsc --noEmit", "start": "node server.js", - "test:e2e-full": "pnpm build && playwright test --project=chromium" + "test:e2e-full": "pnpm build && sh -c 'rm -f \"port-${E2E_PORT_KEY:-$npm_package_name}.txt\" \"port-${E2E_PORT_KEY:-$npm_package_name}-external.txt\"' && playwright test --project=chromium" }, "nx": { "metadata": { @@ -28,13 +28,13 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.3.1", + "@rsbuild/core": "^2.1.0", "@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": "^1.0.0", + "srvx": "^0.10.0", "typescript": "^5.7.2" } } diff --git a/e2e/react-start/rsc-rsbuild/playwright.config.ts b/e2e/react-start/rsc-rsbuild/playwright.config.ts index dd356709b8..9bb7586df5 100644 --- a/e2e/react-start/rsc-rsbuild/playwright.config.ts +++ b/e2e/react-start/rsc-rsbuild/playwright.config.ts @@ -1,9 +1,25 @@ +import fs from 'node:fs' import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } +const e2ePortKey = process.env.E2E_PORT_KEY ?? packageJson.name const distDir = process.env.E2E_DIST_DIR ?? 'dist' -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +if (process.env.TEST_WORKER_INDEX === undefined) { + for (const portFile of [ + `port-${e2ePortKey}.txt`, + `port-${e2ePortKey}-external.txt`, + ]) { + fs.rmSync(portFile, { force: true }) + } +} + +const PORT = await getTestServerPort(e2ePortKey) +const EXTERNAL_PORT = await getDummyServerPort(e2ePortKey) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -11,18 +27,23 @@ export default defineConfig({ workers: 1, reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { baseURL, }, webServer: { command: 'pnpm start', - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', env: { PORT: String(PORT), E2E_DIST_DIR: distDir, + E2E_PORT_KEY: e2ePortKey, + EXTERNAL_SERVER_URL: `http://localhost:${EXTERNAL_PORT}`, }, }, diff --git a/e2e/react-start/rsc-rsbuild/tests/setup/global.setup.ts b/e2e/react-start/rsc-rsbuild/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3def5f6941 --- /dev/null +++ b/e2e/react-start/rsc-rsbuild/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(process.env.E2E_PORT_KEY ?? packageJson.name) +} diff --git a/e2e/react-start/rsc-rsbuild/tests/setup/global.teardown.ts b/e2e/react-start/rsc-rsbuild/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..a9ad1445f7 --- /dev/null +++ b/e2e/react-start/rsc-rsbuild/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(process.env.E2E_PORT_KEY ?? packageJson.name) +} diff --git a/e2e/react-start/rsc/package.json b/e2e/react-start/rsc/package.json index a30227d509..0e7414e2aa 100644 --- a/e2e/react-start/rsc/package.json +++ b/e2e/react-start/rsc/package.json @@ -13,8 +13,7 @@ "build:vite": "vite build && tsc --noEmit", "preview": "vite preview", "start": "node server.js", - "test:e2e-full": "pnpm build && playwright test --project=chromium", - "test:e2e:dev:rsbuild": "MODE=dev E2E_TOOLCHAIN=rsbuild playwright test --project=chromium" + "test:e2e-full": "pnpm build && sh -c 'rm -f \"port-${E2E_PORT_KEY:-$npm_package_name}.txt\" \"port-${E2E_PORT_KEY:-$npm_package_name}-external.txt\"' && playwright test --project=chromium" }, "nx": { "metadata": { @@ -41,7 +40,7 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.3.1", + "@rsbuild/core": "^2.1.0", "@rsbuild/plugin-react": "^2.0.0", "@tanstack/eslint-plugin-start": "workspace:^", "@tanstack/router-e2e-utils": "workspace:^", @@ -50,9 +49,9 @@ "@types/react-dom": "^19.0.3", "@typescript-eslint/parser": "^8.23.0", "@vitejs/plugin-react": "^6.0.1", - "@vitejs/plugin-rsc": "^0.5.39", + "@vitejs/plugin-rsc": "^0.5.30", "eslint": "^9.22.0", - "srvx": "^1.0.0", + "srvx": "^0.10.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 075efdc5b9..9bb7586df5 100644 --- a/e2e/react-start/rsc/playwright.config.ts +++ b/e2e/react-start/rsc/playwright.config.ts @@ -1,11 +1,25 @@ +import fs from 'node:fs' import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } +const e2ePortKey = process.env.E2E_PORT_KEY ?? packageJson.name 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) +if (process.env.TEST_WORKER_INDEX === undefined) { + for (const portFile of [ + `port-${e2ePortKey}.txt`, + `port-${e2ePortKey}-external.txt`, + ]) { + fs.rmSync(portFile, { force: true }) + } +} + +const PORT = await getTestServerPort(e2ePortKey) +const EXTERNAL_PORT = await getDummyServerPort(e2ePortKey) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -13,19 +27,23 @@ export default defineConfig({ workers: 1, reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { baseURL, }, webServer: { - command: isRsbuildDev ? 'pnpm dev:rsbuild --port 0' : 'pnpm start', - wait: appServerReady, - reuseExistingServer: false, + command: 'pnpm start', + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', env: { - NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, PORT: String(PORT), E2E_DIST_DIR: distDir, + E2E_PORT_KEY: e2ePortKey, + EXTERNAL_SERVER_URL: `http://localhost:${EXTERNAL_PORT}`, }, }, diff --git a/e2e/react-start/rsc/src/routes/rsc-external.tsx b/e2e/react-start/rsc/src/routes/rsc-external.tsx index 352f086b60..d6da119b26 100644 --- a/e2e/react-start/rsc/src/routes/rsc-external.tsx +++ b/e2e/react-start/rsc/src/routes/rsc-external.tsx @@ -109,7 +109,11 @@ const getExternalDataServerComponent = createServerFn({ method: 'GET' }) ) }) -const EXTERNAL_SERVER_URL = 'https://jsonplaceholder.typicode.com' +// The external server URL is provided by the e2e test setup +const EXTERNAL_SERVER_URL = + typeof process !== 'undefined' && process.env.EXTERNAL_SERVER_URL + ? process.env.EXTERNAL_SERVER_URL + : 'http://localhost:65003' export const Route = createFileRoute('/rsc-external')({ loader: async () => { 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 35db86eca9..f5d8e04928 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,16 +116,15 @@ 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`, Rspack - // `widget-xxx`, and Rsbuild dev `src-...-module__widget-xxx` scoped names) + // Widget A classes should be hashed (accept Vite `_widget_xxx` or Rspack `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-external.spec.ts b/e2e/react-start/rsc/tests/rsc-external.spec.ts index ae16ef7c43..7ce4bd3c18 100644 --- a/e2e/react-start/rsc/tests/rsc-external.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-external.spec.ts @@ -19,9 +19,13 @@ test.describe('RSC External API Tests - External data fetching', () => { await page.goto('/rsc-external') await page.waitForURL(/\/rsc-external/) - await expect(page.getByTestId('external-server-url')).toHaveText( - 'https://jsonplaceholder.typicode.com', - ) + // Verify the external server URL contains expected pattern + const serverUrl = await page + .getByTestId('external-server-url') + .textContent() + expect(serverUrl).toBeTruthy() + // Should be localhost with a port + expect(serverUrl).toMatch(/localhost:\d+/) }) test('Loader timestamp is present', async ({ page }) => { 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 842c9358c0..5faa6b1508 100644 --- a/e2e/react-start/rsc/tests/rsc-stream-generator.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-stream-generator.spec.ts @@ -67,22 +67,29 @@ test.describe('RSC Stream Generator Tests - Streaming RSCs via async generator', // Start streaming await page.getByTestId('start-stream-btn').click() - const notifications = page + // 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 .getByTestId('notification-list') .locator('[data-testid^="notification-notif_"]') + .count() + expect(initialCount).toBeGreaterThanOrEqual(3) - // 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 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 remaining notifications stream in afterwards - await expect(notifications.nth(initialCount)).toBeVisible() + // Wait for completion 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 dc21f8d9c5..356907e311 100644 --- a/e2e/react-start/rsc/tests/rsc-stream-readable.spec.ts +++ b/e2e/react-start/rsc/tests/rsc-stream-readable.spec.ts @@ -67,22 +67,29 @@ test.describe('RSC Stream Readable Tests - Streaming RSCs via ReadableStream', ( // Start streaming await page.getByTestId('start-stream-btn').click() - const notifications = page + // 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 .getByTestId('notification-list') .locator('[data-testid^="notification-notif_"]') + .count() + expect(initialCount).toBeGreaterThanOrEqual(3) - // 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 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 remaining notifications stream in afterwards - await expect(notifications.nth(initialCount)).toBeVisible() + // Wait for completion 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/setup/global.setup.ts b/e2e/react-start/rsc/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3def5f6941 --- /dev/null +++ b/e2e/react-start/rsc/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(process.env.E2E_PORT_KEY ?? packageJson.name) +} diff --git a/e2e/react-start/rsc/tests/setup/global.teardown.ts b/e2e/react-start/rsc/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..a9ad1445f7 --- /dev/null +++ b/e2e/react-start/rsc/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(process.env.E2E_PORT_KEY ?? packageJson.name) +} diff --git a/e2e/react-start/scroll-restoration/package.json b/e2e/react-start/scroll-restoration/package.json index 9e90871158..17bf2b2449 100644 --- a/e2e/react-start/scroll-restoration/package.json +++ b/e2e/react-start/scroll-restoration/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", @@ -30,7 +30,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", "combinate": "^1.1.11", - "srvx": "^1.0.0", + "srvx": "^0.11.9", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/react-start/scroll-restoration/playwright.config.ts b/e2e/react-start/scroll-restoration/playwright.config.ts index 1862174905..1e33c9ae5e 100644 --- a/e2e/react-start/scroll-restoration/playwright.config.ts +++ b/e2e/react-start/scroll-restoration/playwright.config.ts @@ -1,7 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -13,19 +18,19 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `pnpm build && PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', - env: { - NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, - }, }, projects: [ diff --git a/e2e/react-start/scroll-restoration/src/client.tsx b/e2e/react-start/scroll-restoration/src/client.tsx deleted file mode 100644 index 25a0ebf7e7..0000000000 --- a/e2e/react-start/scroll-restoration/src/client.tsx +++ /dev/null @@ -1,23 +0,0 @@ -import { StrictMode, startTransition } from 'react' -import { hydrateRoot } from 'react-dom/client' -import { StartClient } from '@tanstack/react-start/client' - -async function bootstrap() { - // Fixture-only gate: leave SSR markup, CSS and inline restoration intact. - // Waiting here allows load to finish before StartClient constructs the router. - if ((window as any).__holdScrollBootstrap) { - await new Promise((resolve) => { - ;(window as any).__releaseScrollBootstrap = resolve - }) - } - startTransition(() => { - hydrateRoot( - document, - - - , - ) - }) -} - -void bootstrap() diff --git a/e2e/react-start/scroll-restoration/src/routes/__root.tsx b/e2e/react-start/scroll-restoration/src/routes/__root.tsx index 875bff34e0..563d9208ec 100644 --- a/e2e/react-start/scroll-restoration/src/routes/__root.tsx +++ b/e2e/react-start/scroll-restoration/src/routes/__root.tsx @@ -65,10 +65,6 @@ export const Route = createRootRoute({ }) function RootComponent() { - React.useEffect(() => { - dispatchEvent(new Event('test-scroll-hydrated')) - }, []) - return ( diff --git a/e2e/react-start/scroll-restoration/src/utils/posts.tsx b/e2e/react-start/scroll-restoration/src/utils/posts.tsx index bc56dff904..c6cba486ab 100644 --- a/e2e/react-start/scroll-restoration/src/utils/posts.tsx +++ b/e2e/react-start/scroll-restoration/src/utils/posts.tsx @@ -12,7 +12,11 @@ export type PostType = { export class PostNotFoundError extends Error {} -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/react-start/scroll-restoration/src/utils/users.tsx b/e2e/react-start/scroll-restoration/src/utils/users.tsx index 7ba645b383..79b45867d5 100644 --- a/e2e/react-start/scroll-restoration/src/utils/users.tsx +++ b/e2e/react-start/scroll-restoration/src/utils/users.tsx @@ -3,3 +3,8 @@ export type User = { name: string email: string } + +const PORT = + import.meta.env.VITE_SERVER_PORT || process.env.VITE_SERVER_PORT || 3000 + +export const DEPLOY_URL = `http://localhost:${PORT}` diff --git a/e2e/react-start/scroll-restoration/tests/scroll-restoration-lifecycle.spec.ts b/e2e/react-start/scroll-restoration/tests/scroll-restoration-lifecycle.spec.ts deleted file mode 100644 index 6c1e1693b6..0000000000 --- a/e2e/react-start/scroll-restoration/tests/scroll-restoration-lifecycle.spec.ts +++ /dev/null @@ -1,85 +0,0 @@ -import { writeFile } from 'node:fs/promises' -import { expect } from '@playwright/test' -import { test } from '@tanstack/router-e2e-utils' -import { scrollRestorationLifecycleTests } from '../../../scroll-restoration-lifecycle' - -scrollRestorationLifecycleTests(test) - -test('hands native scroll restoration back to the browser on reload', async ({ - page, -}, testInfo) => { - const errors: Array = [] - page.on('pageerror', (error) => errors.push(error.message)) - const key = 'test-scroll-pagehide' - const token = testInfo.testId - await page.addInitScript(() => { - ;(window as any).__initialScrollRestoration = history.scrollRestoration - }) - await page.goto('/') - await page.getByRole('link', { name: '/reset-scroll-false-a' }).click() - await page.waitForLoadState('networkidle') - expect(await page.evaluate(() => history.scrollRestoration)).toBe('manual') - - const position = await page.evaluate( - async ({ key, token }) => { - sessionStorage.removeItem(key) - const scrolled = new Promise((resolve) => { - addEventListener('scroll', () => resolve(), { once: true }) - }) - scrollTo(0, 500) - await scrolled - // Registered after router setup, so this observes the router's handoff. - window.addEventListener( - 'pagehide', - (event) => { - sessionStorage.setItem( - key, - JSON.stringify({ - token, - mode: history.scrollRestoration, - persisted: (event as PageTransitionEvent).persisted, - trusted: event.isTrusted, - x: scrollX, - y: scrollY, - }), - ) - }, - { once: true }, - ) - return { x: scrollX, y: scrollY } - }, - { key, token }, - ) - expect(position.y).toBeGreaterThan(0) - - await page.reload() - const observation = await page.evaluate( - (key) => ({ - outgoing: JSON.parse(sessionStorage.getItem(key)!), - initialMode: (window as any).__initialScrollRestoration, - }), - key, - ) - const snapshotPath = testInfo.outputPath('reload-handoff.json') - await writeFile( - snapshotPath, - JSON.stringify({ ...observation, errors }, null, 2), - ) - await testInfo.attach('reload-handoff', { - path: snapshotPath, - contentType: 'application/json', - }) - expect(observation.outgoing).toMatchObject({ - token, - trusted: true, - mode: 'auto', - }) - expect(observation.initialMode).toBe('auto') - expect(Math.abs(observation.outgoing.x - position.x)).toBeLessThanOrEqual(1) - expect(Math.abs(observation.outgoing.y - position.y)).toBeLessThanOrEqual(1) - await expect - .poll(() => page.evaluate(() => history.scrollRestoration)) - .toBe('manual') - await expect.poll(() => page.evaluate(() => scrollY)).toBe(position.y) - expect(errors).toEqual([]) -}) diff --git a/e2e/react-start/scroll-restoration/tests/scroll-restoration-reload.spec.ts b/e2e/react-start/scroll-restoration/tests/scroll-restoration-reload.spec.ts deleted file mode 100644 index 767f02a39c..0000000000 --- a/e2e/react-start/scroll-restoration/tests/scroll-restoration-reload.spec.ts +++ /dev/null @@ -1,191 +0,0 @@ -import { writeFile } from 'node:fs/promises' -import { expect } from '@playwright/test' -import { test } from '@tanstack/router-e2e-utils' - -// A frame recorder is diagnostic evidence, not proof of compositor-frame pixels. -for (const holdBootstrap of [false, true]) { - test(`reload keeps rendered SSR scroll stable (bootstrap held=${holdBootstrap})`, async ({ - page, - }, testInfo) => { - const errors: Array = [] - page.on('pageerror', (error) => errors.push(error.message)) - await page.addInitScript(() => { - const holdKey = 'test-hold-scroll-bootstrap' - ;(window as any).__holdScrollBootstrap = - sessionStorage.getItem(holdKey) === 'true' - sessionStorage.removeItem(holdKey) - const samples: Array<{ - time: number - phase: string - x: number - y: number - mode: ScrollRestoration - scrollHeight: number - viewportHeight: number - anchorTop: number | null - visibility: DocumentVisibilityState - }> = [] - let phase = 'initial' - let frame = 0 - const sample = () => { - samples.push({ - time: performance.now(), - phase, - x: scrollX, - y: scrollY, - mode: history.scrollRestoration, - scrollHeight: document.documentElement?.scrollHeight ?? 0, - viewportHeight: innerHeight, - anchorTop: - document - .querySelector('[data-testid="reset-scroll-false-link-6"]') - ?.getBoundingClientRect().top ?? null, - visibility: document.visibilityState, - }) - } - const mark = (next: string) => { - phase = next - sample() - } - const tick = () => { - sample() - if (samples.length < 600) { - frame = requestAnimationFrame(tick) - } - } - sample() - frame = requestAnimationFrame(tick) - for (const event of [ - 'DOMContentLoaded', - 'load', - 'pageshow', - 'test-scroll-hydrated', - 'test-scroll-bootstrap-release', - ]) { - addEventListener(event, () => mark(event)) - } - ;(window as any).__scrollProbe = { - samples, - stop: () => { - cancelAnimationFrame(frame) - return { - samples, - paints: performance - .getEntriesByType('paint') - .map(({ name, startTime }) => ({ name, startTime })), - } - }, - } - }) - await page.goto('/') - await page.getByRole('link', { name: '/reset-scroll-false-a' }).click() - await page.waitForLoadState('networkidle') - const before = await page.evaluate(async (holdBootstrap) => { - scrollTo(0, 500) - await new Promise((resolve) => - requestAnimationFrame(() => requestAnimationFrame(() => resolve())), - ) - sessionStorage.setItem( - 'test-hold-scroll-bootstrap', - String(holdBootstrap), - ) - return { - y: scrollY, - anchorTop: document - .querySelector('[data-testid="reset-scroll-false-link-6"]')! - .getBoundingClientRect().top, - } - }, holdBootstrap) - expect(before.y).toBeGreaterThan(0) - await page.reload() - // This window starts at document readiness, independently of scroll correctness. - await page.evaluate(async () => { - await Promise.all( - Array.from( - document.querySelectorAll('link[rel="stylesheet"]'), - (link) => { - if (link.sheet) { - return - } - return new Promise((resolve) => - link.addEventListener('load', () => resolve(), { once: true }), - ) - }, - ), - ) - for (let i = 0; i < 4; i++) { - await new Promise((resolve) => - requestAnimationFrame(() => resolve()), - ) - } - }) - if (holdBootstrap) { - expect( - await page.evaluate( - () => typeof (window as any).__releaseScrollBootstrap, - ), - ).toBe('function') - expect( - await page.evaluate(() => - (window as any).__scrollProbe.samples.some( - (sample: any) => sample.phase === 'test-scroll-hydrated', - ), - ), - ).toBe(false) - } - const screenshotPath = testInfo.outputPath('SSR-viewport.png') - await page.screenshot({ path: screenshotPath }) - await testInfo.attach('SSR-viewport', { - path: screenshotPath, - contentType: 'image/png', - }) - const held = await page.evaluate(() => ({ - y: scrollY, - anchorTop: document - .querySelector('[data-testid="reset-scroll-false-link-6"]')! - .getBoundingClientRect().top, - })) - if (holdBootstrap) { - await page.evaluate(() => { - dispatchEvent(new Event('test-scroll-bootstrap-release')) - ;(window as any).__releaseScrollBootstrap() - }) - } - await expect - .poll(() => page.evaluate(() => history.scrollRestoration)) - .toBe('manual') - await page.waitForLoadState('networkidle') - await page.evaluate(async () => { - for (let i = 0; i < 8; i++) { - await new Promise((resolve) => - requestAnimationFrame(() => resolve()), - ) - } - }) - const timeline = await page.evaluate(() => - (window as any).__scrollProbe.stop(), - ) - const timelinePath = testInfo.outputPath('scroll-timeline.json') - await writeFile( - timelinePath, - JSON.stringify({ before, held, ...timeline, errors }, null, 2), - ) - await testInfo.attach('scroll-timeline', { - path: timelinePath, - contentType: 'application/json', - }) - expect(held.y).toBe(before.y) - expect(held.anchorTop).toBeCloseTo(before.anchorTop, 0) - const renderedSamples = timeline.samples.filter( - (sample: any) => sample.phase !== 'initial' && sample.anchorTop !== null, - ) - expect(renderedSamples.length).toBeGreaterThan(0) - for (const sample of renderedSamples) { - expect(Math.abs(sample.y - before.y)).toBeLessThanOrEqual(1) - expect(Math.abs(sample.anchorTop - before.anchorTop)).toBeLessThanOrEqual( - 1, - ) - } - expect(errors).toEqual([]) - }) -} diff --git a/e2e/react-start/scroll-restoration/tests/setup/global.setup.ts b/e2e/react-start/scroll-restoration/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/react-start/scroll-restoration/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/react-start/scroll-restoration/tests/setup/global.teardown.ts b/e2e/react-start/scroll-restoration/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/react-start/scroll-restoration/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/react-start/selective-ssr/package.json b/e2e/react-start/selective-ssr/package.json index 87e8e3cf42..1eb903c183 100644 --- a/e2e/react-start/selective-ssr/package.json +++ b/e2e/react-start/selective-ssr/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", @@ -26,7 +26,7 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "srvx": "^1.0.0", + "srvx": "^0.11.9", "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/playwright.config.ts b/e2e/react-start/selective-ssr/playwright.config.ts index 630989e41f..badd6db0eb 100644 --- a/e2e/react-start/selective-ssr/playwright.config.ts +++ b/e2e/react-start/selective-ssr/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,8 +20,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && NODE_ENV=production PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/react-start/serialization-adapters/package.json b/e2e/react-start/serialization-adapters/package.json index 5bf4b29a80..0e0d157733 100644 --- a/e2e/react-start/serialization-adapters/package.json +++ b/e2e/react-start/serialization-adapters/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", @@ -26,7 +26,7 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "srvx": "^1.0.0", + "srvx": "^0.11.9", "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/playwright.config.ts b/e2e/react-start/serialization-adapters/playwright.config.ts index 630989e41f..badd6db0eb 100644 --- a/e2e/react-start/serialization-adapters/playwright.config.ts +++ b/e2e/react-start/serialization-adapters/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,8 +20,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && NODE_ENV=production PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/react-start/server-functions-global-middleware/package.json b/e2e/react-start/server-functions-global-middleware/package.json index 4aab99e22c..5898097c81 100644 --- a/e2e/react-start/server-functions-global-middleware/package.json +++ b/e2e/react-start/server-functions-global-middleware/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", @@ -25,7 +25,7 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "srvx": "^1.0.0", + "srvx": "^0.11.9", "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/playwright.config.ts b/e2e/react-start/server-functions-global-middleware/playwright.config.ts index 7b9ac2ceb5..8330e023ee 100644 --- a/e2e/react-start/server-functions-global-middleware/playwright.config.ts +++ b/e2e/react-start/server-functions-global-middleware/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -export const PORT = Number(process.env.E2E_APP_PORT ?? 0) +export const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -20,8 +21,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, 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 e909a808f2..739df05d7a 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,7 +13,6 @@ 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({ @@ -36,11 +35,6 @@ 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', @@ -52,7 +46,6 @@ 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 { @@ -60,7 +53,6 @@ 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 { @@ -69,7 +61,6 @@ 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 { @@ -79,7 +70,6 @@ export interface FileRouteTypes { | '/context-collision' | '/multiple-server-functions' | '/pathname-middleware' - | '/send-context-contract' | '/simple' fileRoutesByTo: FileRoutesByTo to: @@ -87,7 +77,6 @@ export interface FileRouteTypes { | '/context-collision' | '/multiple-server-functions' | '/pathname-middleware' - | '/send-context-contract' | '/simple' id: | '__root__' @@ -95,7 +84,6 @@ export interface FileRouteTypes { | '/context-collision' | '/multiple-server-functions' | '/pathname-middleware' - | '/send-context-contract' | '/simple' fileRoutesById: FileRoutesById } @@ -104,7 +92,6 @@ export interface RootRouteChildren { ContextCollisionRoute: typeof ContextCollisionRoute MultipleServerFunctionsRoute: typeof MultipleServerFunctionsRoute PathnameMiddlewareRoute: typeof PathnameMiddlewareRoute - SendContextContractRoute: typeof SendContextContractRoute SimpleRoute: typeof SimpleRoute } @@ -138,13 +125,6 @@ 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' @@ -160,7 +140,6 @@ 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 deleted file mode 100644 index af4a22b6fd..0000000000 --- a/e2e/react-start/server-functions-global-middleware/src/routes/send-context-contract.tsx +++ /dev/null @@ -1,181 +0,0 @@ -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 deleted file mode 100644 index e39927ebab..0000000000 --- a/e2e/react-start/server-functions-global-middleware/tests/send-context-contract.spec.ts +++ /dev/null @@ -1,15 +0,0 @@ -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 63d8661717..390d417423 100644 --- a/e2e/react-start/server-functions/package.json +++ b/e2e/react-start/server-functions/package.json @@ -13,7 +13,7 @@ "build:rsbuild": "rsbuild build && tsc --noEmit", "preview": "vite preview", "start": "node server.js", - "test:e2e": "pnpm build && playwright test --project=chromium && pnpm run test:e2e:rsbuild-cache", + "test:e2e": "rm -rf port*.txt && pnpm build && playwright test --project=chromium && pnpm run test:e2e:rsbuild-cache", "test:e2e:rsbuild-cache": "playwright test -c playwright.rsbuild-cache.config.ts --project=chromium" }, "dependencies": { @@ -31,7 +31,7 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.3.1", + "@rsbuild/core": "^2.1.0", "@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": "^1.0.0", + "srvx": "^0.11.9", "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/playwright.config.ts b/e2e/react-start/server-functions/playwright.config.ts index 33fe8c0572..d88e582e2f 100644 --- a/e2e/react-start/server-functions/playwright.config.ts +++ b/e2e/react-start/server-functions/playwright.config.ts @@ -1,9 +1,11 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } +const e2ePortKey = process.env.E2E_PORT_KEY ?? packageJson.name const distDir = process.env.E2E_DIST_DIR ?? 'dist' -export const PORT = Number(process.env.E2E_APP_PORT ?? 0) +export const PORT = await getTestServerPort(e2ePortKey) const baseURL = `http://localhost:${PORT}` /** @@ -23,13 +25,14 @@ export default defineConfig({ webServer: { command: `PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', env: { PORT: String(PORT), VITE_SERVER_PORT: String(PORT), E2E_DIST_DIR: distDir, + E2E_PORT_KEY: e2ePortKey, }, }, diff --git a/e2e/react-start/server-functions/tests/server-functions.spec.ts b/e2e/react-start/server-functions/tests/server-functions.spec.ts index f87e699330..5bb458d61c 100644 --- a/e2e/react-start/server-functions/tests/server-functions.spec.ts +++ b/e2e/react-start/server-functions/tests/server-functions.spec.ts @@ -1,9 +1,11 @@ import * as fs from 'node:fs' import { expect } from '@playwright/test' -import { test } from '@tanstack/router-e2e-utils' +import { getTestServerPort, test } from '@tanstack/router-e2e-utils' +import packageJson from '../package.json' with { type: 'json' } import type { Page } from '@playwright/test' -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const e2ePortKey = process.env.E2E_PORT_KEY ?? packageJson.name +const PORT = await getTestServerPort(e2ePortKey) test('Server function URLs correctly include explicit ids', async ({ page, diff --git a/e2e/react-start/server-routes-global-middleware/package.json b/e2e/react-start/server-routes-global-middleware/package.json index ea6ddfb793..6887b19b5f 100644 --- a/e2e/react-start/server-routes-global-middleware/package.json +++ b/e2e/react-start/server-routes-global-middleware/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", @@ -25,7 +25,7 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "srvx": "^1.0.0", + "srvx": "^0.11.9", "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/playwright.config.ts b/e2e/react-start/server-routes-global-middleware/playwright.config.ts index 7b9ac2ceb5..8330e023ee 100644 --- a/e2e/react-start/server-routes-global-middleware/playwright.config.ts +++ b/e2e/react-start/server-routes-global-middleware/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -export const PORT = Number(process.env.E2E_APP_PORT ?? 0) +export const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -20,8 +21,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/react-start/server-routes/package.json b/e2e/react-start/server-routes/package.json index 99e9090a16..0e09246ad8 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": "^1.0.0", + "srvx": "^0.11.9", "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/playwright.config.ts b/e2e/react-start/server-routes/playwright.config.ts index 7b9ac2ceb5..8330e023ee 100644 --- a/e2e/react-start/server-routes/playwright.config.ts +++ b/e2e/react-start/server-routes/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -export const PORT = Number(process.env.E2E_APP_PORT ?? 0) +export const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -20,8 +21,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/react-start/server-routes/src/routeTree.gen.ts b/e2e/react-start/server-routes/src/routeTree.gen.ts index 7ae1e4f551..2454c3bb32 100644 --- a/e2e/react-start/server-routes/src/routeTree.gen.ts +++ b/e2e/react-start/server-routes/src/routeTree.gen.ts @@ -20,9 +20,7 @@ import { Route as ApiOnlyAnyRouteImport } from './routes/api/only-any' import { Route as MethodsIndexRouteImport } from './routes/methods/index' import { Route as MethodsOnlyAnyRouteImport } from './routes/methods/only-any' import { Route as ApiParamsFooRouteRouteImport } from './routes/api/params/$foo/route' -import { Route as ApiParsedParamsIdRouteImport } from './routes/api/parsed-params.$id' import { Route as ApiParamsFooBarRouteImport } from './routes/api/params/$foo/$bar' -import { Route as ApiParsedParamsIdChildIdRouteImport } from './routes/api/parsed-params.$id.$childId' const IndexRoute = IndexRouteImport.update({ id: '/', @@ -79,22 +77,11 @@ const ApiParamsFooRouteRoute = ApiParamsFooRouteRouteImport.update({ path: '/api/params/$foo', getParentRoute: () => rootRouteImport, } as any) -const ApiParsedParamsIdRoute = ApiParsedParamsIdRouteImport.update({ - id: '/api/parsed-params/$id', - path: '/api/parsed-params/$id', - getParentRoute: () => rootRouteImport, -} as any) const ApiParamsFooBarRoute = ApiParamsFooBarRouteImport.update({ id: '/$bar', path: '/$bar', getParentRoute: () => ApiParamsFooRouteRoute, } as any) -const ApiParsedParamsIdChildIdRoute = - ApiParsedParamsIdChildIdRouteImport.update({ - id: '/$childId', - path: '/$childId', - getParentRoute: () => ApiParsedParamsIdRoute, - } as any) export interface FileRoutesByFullPath { '/': typeof IndexRoute @@ -108,9 +95,7 @@ export interface FileRoutesByFullPath { '/methods/only-any': typeof MethodsOnlyAnyRoute '/methods/': typeof MethodsIndexRoute '/api/params/$foo': typeof ApiParamsFooRouteRouteWithChildren - '/api/parsed-params/$id': typeof ApiParsedParamsIdRouteWithChildren '/api/params/$foo/$bar': typeof ApiParamsFooBarRoute - '/api/parsed-params/$id/$childId': typeof ApiParsedParamsIdChildIdRoute } export interface FileRoutesByTo { '/': typeof IndexRoute @@ -123,9 +108,7 @@ export interface FileRoutesByTo { '/methods/only-any': typeof MethodsOnlyAnyRoute '/methods': typeof MethodsIndexRoute '/api/params/$foo': typeof ApiParamsFooRouteRouteWithChildren - '/api/parsed-params/$id': typeof ApiParsedParamsIdRouteWithChildren '/api/params/$foo/$bar': typeof ApiParamsFooBarRoute - '/api/parsed-params/$id/$childId': typeof ApiParsedParamsIdChildIdRoute } export interface FileRoutesById { __root__: typeof rootRouteImport @@ -140,9 +123,7 @@ export interface FileRoutesById { '/methods/only-any': typeof MethodsOnlyAnyRoute '/methods/': typeof MethodsIndexRoute '/api/params/$foo': typeof ApiParamsFooRouteRouteWithChildren - '/api/parsed-params/$id': typeof ApiParsedParamsIdRouteWithChildren '/api/params/$foo/$bar': typeof ApiParamsFooBarRoute - '/api/parsed-params/$id/$childId': typeof ApiParsedParamsIdChildIdRoute } export interface FileRouteTypes { fileRoutesByFullPath: FileRoutesByFullPath @@ -158,9 +139,7 @@ export interface FileRouteTypes { | '/methods/only-any' | '/methods/' | '/api/params/$foo' - | '/api/parsed-params/$id' | '/api/params/$foo/$bar' - | '/api/parsed-params/$id/$childId' fileRoutesByTo: FileRoutesByTo to: | '/' @@ -173,9 +152,7 @@ export interface FileRouteTypes { | '/methods/only-any' | '/methods' | '/api/params/$foo' - | '/api/parsed-params/$id' | '/api/params/$foo/$bar' - | '/api/parsed-params/$id/$childId' id: | '__root__' | '/' @@ -189,9 +166,7 @@ export interface FileRouteTypes { | '/methods/only-any' | '/methods/' | '/api/params/$foo' - | '/api/parsed-params/$id' | '/api/params/$foo/$bar' - | '/api/parsed-params/$id/$childId' fileRoutesById: FileRoutesById } export interface RootRouteChildren { @@ -204,7 +179,6 @@ export interface RootRouteChildren { ApiMiddlewareContextRoute: typeof ApiMiddlewareContextRoute ApiOnlyAnyRoute: typeof ApiOnlyAnyRoute ApiParamsFooRouteRoute: typeof ApiParamsFooRouteRouteWithChildren - ApiParsedParamsIdRoute: typeof ApiParsedParamsIdRouteWithChildren } declare module '@tanstack/react-router' { @@ -286,13 +260,6 @@ declare module '@tanstack/react-router' { preLoaderRoute: typeof ApiParamsFooRouteRouteImport parentRoute: typeof rootRouteImport } - '/api/parsed-params/$id': { - id: '/api/parsed-params/$id' - path: '/api/parsed-params/$id' - fullPath: '/api/parsed-params/$id' - preLoaderRoute: typeof ApiParsedParamsIdRouteImport - parentRoute: typeof rootRouteImport - } '/api/params/$foo/$bar': { id: '/api/params/$foo/$bar' path: '/$bar' @@ -300,13 +267,6 @@ declare module '@tanstack/react-router' { preLoaderRoute: typeof ApiParamsFooBarRouteImport parentRoute: typeof ApiParamsFooRouteRoute } - '/api/parsed-params/$id/$childId': { - id: '/api/parsed-params/$id/$childId' - path: '/$childId' - fullPath: '/api/parsed-params/$id/$childId' - preLoaderRoute: typeof ApiParsedParamsIdChildIdRouteImport - parentRoute: typeof ApiParsedParamsIdRoute - } } } @@ -335,17 +295,6 @@ const ApiParamsFooRouteRouteChildren: ApiParamsFooRouteRouteChildren = { const ApiParamsFooRouteRouteWithChildren = ApiParamsFooRouteRoute._addFileChildren(ApiParamsFooRouteRouteChildren) -interface ApiParsedParamsIdRouteChildren { - ApiParsedParamsIdChildIdRoute: typeof ApiParsedParamsIdChildIdRoute -} - -const ApiParsedParamsIdRouteChildren: ApiParsedParamsIdRouteChildren = { - ApiParsedParamsIdChildIdRoute: ApiParsedParamsIdChildIdRoute, -} - -const ApiParsedParamsIdRouteWithChildren = - ApiParsedParamsIdRoute._addFileChildren(ApiParsedParamsIdRouteChildren) - const rootRouteChildren: RootRouteChildren = { IndexRoute: IndexRoute, MethodsRouteRoute: MethodsRouteRouteWithChildren, @@ -356,7 +305,6 @@ const rootRouteChildren: RootRouteChildren = { ApiMiddlewareContextRoute: ApiMiddlewareContextRoute, ApiOnlyAnyRoute: ApiOnlyAnyRoute, ApiParamsFooRouteRoute: ApiParamsFooRouteRouteWithChildren, - ApiParsedParamsIdRoute: ApiParsedParamsIdRouteWithChildren, } export const routeTree = rootRouteImport ._addFileChildren(rootRouteChildren) diff --git a/e2e/react-start/server-routes/src/routes/api/parsed-params.$id.$childId.tsx b/e2e/react-start/server-routes/src/routes/api/parsed-params.$id.$childId.tsx deleted file mode 100644 index 06697a22cc..0000000000 --- a/e2e/react-start/server-routes/src/routes/api/parsed-params.$id.$childId.tsx +++ /dev/null @@ -1,51 +0,0 @@ -import { createFileRoute } from '@tanstack/react-router' -import { createMiddleware } from '@tanstack/react-start' - -const handleInvalidParams = createMiddleware().server(async ({ next }) => { - try { - return await next() - } catch (error) { - if (error instanceof Error && error.message === 'Invalid child id') { - return new Response(error.message, { status: 400 }) - } - throw error - } -}) - -export const Route = createFileRoute('/api/parsed-params/$id/$childId')({ - params: { - parse: (params) => { - const childId = Number(params.childId) - if (!Number.isFinite(childId)) { - throw new Error('Invalid child id') - } - return { childId } - }, - stringify: (params) => ({ childId: String(params.childId) }), - }, - server: { - handlers: ({ createHandlers }) => - createHandlers({ - GET: { - middleware: [handleInvalidParams], - handler: ({ params, request, next }) => { - if (new URL(request.url).searchParams.has('render')) { - return next({ context: { handlerParams: params } }) - } - const id: number = params.id - const childId: number = params.childId - return Response.json({ id, childId }) - }, - }, - }), - }, - loader: ({ params, serverContext }) => ({ - loaderParams: params, - handlerParams: serverContext?.handlerParams, - }), - component: () => ( -
-      {JSON.stringify(Route.useLoaderData())}
-    
- ), -}) diff --git a/e2e/react-start/server-routes/src/routes/api/parsed-params.$id.ts b/e2e/react-start/server-routes/src/routes/api/parsed-params.$id.ts deleted file mode 100644 index 0e5f0ab8a9..0000000000 --- a/e2e/react-start/server-routes/src/routes/api/parsed-params.$id.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/api/parsed-params/$id')({ - params: { - parse: (params) => ({ id: Number(params.id) }), - stringify: (params) => ({ id: String(params.id) }), - }, - server: { - handlers: { - GET: ({ params }) => { - const id: number = params.id - return Response.json({ id }) - }, - }, - }, -}) diff --git a/e2e/react-start/server-routes/tests/server-routes.spec.ts b/e2e/react-start/server-routes/tests/server-routes.spec.ts index 0ede9eaac8..97249fd733 100644 --- a/e2e/react-start/server-routes/tests/server-routes.spec.ts +++ b/e2e/react-start/server-routes/tests/server-routes.spec.ts @@ -1,46 +1,6 @@ import { expect } from '@playwright/test' import { test } from '@tanstack/router-e2e-utils' -test('server handlers receive parsed path params (issue #8431)', async ({ - request, -}) => { - const response = await request.get('/api/parsed-params/44') - - expect(response.status()).toBe(200) - expect(await response.json()).toEqual({ id: 44 }) -}) - -test('createHandlers receives parsed parent and child path params', async ({ - request, -}) => { - const response = await request.get('/api/parsed-params/44/2') - - expect(response.status()).toBe(200) - expect(await response.json()).toEqual({ id: 44, childId: 2 }) -}) - -test('handler middleware can catch path parameter parsing errors', async ({ - request, -}) => { - const response = await request.get('/api/parsed-params/44/invalid') - - expect(response.status()).toBe(400) - expect(await response.text()).toBe('Invalid child id') -}) - -test('parsed path params agree when a server handler defers to rendering', async ({ - page, -}) => { - await page.goto('/api/parsed-params/44/2?render') - - const result = page.getByTestId('parsed-params') - await expect(result).toBeVisible() - expect(JSON.parse((await result.textContent())!)).toEqual({ - loaderParams: { id: 44, childId: 2 }, - handlerParams: { id: 44, childId: 2 }, - }) -}) - test('merge-middleware-context', async ({ page }) => { await page.goto('/merge-middleware-context') diff --git a/e2e/react-start/session-handling/.gitignore b/e2e/react-start/session-handling/.gitignore deleted file mode 100644 index 16187ac1de..0000000000 --- a/e2e/react-start/session-handling/.gitignore +++ /dev/null @@ -1,24 +0,0 @@ -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 deleted file mode 100644 index 40a96e8819..0000000000 --- a/e2e/react-start/session-handling/.prettierignore +++ /dev/null @@ -1,4 +0,0 @@ -**/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 deleted file mode 100644 index 9dda8b2843..0000000000 --- a/e2e/react-start/session-handling/package.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "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 deleted file mode 100644 index 707af45de6..0000000000 --- a/e2e/react-start/session-handling/playwright.config.ts +++ /dev/null @@ -1,35 +0,0 @@ -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 deleted file mode 100644 index af8c3df7d2..0000000000 --- a/e2e/react-start/session-handling/rsbuild.config.ts +++ /dev/null @@ -1,14 +0,0 @@ -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 deleted file mode 100644 index da874e85c7..0000000000 --- a/e2e/react-start/session-handling/server.js +++ /dev/null @@ -1,51 +0,0 @@ -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 deleted file mode 100644 index f3d691814f..0000000000 --- a/e2e/react-start/session-handling/src/components/DefaultCatchBoundary.tsx +++ /dev/null @@ -1,20 +0,0 @@ -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 deleted file mode 100644 index 0b720f0e37..0000000000 --- a/e2e/react-start/session-handling/src/components/NotFound.tsx +++ /dev/null @@ -1,10 +0,0 @@ -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 deleted file mode 100644 index 63703a487b..0000000000 --- a/e2e/react-start/session-handling/src/hono-sessions.ts +++ /dev/null @@ -1,68 +0,0 @@ -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 deleted file mode 100644 index 5ecad97ab4..0000000000 --- a/e2e/react-start/session-handling/src/routeTree.gen.ts +++ /dev/null @@ -1,346 +0,0 @@ -/* 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 deleted file mode 100644 index c5c2209e5a..0000000000 --- a/e2e/react-start/session-handling/src/router.tsx +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index e5e5f4cd24..0000000000 --- a/e2e/react-start/session-handling/src/routes/__root.tsx +++ /dev/null @@ -1,59 +0,0 @@ -/// -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 deleted file mode 100644 index 44b83e58ac..0000000000 --- a/e2e/react-start/session-handling/src/routes/api/session-clear.ts +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 7b494d5050..0000000000 --- a/e2e/react-start/session-handling/src/routes/api/session-flash.ts +++ /dev/null @@ -1,22 +0,0 @@ -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 deleted file mode 100644 index 24711e227c..0000000000 --- a/e2e/react-start/session-handling/src/routes/api/session-helper-cookie.ts +++ /dev/null @@ -1,21 +0,0 @@ -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 deleted file mode 100644 index deb93ea549..0000000000 --- a/e2e/react-start/session-handling/src/routes/api/session-hono-community.ts +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index fb99ce6196..0000000000 --- a/e2e/react-start/session-handling/src/routes/api/session-hono-cookie.ts +++ /dev/null @@ -1,52 +0,0 @@ -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 deleted file mode 100644 index fdfd172bf0..0000000000 --- a/e2e/react-start/session-handling/src/routes/api/session-hono.ts +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 83337d1dfb..0000000000 --- a/e2e/react-start/session-handling/src/routes/api/session-iron.ts +++ /dev/null @@ -1,28 +0,0 @@ -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 deleted file mode 100644 index 4090262477..0000000000 --- a/e2e/react-start/session-handling/src/routes/api/session-middleware.ts +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index 5acb82446c..0000000000 --- a/e2e/react-start/session-handling/src/routes/api/session-named.ts +++ /dev/null @@ -1,21 +0,0 @@ -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 deleted file mode 100644 index 5280d7e6bc..0000000000 --- a/e2e/react-start/session-handling/src/routes/api/session-redirect.ts +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 4696cf80a4..0000000000 --- a/e2e/react-start/session-handling/src/routes/api/session.ts +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 9dc929d5bb..0000000000 --- a/e2e/react-start/session-handling/src/routes/index.tsx +++ /dev/null @@ -1,14 +0,0 @@ -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 deleted file mode 100644 index bce5419c84..0000000000 --- a/e2e/react-start/session-handling/src/routes/server-functions.tsx +++ /dev/null @@ -1,85 +0,0 @@ -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 deleted file mode 100644 index 0339a4f813..0000000000 --- a/e2e/react-start/session-handling/src/routes/ssr.tsx +++ /dev/null @@ -1,26 +0,0 @@ -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 deleted file mode 100644 index f223c42cbd..0000000000 --- a/e2e/react-start/session-handling/src/session.ts +++ /dev/null @@ -1,47 +0,0 @@ -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 deleted file mode 100644 index a9571afabb..0000000000 --- a/e2e/react-start/session-handling/src/start.ts +++ /dev/null @@ -1,22 +0,0 @@ -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 deleted file mode 100644 index a38fb439a6..0000000000 --- a/e2e/react-start/session-handling/src/styles/app.css +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index aaa975ccef..0000000000 --- a/e2e/react-start/session-handling/tests/session-handling.spec.ts +++ /dev/null @@ -1,334 +0,0 @@ -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 deleted file mode 100644 index c7a0597e4b..0000000000 --- a/e2e/react-start/session-handling/tsconfig.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "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 deleted file mode 100644 index ef9695579b..0000000000 --- a/e2e/react-start/session-handling/vite.config.ts +++ /dev/null @@ -1,13 +0,0 @@ -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/spa-mode/package.json b/e2e/react-start/spa-mode/package.json index 5281364692..1810493b1a 100644 --- a/e2e/react-start/spa-mode/package.json +++ b/e2e/react-start/spa-mode/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "npx serve dist/client", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:^", diff --git a/e2e/react-start/spa-mode/playwright.config.ts b/e2e/react-start/spa-mode/playwright.config.ts index 630989e41f..badd6db0eb 100644 --- a/e2e/react-start/spa-mode/playwright.config.ts +++ b/e2e/react-start/spa-mode/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,8 +20,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && NODE_ENV=production PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/react-start/split-base-and-basepath/package.json b/e2e/react-start/split-base-and-basepath/package.json index 7f0e62766c..c0066b7aaf 100644 --- a/e2e/react-start/split-base-and-basepath/package.json +++ b/e2e/react-start/split-base-and-basepath/package.json @@ -10,7 +10,7 @@ "start": "node prod-server.js", "test:e2e:dev": "MODE=dev playwright test --project=chromium", "test:e2e:prod": "playwright test --project=chromium", - "test:e2e": "pnpm run test:e2e:dev && pnpm run test:e2e:prod" + "test:e2e": "rm -rf port*.txt; pnpm run test:e2e:dev && pnpm run test:e2e:prod" }, "dependencies": { "@tanstack/react-router": "workspace:^", @@ -26,7 +26,7 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "srvx": "^1.0.0", + "srvx": "^0.11.9", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" diff --git a/e2e/react-start/split-base-and-basepath/playwright.config.ts b/e2e/react-start/split-base-and-basepath/playwright.config.ts index f0e25bb95a..3596ccd106 100644 --- a/e2e/react-start/split-base-and-basepath/playwright.config.ts +++ b/e2e/react-start/split-base-and-basepath/playwright.config.ts @@ -1,10 +1,11 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } const mode = process.env.MODE ?? 'prod' const isDev = mode === 'dev' -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -13,17 +14,16 @@ export default defineConfig({ reporter: [['line']], globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', use: { baseURL, }, webServer: { - command: isDev - ? `pnpm dev:e2e --port 0` - : `pnpm build && PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + command: isDev ? `pnpm dev:e2e` : `pnpm build && PORT=${PORT} pnpm start`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', env: { PORT: String(PORT), diff --git a/e2e/react-start/split-base-and-basepath/prod-server.js b/e2e/react-start/split-base-and-basepath/prod-server.js index 58421125cf..72114a1d40 100644 --- a/e2e/react-start/split-base-and-basepath/prod-server.js +++ b/e2e/react-start/split-base-and-basepath/prod-server.js @@ -20,9 +20,7 @@ app.use(async (req, res, next) => { } }) -const httpServer = app.listen(PORT, (error) => { - if (error) { - throw error - } - console.log(`E2E app: http://localhost:${httpServer.address().port}`) +app.listen(PORT, (error) => { + if (error) throw error + console.log(`Server is running on http://localhost:${PORT}`) }) diff --git a/e2e/react-start/split-base-and-basepath/tests/setup/global.setup.ts b/e2e/react-start/split-base-and-basepath/tests/setup/global.setup.ts index 9fc3ddc286..41ad16a44f 100644 --- a/e2e/react-start/split-base-and-basepath/tests/setup/global.setup.ts +++ b/e2e/react-start/split-base-and-basepath/tests/setup/global.setup.ts @@ -1,9 +1,17 @@ -import { preOptimizeDevServer, waitForServer } from '@tanstack/router-e2e-utils' +import { + e2eStartDummyServer, + getTestServerPort, + preOptimizeDevServer, + waitForServer, +} from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } export default async function setup() { + await e2eStartDummyServer(packageJson.name) + if (process.env.MODE !== 'dev') return - const port = Number(process.env.E2E_APP_PORT ?? 0) + const port = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${port}` await waitForServer(baseURL) diff --git a/e2e/react-start/split-base-and-basepath/tests/setup/global.teardown.ts b/e2e/react-start/split-base-and-basepath/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/react-start/split-base-and-basepath/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/react-start/start-manifest/package.json b/e2e/react-start/start-manifest/package.json index d5367558e8..939882a346 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.260903-beta", + "nitro": "^3.0.260311-beta", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" @@ -29,11 +29,7 @@ "nx": { "targets": { "test:e2e": { - "parallelism": false, - "outputs": [ - "...", - "{projectRoot}/.output" - ] + "parallelism": false } } } diff --git a/e2e/react-start/start-manifest/playwright.config.ts b/e2e/react-start/start-manifest/playwright.config.ts index 333ada654d..9e72f6160b 100644 --- a/e2e/react-start/start-manifest/playwright.config.ts +++ b/e2e/react-start/start-manifest/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -15,8 +16,8 @@ export default defineConfig({ webServer: { command: `PORT=${PORT} pnpm build && PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, 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 bd7bd20e98..7dfa390997 100644 --- a/e2e/react-start/start-manifest/tests/start-manifest.spec.ts +++ b/e2e/react-start/start-manifest/tests/start-manifest.spec.ts @@ -27,6 +27,12 @@ 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), @@ -356,19 +362,24 @@ test('shared widget CSS stays applied when navigating from static to lazy route' const widget = page.getByTestId('shared-widget') await expect(widget).toBeVisible() - await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) - await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) + 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(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(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) - await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) + await expect + .poll(() => getBackgroundColor('shared-widget', page), { + timeout: 5_000, + }) + .toBe(SHARED_WIDGET_BG) }) test('shared widget CSS stays applied when navigating from lazy to static route', async ({ @@ -378,19 +389,28 @@ 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() - 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 expect + .poll(() => getBackgroundColor('shared-widget', page), { + timeout: 5_000, + }) + .toBe(SHARED_WIDGET_BG) 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(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) - await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) + 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) }) test('shared widget CSS is applied on direct navigation to lazy route', async ({ @@ -402,8 +422,17 @@ 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(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) - await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) + + 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) }) test('shared widget CSS persists after navigating away from lazy and back', async ({ @@ -413,21 +442,19 @@ 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('lazy-css-lazy-heading')).toBeVisible() - await expect(widget).toBeVisible() + await expect(page.getByTestId('shared-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(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) - await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) + await expect + .poll(() => getBackgroundColor('shared-widget', page), { + timeout: 5_000, + }) + .toBe(SHARED_WIDGET_BG) }) diff --git a/e2e/react-start/static-server-functions/package.json b/e2e/react-start/static-server-functions/package.json index 85f08d19c9..6aa146fc59 100644 --- a/e2e/react-start/static-server-functions/package.json +++ b/e2e/react-start/static-server-functions/package.json @@ -9,13 +9,13 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "node .output/server/index.mjs", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/react-router": "workspace:*", "@tanstack/react-start": "workspace:*", "@tanstack/start-static-server-functions": "workspace:*", - "nitro": "^3.0.260903-beta", + "nitro": "^3.0.1-alpha.2", "react": "^19.0.0", "react-dom": "^19.0.0" }, @@ -29,14 +29,5 @@ "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" - }, - "nx": { - "targets": { - "test:e2e": { - "dependsOn": [ - "build" - ] - } - } } } diff --git a/e2e/react-start/static-server-functions/playwright.config.ts b/e2e/react-start/static-server-functions/playwright.config.ts index 08416e4d53..b9f835c16a 100644 --- a/e2e/react-start/static-server-functions/playwright.config.ts +++ b/e2e/react-start/static-server-functions/playwright.config.ts @@ -1,6 +1,8 @@ import { defineConfig, devices } from '@playwright/test' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = 3000 +const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -13,9 +15,9 @@ export default defineConfig({ }, webServer: { - command: `PORT=${PORT} pnpm start`, + command: `pnpm build && PORT=${PORT} pnpm start`, url: baseURL, - reuseExistingServer: false, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/react-start/static-server-functions/src/routeTree.gen.ts b/e2e/react-start/static-server-functions/src/routeTree.gen.ts index 558b1ab4d9..ea6a6a3806 100644 --- a/e2e/react-start/static-server-functions/src/routeTree.gen.ts +++ b/e2e/react-start/static-server-functions/src/routeTree.gen.ts @@ -11,7 +11,6 @@ import { Route as rootRouteImport } from './routes/__root' import { Route as IndexRouteImport } from './routes/index' import { Route as PostsRouteImport } from './routes/posts' -import { Route as RawStreamRouteImport } from './routes/raw-stream' import { Route as PostsIndexRouteImport } from './routes/posts.index' const IndexRoute = IndexRouteImport.update({ @@ -24,11 +23,6 @@ const PostsRoute = PostsRouteImport.update({ path: '/posts', getParentRoute: () => rootRouteImport, } as any) -const RawStreamRoute = RawStreamRouteImport.update({ - id: '/raw-stream', - path: '/raw-stream', - getParentRoute: () => rootRouteImport, -} as any) const PostsIndexRoute = PostsIndexRouteImport.update({ id: '/', path: '/', @@ -38,33 +32,29 @@ const PostsIndexRoute = PostsIndexRouteImport.update({ export interface FileRoutesByFullPath { '/': typeof IndexRoute '/posts': typeof PostsRouteWithChildren - '/raw-stream': typeof RawStreamRoute '/posts/': typeof PostsIndexRoute } export interface FileRoutesByTo { '/': typeof IndexRoute - '/raw-stream': typeof RawStreamRoute '/posts': typeof PostsIndexRoute } export interface FileRoutesById { __root__: typeof rootRouteImport '/': typeof IndexRoute '/posts': typeof PostsRouteWithChildren - '/raw-stream': typeof RawStreamRoute '/posts/': typeof PostsIndexRoute } export interface FileRouteTypes { fileRoutesByFullPath: FileRoutesByFullPath - fullPaths: '/' | '/posts' | '/raw-stream' | '/posts/' + fullPaths: '/' | '/posts' | '/posts/' fileRoutesByTo: FileRoutesByTo - to: '/' | '/raw-stream' | '/posts' - id: '__root__' | '/' | '/posts' | '/raw-stream' | '/posts/' + to: '/' | '/posts' + id: '__root__' | '/' | '/posts' | '/posts/' fileRoutesById: FileRoutesById } export interface RootRouteChildren { IndexRoute: typeof IndexRoute PostsRoute: typeof PostsRouteWithChildren - RawStreamRoute: typeof RawStreamRoute } declare module '@tanstack/react-router' { @@ -83,13 +73,6 @@ declare module '@tanstack/react-router' { preLoaderRoute: typeof PostsRouteImport parentRoute: typeof rootRouteImport } - '/raw-stream': { - id: '/raw-stream' - path: '/raw-stream' - fullPath: '/raw-stream' - preLoaderRoute: typeof RawStreamRouteImport - parentRoute: typeof rootRouteImport - } '/posts/': { id: '/posts/' path: '/' @@ -113,7 +96,6 @@ const PostsRouteWithChildren = PostsRoute._addFileChildren(PostsRouteChildren) const rootRouteChildren: RootRouteChildren = { IndexRoute: IndexRoute, PostsRoute: PostsRouteWithChildren, - RawStreamRoute: RawStreamRoute, } export const routeTree = rootRouteImport ._addFileChildren(rootRouteChildren) diff --git a/e2e/react-start/static-server-functions/src/routes/__root.tsx b/e2e/react-start/static-server-functions/src/routes/__root.tsx index a300613fa8..b768e8b9a1 100644 --- a/e2e/react-start/static-server-functions/src/routes/__root.tsx +++ b/e2e/react-start/static-server-functions/src/routes/__root.tsx @@ -30,9 +30,6 @@ function RootComponent() { Posts - - Raw Stream -

diff --git a/e2e/react-start/static-server-functions/src/routes/raw-stream.tsx b/e2e/react-start/static-server-functions/src/routes/raw-stream.tsx deleted file mode 100644 index df898d2907..0000000000 --- a/e2e/react-start/static-server-functions/src/routes/raw-stream.tsx +++ /dev/null @@ -1,29 +0,0 @@ -import { createFileRoute } from '@tanstack/react-router' -import { RawStream, createServerFn } from '@tanstack/react-start' -import { staticFunctionMiddleware } from '@tanstack/start-static-server-functions' - -const fetchRawStream = createServerFn({ method: 'GET' }) - .middleware([staticFunctionMiddleware]) - .handler(async () => { - return new RawStream(new Response('Static cache stream').body!, { - hint: 'text', - }) - }) - -export const Route = createFileRoute('/raw-stream')({ - loader: async () => { - const result = await fetchRawStream() - if (typeof document === 'undefined') { - return '' - } - const stream = result as RawStream | ReadableStream - return new Response( - stream instanceof RawStream ? stream.stream : stream, - ).text() - }, - component: RawStreamComponent, -}) - -function RawStreamComponent() { - return

{Route.useLoaderData()}

-} diff --git a/e2e/react-start/static-server-functions/tests/app.spec.ts b/e2e/react-start/static-server-functions/tests/app.spec.ts index d86fd61a75..895566aa35 100644 --- a/e2e/react-start/static-server-functions/tests/app.spec.ts +++ b/e2e/react-start/static-server-functions/tests/app.spec.ts @@ -59,32 +59,5 @@ test.describe('Static Server Functions with Nitro', () => { await expect(page.getByTestId('post-2')).toHaveText('Second Post') await expect(page.getByTestId('post-3')).toHaveText('Third Post') }) - - test('should decode a cached RawStream during client navigation', async ({ - page, - }) => { - await page.goto('/') - // Nitro snapshots public assets before Start prerenders (see #6787). - // Serve the generated file as a static host would to isolate decoding. - await page.route('**/__tsr/staticServerFnCache/*.json', (route) => - route.fulfill({ - path: join( - process.cwd(), - '.output', - 'public', - new URL(route.request().url()).pathname, - ), - }), - ) - const cacheResponse = page.waitForResponse((response) => - response.url().includes('/__tsr/staticServerFnCache/'), - ) - await page.getByTestId('link-raw-stream').click() - const response = await cacheResponse - expect(response.status(), response.url()).toBe(200) - await expect(page.getByTestId('raw-stream')).toHaveText( - 'Static cache stream', - ) - }) }) }) diff --git a/e2e/react-start/streaming-ssr/package.json b/e2e/react-start/streaming-ssr/package.json index 1d08a07622..fcf78262d5 100644 --- a/e2e/react-start/streaming-ssr/package.json +++ b/e2e/react-start/streaming-ssr/package.json @@ -9,9 +9,8 @@ "build": "vite build && tsc --noEmit", "start": "pnpx srvx --prod -s ../client dist/server/server.js", "preview": "vite preview", - "test:e2e": "playwright test --project=chromium", - "test:e2e:preview": "MODE=preview playwright test preview-streaming.spec.ts --project=chromium", - "test:e2e:buffer-repro": "RUN_SSR_ROUTER_HTML_BUFFER_REPRO=true playwright test router-html-buffer.spec.ts --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium", + "test:e2e:preview": "rm -rf port*.txt; MODE=preview playwright test preview-streaming.spec.ts --project=chromium" }, "dependencies": { "@tanstack/react-query": "^5.80.7", @@ -27,45 +26,9 @@ "@types/node": "^22.10.2", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", - "@vitejs/plugin-react": "^6.0.1", - "srvx": "^1.0.0", + "srvx": "^0.11.9", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" - }, - "nx": { - "targets": { - "build": { - "inputs": [ - "buildProduction", - "^buildProduction", - "dependentTaskOutputs", - "streamingSsrTests" - ] - }, - "test:e2e": { - "inputs": [ - "default", - "^production", - "dependentTaskOutputs", - "streamingSsrTests" - ] - }, - "test:e2e:preview": { - "inputs": [ - "default", - "^production", - "streamingSsrTests" - ] - }, - "test:e2e:buffer-repro": { - "inputs": [ - "default", - "^production", - "dependentTaskOutputs", - "streamingSsrTests" - ] - } - } } } diff --git a/e2e/react-start/streaming-ssr/playwright.config.ts b/e2e/react-start/streaming-ssr/playwright.config.ts index c2f3b67a0c..052ebe879d 100644 --- a/e2e/react-start/streaming-ssr/playwright.config.ts +++ b/e2e/react-start/streaming-ssr/playwright.config.ts @@ -1,9 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } const isPreview = process.env.MODE === 'preview' -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort( + `${packageJson.name}${isPreview ? '_preview' : ''}`, +) const baseURL = `http://localhost:${PORT}` const ssrCommand = `VITE_SERVER_PORT=${PORT} pnpm build && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start` @@ -25,8 +28,8 @@ export default defineConfig({ webServer: { command: isPreview ? previewCommand : ssrCommand, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/react-start/streaming-ssr/src/routeTree.gen.ts b/e2e/react-start/streaming-ssr/src/routeTree.gen.ts index 169121003d..c1a51b62f8 100644 --- a/e2e/react-start/streaming-ssr/src/routeTree.gen.ts +++ b/e2e/react-start/streaming-ssr/src/routeTree.gen.ts @@ -17,7 +17,6 @@ import { Route as FastSerialRouteImport } from './routes/fast-serial' import { Route as ManyPromisesRouteImport } from './routes/many-promises' import { Route as NestedDeferredRouteImport } from './routes/nested-deferred' import { Route as QueryHeavyRouteImport } from './routes/query-heavy' -import { Route as RouterHtmlBufferRouteImport } from './routes/router-html-buffer' import { Route as SlowRenderRouteImport } from './routes/slow-render' import { Route as StreamRouteImport } from './routes/stream' import { Route as SyncOnlyRouteImport } from './routes/sync-only' @@ -62,11 +61,6 @@ const QueryHeavyRoute = QueryHeavyRouteImport.update({ path: '/query-heavy', getParentRoute: () => rootRouteImport, } as any) -const RouterHtmlBufferRoute = RouterHtmlBufferRouteImport.update({ - id: '/router-html-buffer', - path: '/router-html-buffer', - getParentRoute: () => rootRouteImport, -} as any) const SlowRenderRoute = SlowRenderRouteImport.update({ id: '/slow-render', path: '/slow-render', @@ -92,7 +86,6 @@ export interface FileRoutesByFullPath { '/many-promises': typeof ManyPromisesRoute '/nested-deferred': typeof NestedDeferredRoute '/query-heavy': typeof QueryHeavyRoute - '/router-html-buffer': typeof RouterHtmlBufferRoute '/slow-render': typeof SlowRenderRoute '/stream': typeof StreamRoute '/sync-only': typeof SyncOnlyRoute @@ -106,7 +99,6 @@ export interface FileRoutesByTo { '/many-promises': typeof ManyPromisesRoute '/nested-deferred': typeof NestedDeferredRoute '/query-heavy': typeof QueryHeavyRoute - '/router-html-buffer': typeof RouterHtmlBufferRoute '/slow-render': typeof SlowRenderRoute '/stream': typeof StreamRoute '/sync-only': typeof SyncOnlyRoute @@ -121,7 +113,6 @@ export interface FileRoutesById { '/many-promises': typeof ManyPromisesRoute '/nested-deferred': typeof NestedDeferredRoute '/query-heavy': typeof QueryHeavyRoute - '/router-html-buffer': typeof RouterHtmlBufferRoute '/slow-render': typeof SlowRenderRoute '/stream': typeof StreamRoute '/sync-only': typeof SyncOnlyRoute @@ -137,7 +128,6 @@ export interface FileRouteTypes { | '/many-promises' | '/nested-deferred' | '/query-heavy' - | '/router-html-buffer' | '/slow-render' | '/stream' | '/sync-only' @@ -151,7 +141,6 @@ export interface FileRouteTypes { | '/many-promises' | '/nested-deferred' | '/query-heavy' - | '/router-html-buffer' | '/slow-render' | '/stream' | '/sync-only' @@ -165,7 +154,6 @@ export interface FileRouteTypes { | '/many-promises' | '/nested-deferred' | '/query-heavy' - | '/router-html-buffer' | '/slow-render' | '/stream' | '/sync-only' @@ -180,7 +168,6 @@ export interface RootRouteChildren { ManyPromisesRoute: typeof ManyPromisesRoute NestedDeferredRoute: typeof NestedDeferredRoute QueryHeavyRoute: typeof QueryHeavyRoute - RouterHtmlBufferRoute: typeof RouterHtmlBufferRoute SlowRenderRoute: typeof SlowRenderRoute StreamRoute: typeof StreamRoute SyncOnlyRoute: typeof SyncOnlyRoute @@ -244,13 +231,6 @@ declare module '@tanstack/react-router' { preLoaderRoute: typeof QueryHeavyRouteImport parentRoute: typeof rootRouteImport } - '/router-html-buffer': { - id: '/router-html-buffer' - path: '/router-html-buffer' - fullPath: '/router-html-buffer' - preLoaderRoute: typeof RouterHtmlBufferRouteImport - parentRoute: typeof rootRouteImport - } '/slow-render': { id: '/slow-render' path: '/slow-render' @@ -284,7 +264,6 @@ const rootRouteChildren: RootRouteChildren = { ManyPromisesRoute: ManyPromisesRoute, NestedDeferredRoute: NestedDeferredRoute, QueryHeavyRoute: QueryHeavyRoute, - RouterHtmlBufferRoute: RouterHtmlBufferRoute, SlowRenderRoute: SlowRenderRoute, StreamRoute: StreamRoute, SyncOnlyRoute: SyncOnlyRoute, diff --git a/e2e/react-start/streaming-ssr/src/routes/concurrent.tsx b/e2e/react-start/streaming-ssr/src/routes/concurrent.tsx index c04155aa59..a1bed0fe07 100644 --- a/e2e/react-start/streaming-ssr/src/routes/concurrent.tsx +++ b/e2e/react-start/streaming-ssr/src/routes/concurrent.tsx @@ -1,9 +1,54 @@ import { Await, createFileRoute } from '@tanstack/react-router' import { Suspense } from 'react' -import { createConcurrentLoaderData } from '../../../../streaming-ssr-fixtures' + +/** + * Tests concurrent promise resolution - multiple promises resolving at the exact same time. + * This can stress the serialization system and reveal race conditions. + */ + +// Shared delay function that resolves multiple promises at the same instant +function createConcurrentPromises( + count: number, + delayMs: number, +): Array> { + const sharedPromise = new Promise((resolve) => + setTimeout(resolve, delayMs), + ) + return Array.from({ length: count }, (_, i) => + sharedPromise.then(() => `concurrent-${i + 1}`), + ) +} export const Route = createFileRoute('/concurrent')({ - loader: async () => createConcurrentLoaderData(), + loader: async () => { + // Create fresh batches of concurrent promises for each request + const batch1 = createConcurrentPromises(5, 100) // 5 promises resolving at 100ms + const batch2 = createConcurrentPromises(5, 200) // 5 promises resolving at 200ms + const batch3 = createConcurrentPromises(5, 300) // 5 promises resolving at 300ms + + return { + // Batch 1: 5 promises resolving at exactly the same time (100ms) + concurrent1_1: batch1[0], + concurrent1_2: batch1[1], + concurrent1_3: batch1[2], + concurrent1_4: batch1[3], + concurrent1_5: batch1[4], + + // Batch 2: 5 promises resolving at exactly the same time (200ms) + concurrent2_1: batch2[0], + concurrent2_2: batch2[1], + concurrent2_3: batch2[2], + concurrent2_4: batch2[3], + concurrent2_5: batch2[4], + + // Batch 3: 5 promises resolving at exactly the same time (300ms) + concurrent3_1: batch3[0], + concurrent3_2: batch3[1], + concurrent3_3: batch3[2], + concurrent3_4: batch3[3], + concurrent3_5: batch3[4], + } + }, component: Concurrent, }) @@ -41,6 +86,7 @@ function Concurrent() { gap: '20px', }} > + {/* Batch 1: 100ms */}

Batch 1 (100ms)

@@ -50,6 +96,7 @@ function Concurrent() {
+ {/* Batch 2: 200ms */}

Batch 2 (200ms)

@@ -59,6 +106,7 @@ function Concurrent() {
+ {/* Batch 3: 300ms */}

Batch 3 (300ms)

diff --git a/e2e/react-start/streaming-ssr/src/routes/deferred-rejection.tsx b/e2e/react-start/streaming-ssr/src/routes/deferred-rejection.tsx index 3ac1e7fc2d..d9b5305480 100644 --- a/e2e/react-start/streaming-ssr/src/routes/deferred-rejection.tsx +++ b/e2e/react-start/streaming-ssr/src/routes/deferred-rejection.tsx @@ -1,9 +1,7 @@ import { Await, createFileRoute } from '@tanstack/react-router' import { Suspense } from 'react' -import { - deferredDataDelay, - deferredErrorMessage, -} from '../../../../streaming-ssr-fixtures' + +const deferredErrorMessage = 'Error in deferred object' export const Route = createFileRoute('/deferred-rejection')({ loader: async () => { @@ -11,7 +9,7 @@ export const Route = createFileRoute('/deferred-rejection')({ deferredData: new Promise((_resolve, reject) => { setTimeout(() => { reject(new Error(deferredErrorMessage)) - }, deferredDataDelay) + }, 1000) }), } }, diff --git a/e2e/react-start/streaming-ssr/src/routes/deferred.tsx b/e2e/react-start/streaming-ssr/src/routes/deferred.tsx index 9f91c0f2d4..506efbd345 100644 --- a/e2e/react-start/streaming-ssr/src/routes/deferred.tsx +++ b/e2e/react-start/streaming-ssr/src/routes/deferred.tsx @@ -1,40 +1,55 @@ import { Await, createFileRoute } from '@tanstack/react-router' import { createServerFn } from '@tanstack/react-start' import { Suspense } from 'react' -import { - deferredDataDelay, - deferredDataMessage, - deferredImmediateName, - deferredServerDelay, - deferredSlowName, - delay, - makeDeferredMessage, - makeServerData, - sourceMarker, -} from '../../../../streaming-ssr-fixtures' +// Server function that returns immediately const getImmediateData = createServerFn({ method: 'GET' }) .validator((data: { name: string }) => data) - .handler(({ data }) => makeServerData(data.name)) + .handler(({ data }) => { + return { + name: data.name, + timestamp: Date.now(), + // Track where this data came from - should always be 'server' if SSR works + source: 'server' as const, + } + }) +// Server function that takes time to complete const getSlowData = createServerFn({ method: 'GET' }) .validator((data: { name: string; delay: number }) => data) .handler(async ({ data }) => { - await delay(data.delay) - return makeServerData(data.name) + await new Promise((r) => setTimeout(r, data.delay)) + return { + name: data.name, + timestamp: Date.now(), + // Track where this data came from - should always be 'server' if SSR works + source: 'server' as const, + } }) export const Route = createFileRoute('/deferred')({ loader: async () => { return { - deferredData: makeDeferredMessage(deferredDataMessage, deferredDataDelay), + // Deferred promise that resolves after 1 second + deferredData: new Promise<{ message: string; source: string }>((r) => + setTimeout( + () => + r({ + message: 'Deferred data loaded!', + // Track where this data came from - should always be 'server' if SSR works + source: typeof window === 'undefined' ? 'server' : 'client', + }), + 1000, + ), + ), + // Deferred server function call deferredServerData: getSlowData({ - data: { name: deferredSlowName, delay: deferredServerDelay }, + data: { name: 'Slow User', delay: 800 }, }), - immediateData: await getImmediateData({ - data: { name: deferredImmediateName }, - }), - loaderSource: sourceMarker(), + // Immediate data (awaited) + immediateData: await getImmediateData({ data: { name: 'Fast User' } }), + // Track where loader ran - should always be 'server' if SSR works + loaderSource: typeof window === 'undefined' ? 'server' : 'client', } }, component: Deferred, @@ -48,6 +63,7 @@ function Deferred() {

Deferred Data Test

+ {/* Immediate data should be available right away */}
Immediate: {immediateData.name} @ {immediateData.timestamp}
@@ -58,6 +74,7 @@ function Deferred() {
Loader source: {loaderSource}
+ {/* Deferred promise */} Loading deferred...
} > @@ -71,6 +88,7 @@ function Deferred() { /> + {/* Deferred server function */} Loading server data...
diff --git a/e2e/react-start/streaming-ssr/src/routes/fast-serial.tsx b/e2e/react-start/streaming-ssr/src/routes/fast-serial.tsx index cc3f0c2b5c..61a47469f4 100644 --- a/e2e/react-start/streaming-ssr/src/routes/fast-serial.tsx +++ b/e2e/react-start/streaming-ssr/src/routes/fast-serial.tsx @@ -1,23 +1,26 @@ import { createFileRoute } from '@tanstack/react-router' import { createServerFn } from '@tanstack/react-start' -import { - fastSerialStaticData, - makeFastSerialSmallData, - sourceMarker, -} from '../../../../streaming-ssr-fixtures' -const getSmallData = createServerFn({ method: 'GET' }).handler(() => - makeFastSerialSmallData(), -) +// Server function that returns immediately with minimal data +const getSmallData = createServerFn({ method: 'GET' }).handler(() => { + return { + value: 'small-data', + timestamp: Date.now(), + // Track where this data came from - should always be 'server' if SSR works + source: 'server' as const, + } +}) export const Route = createFileRoute('/fast-serial')({ loader: async () => { + // All data is awaited immediately - serialization should complete quickly const data = await getSmallData() return { serverData: data, - staticData: fastSerialStaticData, + staticData: 'This is static data', timestamp: Date.now(), - loaderSource: sourceMarker(), + // Track where loader ran - should always be 'server' if SSR works + loaderSource: typeof window === 'undefined' ? 'server' : 'client', } }, component: FastSerial, diff --git a/e2e/react-start/streaming-ssr/src/routes/many-promises.tsx b/e2e/react-start/streaming-ssr/src/routes/many-promises.tsx index 25cb6511c7..a6d0374972 100644 --- a/e2e/react-start/streaming-ssr/src/routes/many-promises.tsx +++ b/e2e/react-start/streaming-ssr/src/routes/many-promises.tsx @@ -1,9 +1,47 @@ import { Await, createFileRoute } from '@tanstack/react-router' import { Suspense } from 'react' -import { createManyPromises } from '../../../../streaming-ssr-fixtures' + +/** + * Tests streaming with many (15+) deferred promises resolving in various orders. + * This stresses the serialization system with concurrent promise resolutions. + */ + +// Helper to create a promise with a specific delay and value +function createDelayedPromise(value: T, delayMs: number): Promise { + return new Promise((resolve) => setTimeout(() => resolve(value), delayMs)) +} export const Route = createFileRoute('/many-promises')({ - loader: async () => createManyPromises(), + loader: async () => { + // Create 15 promises with varying delays to test ordering + // Some resolve quickly, some slowly, some at similar times + return { + // Immediate/very fast (0-50ms) + immediate1: createDelayedPromise('immediate-1', 0), + immediate2: createDelayedPromise('immediate-2', 10), + immediate3: createDelayedPromise('immediate-3', 20), + + // Fast (50-150ms) + fast1: createDelayedPromise('fast-1', 50), + fast2: createDelayedPromise('fast-2', 75), + fast3: createDelayedPromise('fast-3', 100), + fast4: createDelayedPromise('fast-4', 125), + + // Medium (150-300ms) + medium1: createDelayedPromise('medium-1', 150), + medium2: createDelayedPromise('medium-2', 200), + medium3: createDelayedPromise('medium-3', 250), + + // Slow (300-600ms) + slow1: createDelayedPromise('slow-1', 300), + slow2: createDelayedPromise('slow-2', 400), + slow3: createDelayedPromise('slow-3', 500), + + // Very slow (600ms+) + verySlow1: createDelayedPromise('very-slow-1', 600), + verySlow2: createDelayedPromise('very-slow-2', 800), + } + }, component: ManyPromises, }) @@ -47,6 +85,7 @@ function ManyPromises() { gap: '10px', }} > + {/* Immediate group */}

Immediate (0-20ms)

+ {/* Fast group */}

Fast (50-125ms)

@@ -74,6 +114,7 @@ function ManyPromises() {
+ {/* Medium group */}

Medium (150-250ms)

+ {/* Slow group */}

Slow (300-500ms)

@@ -100,6 +142,7 @@ function ManyPromises() {
+ {/* Very slow group */}

Very Slow (600-800ms)

{ - await delay(nestedLevelDelays[0]) - return makeLevelData(1) + await new Promise((r) => setTimeout(r, 200)) + return { level: 1, timestamp: Date.now() } }) const getLevel2Data = createServerFn({ method: 'GET' }).handler(async () => { - await delay(nestedLevelDelays[1]) - return makeLevelData(2) + await new Promise((r) => setTimeout(r, 400)) + return { level: 2, timestamp: Date.now() } }) const getLevel3Data = createServerFn({ method: 'GET' }).handler(async () => { - await delay(nestedLevelDelays[2]) - return makeLevelData(3) + await new Promise((r) => setTimeout(r, 600)) + return { level: 3, timestamp: Date.now() } }) export const Route = createFileRoute('/nested-deferred')({ loader: async () => { return { + // Multiple deferred promises that resolve at different times level1: getLevel1Data(), level2: getLevel2Data(), level3: getLevel3Data(), - plainDeferred: makeDeferred(nestedPlainMessage, nestedPlainDelay), + // Also a plain deferred promise + plainDeferred: new Promise((r) => + setTimeout(() => r('Plain deferred resolved!'), 300), + ), } }, component: NestedDeferred, }) +// Nested component that renders more Await components function Level1Content({ level2, level3, @@ -108,6 +106,7 @@ function NestedDeferred() { Tests multiple nested deferred promises resolving at different times.

+ {/* Plain deferred */} Loading plain...
} > @@ -117,6 +116,7 @@ function NestedDeferred() { /> + {/* Nested structure */}
Loading level 1...
} diff --git a/e2e/react-start/streaming-ssr/src/routes/query-heavy.tsx b/e2e/react-start/streaming-ssr/src/routes/query-heavy.tsx index 115ae9f10f..b20921323c 100644 --- a/e2e/react-start/streaming-ssr/src/routes/query-heavy.tsx +++ b/e2e/react-start/streaming-ssr/src/routes/query-heavy.tsx @@ -1,48 +1,167 @@ import { queryOptions, useSuspenseQuery } from '@tanstack/react-query' import { createFileRoute } from '@tanstack/react-router' import { Suspense } from 'react' -import { - delay, - makeQueryData, - queryHeavyItems, -} from '../../../../streaming-ssr-fixtures' -import type { QueryData } from '../../../../streaming-ssr-fixtures' -function makeQueryOptions(item: (typeof queryHeavyItems)[number]) { - return queryOptions({ - queryKey: ['streaming-ssr-query-heavy', item.type, item.id], - queryFn: (): QueryData | Promise => { - if (item.delayMs > 0) { - return delay(item.delayMs).then(() => makeQueryData(item)) - } +/** + * Tests multiple useSuspenseQuery calls on a single route. + * Some queries have synchronous queryFn (return immediately), + * some have async queryFn with various delays. + * + * This stresses the SSR query streaming integration. + */ - return makeQueryData(item) - }, - staleTime: Infinity, - }) -} +// Synchronous query - returns immediately (no await) +const syncQuery1 = queryOptions({ + queryKey: ['sync', 1], + queryFn: () => { + // Synchronous return - no Promise delay + return { + type: 'sync', + id: 1, + value: 'sync-value-1', + source: typeof window === 'undefined' ? 'server' : 'client', + } + }, + staleTime: Infinity, +}) -const syncQuery1 = makeQueryOptions(queryHeavyItems[0]) -const syncQuery2 = makeQueryOptions(queryHeavyItems[1]) -const syncQuery3 = makeQueryOptions(queryHeavyItems[2]) -const fastAsyncQuery1 = makeQueryOptions(queryHeavyItems[3]) -const fastAsyncQuery2 = makeQueryOptions(queryHeavyItems[4]) -const fastAsyncQuery3 = makeQueryOptions(queryHeavyItems[5]) -const slowAsyncQuery1 = makeQueryOptions(queryHeavyItems[6]) -const slowAsyncQuery2 = makeQueryOptions(queryHeavyItems[7]) -const slowAsyncQuery3 = makeQueryOptions(queryHeavyItems[8]) +const syncQuery2 = queryOptions({ + queryKey: ['sync', 2], + queryFn: () => { + return { + type: 'sync', + id: 2, + value: 'sync-value-2', + source: typeof window === 'undefined' ? 'server' : 'client', + } + }, + staleTime: Infinity, +}) -type QueryOptions = ReturnType +const syncQuery3 = queryOptions({ + queryKey: ['sync', 3], + queryFn: () => { + return { + type: 'sync', + id: 3, + value: 'sync-value-3', + source: typeof window === 'undefined' ? 'server' : 'client', + } + }, + staleTime: Infinity, +}) + +// Fast async queries (50-100ms) +const fastAsyncQuery1 = queryOptions({ + queryKey: ['fast-async', 1], + queryFn: async () => { + await new Promise((r) => setTimeout(r, 50)) + return { + type: 'fast-async', + id: 1, + value: 'fast-async-1', + source: typeof window === 'undefined' ? 'server' : 'client', + } + }, + staleTime: Infinity, +}) + +const fastAsyncQuery2 = queryOptions({ + queryKey: ['fast-async', 2], + queryFn: async () => { + await new Promise((r) => setTimeout(r, 75)) + return { + type: 'fast-async', + id: 2, + value: 'fast-async-2', + source: typeof window === 'undefined' ? 'server' : 'client', + } + }, + staleTime: Infinity, +}) + +const fastAsyncQuery3 = queryOptions({ + queryKey: ['fast-async', 3], + queryFn: async () => { + await new Promise((r) => setTimeout(r, 100)) + return { + type: 'fast-async', + id: 3, + value: 'fast-async-3', + source: typeof window === 'undefined' ? 'server' : 'client', + } + }, + staleTime: Infinity, +}) + +// Slow async queries (200-400ms) +const slowAsyncQuery1 = queryOptions({ + queryKey: ['slow-async', 1], + queryFn: async () => { + await new Promise((r) => setTimeout(r, 200)) + return { + type: 'slow-async', + id: 1, + value: 'slow-async-1', + source: typeof window === 'undefined' ? 'server' : 'client', + } + }, + staleTime: Infinity, +}) + +const slowAsyncQuery2 = queryOptions({ + queryKey: ['slow-async', 2], + queryFn: async () => { + await new Promise((r) => setTimeout(r, 300)) + return { + type: 'slow-async', + id: 2, + value: 'slow-async-2', + source: typeof window === 'undefined' ? 'server' : 'client', + } + }, + staleTime: Infinity, +}) + +const slowAsyncQuery3 = queryOptions({ + queryKey: ['slow-async', 3], + queryFn: async () => { + await new Promise((r) => setTimeout(r, 400)) + return { + type: 'slow-async', + id: 3, + value: 'slow-async-3', + source: typeof window === 'undefined' ? 'server' : 'client', + } + }, + staleTime: Infinity, +}) export const Route = createFileRoute('/query-heavy')({ component: QueryHeavy, }) -function QueryDisplay({ +// Individual query components to test Suspense boundaries +function SyncQueryDisplay({ queryOpts, testId, }: { - queryOpts: QueryOptions + queryOpts: typeof syncQuery1 + testId: string +}) { + const { data } = useSuspenseQuery(queryOpts) + return ( +
+ {data.value} (source: {data.source}) +
+ ) +} + +function AsyncQueryDisplay({ + queryOpts, + testId, +}: { + queryOpts: typeof fastAsyncQuery1 testId: string }) { const { data } = useSuspenseQuery(queryOpts) @@ -71,25 +190,27 @@ function QueryHeavy() { marginTop: '20px', }} > + {/* Sync queries - should resolve immediately */}

Sync Queries (immediate)

Loading sync 1...
} > - + Loading sync 2...} > - + Loading sync 3...} > - + + {/* Fast async queries */}

Fast Async Queries (50-100ms)

Loading fast 1...
} > - @@ -107,7 +228,7 @@ function QueryHeavy() {
Loading fast 2...
} > - @@ -117,13 +238,14 @@ function QueryHeavy() {
Loading fast 3...
} > - + {/* Slow async queries */}

Slow Async Queries (200-400ms)

Loading slow 1...
} > - @@ -141,7 +263,7 @@ function QueryHeavy() {
Loading slow 2...
} > - @@ -151,7 +273,7 @@ function QueryHeavy() {
Loading slow 3...
} > - diff --git a/e2e/react-start/streaming-ssr/src/routes/router-html-buffer.tsx b/e2e/react-start/streaming-ssr/src/routes/router-html-buffer.tsx deleted file mode 100644 index 6fb7bde27b..0000000000 --- a/e2e/react-start/streaming-ssr/src/routes/router-html-buffer.tsx +++ /dev/null @@ -1,58 +0,0 @@ -import { Suspense, useState } from 'react' -import { Await, createFileRoute } from '@tanstack/react-router' -import { createRouterHtmlPayload } from '../../../../streaming-ssr-fixtures' - -export const Route = createFileRoute('/router-html-buffer')({ - loader: () => { - return { - payload: createRouterHtmlPayload(), - } - }, - component: RouterHtmlBufferRoute, -}) - -function RouterHtmlBufferRoute() { - const { payload } = Route.useLoaderData() - - return ( -
-

Router HTML Buffer Reproduction

- Waiting for the deferred payload...

}> - ( - - )} - /> -
-
- ) -} - -function HydratedPayload({ - payload, - source, -}: { - payload: string - source: 'server' | 'client' -}) { - const [hydrationResult, setHydrationResult] = useState('not checked') - - return ( - <> -

{payload.length}

- -

{hydrationResult}

- - ) -} diff --git a/e2e/react-start/streaming-ssr/src/routes/slow-render.tsx b/e2e/react-start/streaming-ssr/src/routes/slow-render.tsx index a897c519c1..5dd9772604 100644 --- a/e2e/react-start/streaming-ssr/src/routes/slow-render.tsx +++ b/e2e/react-start/streaming-ssr/src/routes/slow-render.tsx @@ -1,36 +1,47 @@ import { Await, createFileRoute } from '@tanstack/react-router' import { createServerFn } from '@tanstack/react-start' import { Suspense } from 'react' -import { - makeDeferredMessage, - makeServerData, - slowRenderComponents, - slowRenderDeferredDelay, - slowRenderDeferredMessage, - slowRenderQuickName, - sourceMarker, -} from '../../../../streaming-ssr-fixtures' -const getQuickData = createServerFn({ method: 'GET' }).handler(() => - makeServerData(slowRenderQuickName), -) +// Server function that completes quickly +const getQuickData = createServerFn({ method: 'GET' }).handler(() => { + return { + name: 'Quick data', + timestamp: Date.now(), + // Track where this data came from - should always be 'server' if SSR works + source: 'server' as const, + } +}) +// Simulate a slow component render by doing work during render function SlowComponent({ data, index }: { data: string; index: number }) { + // This simulates a component that takes time to render const startTime = Date.now() - while (Date.now() - startTime < 100) {} + while (Date.now() - startTime < 100) { + // Blocking loop to simulate slow render + } return
{data}
} export const Route = createFileRoute('/slow-render')({ loader: async () => { + // All data loads quickly const quickData = await getQuickData() return { quickData, - deferredData: makeDeferredMessage( - slowRenderDeferredMessage, - slowRenderDeferredDelay, + // Deferred data that resolves before render might complete + deferredData: new Promise<{ message: string; source: string }>((r) => + setTimeout( + () => + r({ + message: 'Deferred resolved!', + // Track where this data came from - should always be 'server' if SSR works + source: typeof window === 'undefined' ? 'server' : 'client', + }), + 50, + ), ), - loaderSource: sourceMarker(), + // Track where loader ran - should always be 'server' if SSR works + loaderSource: typeof window === 'undefined' ? 'server' : 'client', } }, component: SlowRender, @@ -65,9 +76,10 @@ function SlowRender() { /> - {slowRenderComponents.map((data, index) => ( - - ))} + {/* Multiple slow components to extend render time */} + + + ) } diff --git a/e2e/react-start/streaming-ssr/src/routes/stream.tsx b/e2e/react-start/streaming-ssr/src/routes/stream.tsx index 458be61366..c1629204c7 100644 --- a/e2e/react-start/streaming-ssr/src/routes/stream.tsx +++ b/e2e/react-start/streaming-ssr/src/routes/stream.tsx @@ -1,16 +1,24 @@ import { Await, createFileRoute } from '@tanstack/react-router' import { Suspense, useEffect, useRef, useState } from 'react' -import { - createChunkStream, - createStreamPromise, -} from '../../../../streaming-ssr-fixtures' export const Route = createFileRoute('/stream')({ component: StreamRoute, loader() { return { - promise: createStreamPromise(), - stream: createChunkStream(), + // A promise that resolves after a short delay + promise: new Promise((resolve) => + setTimeout(() => resolve('promise-resolved'), 150), + ), + // A ReadableStream that emits chunks over time + stream: new ReadableStream({ + async start(controller) { + for (let i = 0; i < 5; i++) { + await new Promise((resolve) => setTimeout(resolve, 200)) + controller.enqueue(`chunk-${i}`) + } + controller.close() + }, + }), } }, }) @@ -25,16 +33,19 @@ function StreamRoute() { const streamRef = useRef(null) useEffect(() => { + // If we're already reading this exact stream, don't start again if (streamRef.current === stream && readerRef.current) { return } + // Reset state for a new stream if (streamRef.current !== stream) { setStreamData([]) setStreamComplete(false) streamRef.current = stream } + // Check if stream is already locked (from a previous render) if (stream.locked) { return } @@ -54,6 +65,7 @@ function StreamRoute() { } setStreamComplete(true) } catch (e) { + // Stream was cancelled or errored, ignore if (!(e instanceof TypeError && String(e).includes('cancelled'))) { console.error('Stream error:', e) } @@ -63,6 +75,7 @@ function StreamRoute() { fetchStream() return () => { + // Cancel the reader on cleanup if (readerRef.current) { readerRef.current.cancel().catch(() => {}) readerRef.current = null @@ -74,6 +87,7 @@ function StreamRoute() {

ReadableStream Test

+ {/* Promise data */} Loading promise...
} > @@ -83,6 +97,7 @@ function StreamRoute() { /> + {/* Stream data */}

Stream chunks:

diff --git a/e2e/react-start/streaming-ssr/src/routes/sync-only.tsx b/e2e/react-start/streaming-ssr/src/routes/sync-only.tsx index 67a77a3e9f..c95a1d467f 100644 --- a/e2e/react-start/streaming-ssr/src/routes/sync-only.tsx +++ b/e2e/react-start/streaming-ssr/src/routes/sync-only.tsx @@ -1,8 +1,22 @@ import { createFileRoute } from '@tanstack/react-router' -import { makeSyncOnlyData } from '../../../../streaming-ssr-fixtures' +/** + * This route tests synchronous serialization - no deferred data, no streaming. + * The loader returns data synchronously (awaited), so crossSerializeStream + * completes immediately and all bootstrap scripts should be in the initial HTML. + */ export const Route = createFileRoute('/sync-only')({ - loader: async () => makeSyncOnlyData(), + loader: async () => { + // Simulate a fast synchronous data fetch + // This data is awaited, not deferred, so serialization completes synchronously + return { + message: 'Hello from sync loader!', + timestamp: Date.now(), + items: ['item-1', 'item-2', 'item-3'], + // Track where this data came from - should always be 'server' if SSR works + source: typeof window === 'undefined' ? 'server' : 'client', + } + }, component: SyncOnly, }) diff --git a/e2e/react-start/streaming-ssr/tests/client-navigation.spec.ts b/e2e/react-start/streaming-ssr/tests/client-navigation.spec.ts index 8b9b3a8dcc..91138987ad 100644 --- a/e2e/react-start/streaming-ssr/tests/client-navigation.spec.ts +++ b/e2e/react-start/streaming-ssr/tests/client-navigation.spec.ts @@ -1 +1,372 @@ -import '../../../streaming-ssr-specs/client-navigation' +import { expect, test, testWithHydration } from './fixtures' + +test.describe('Client-side navigation between all routes', () => { + test.beforeEach(async ({ page }) => { + // Start from home page + await page.goto('/') + await page.waitForLoadState('networkidle') + }) + + test('home -> sync-only -> home works', async ({ page }) => { + // Navigate to sync-only + await page + .getByRole('navigation') + .getByRole('link', { name: 'Sync Only' }) + .click() + await expect(page).toHaveURL('/sync-only') + await expect(page.getByTestId('sync-message')).toBeVisible() + + // Navigate back to home + await page + .getByRole('navigation') + .getByRole('link', { name: 'Home' }) + .click() + await expect(page).toHaveURL('/') + await expect(page.getByTestId('index-title')).toBeVisible() + }) + + test('home -> deferred -> home works', async ({ page }) => { + // Navigate to deferred (use exact: true to avoid matching "Nested Deferred") + await page + .getByRole('navigation') + .getByRole('link', { name: 'Deferred', exact: true }) + .click() + await expect(page).toHaveURL('/deferred') + await expect(page.getByTestId('immediate-data')).toBeVisible() + + // Wait for deferred data + await expect(page.getByTestId('deferred-data')).toBeVisible({ + timeout: 5000, + }) + + // Navigate back to home + await page + .getByRole('navigation') + .getByRole('link', { name: 'Home' }) + .click() + await expect(page).toHaveURL('/') + }) + + test('home -> stream -> home works (no stream locking error)', async ({ + page, + }) => { + // This test specifically validates the ReadableStream locking fix + // Console errors are monitored by the fixture automatically + + // Navigate to stream + await page + .getByRole('navigation') + .getByRole('link', { name: 'Stream' }) + .click() + await expect(page).toHaveURL('/stream') + + // Wait for stream to start (at least one chunk or promise resolved) + await expect(page.getByTestId('promise-data')).toBeVisible({ + timeout: 5000, + }) + + // Navigate back to home before stream completes + await page + .getByRole('navigation') + .getByRole('link', { name: 'Home' }) + .click() + await expect(page).toHaveURL('/') + }) + + test('home -> stream -> wait for completion -> home works', async ({ + page, + }) => { + // Navigate to stream + await page + .getByRole('navigation') + .getByRole('link', { name: 'Stream' }) + .click() + await expect(page).toHaveURL('/stream') + + // Wait for stream to complete + await expect(page.getByTestId('stream-complete')).toBeVisible({ + timeout: 10000, + }) + + // Navigate back to home + await page + .getByRole('navigation') + .getByRole('link', { name: 'Home' }) + .click() + await expect(page).toHaveURL('/') + await expect(page.getByTestId('index-title')).toBeVisible() + }) + + test('home -> stream -> home -> stream again works (fresh stream each time)', async ({ + page, + }) => { + // Console errors are monitored by the fixture automatically + + // First navigation to stream + await page + .getByRole('navigation') + .getByRole('link', { name: 'Stream' }) + .click() + await expect(page).toHaveURL('/stream') + await expect(page.getByTestId('promise-data')).toBeVisible({ + timeout: 5000, + }) + + // Navigate back to home + await page + .getByRole('navigation') + .getByRole('link', { name: 'Home' }) + .click() + await expect(page).toHaveURL('/') + + // Second navigation to stream - should get fresh stream without errors + await page + .getByRole('navigation') + .getByRole('link', { name: 'Stream' }) + .click() + await expect(page).toHaveURL('/stream') + + // Wait for stream to complete + await expect(page.getByTestId('stream-complete')).toBeVisible({ + timeout: 10000, + }) + + // Verify all chunks are present + await expect(page.getByTestId('stream-chunk-0')).toBeVisible() + await expect(page.getByTestId('stream-chunk-4')).toBeVisible() + }) + + test('home -> fast-serial -> home works', async ({ page }) => { + await page + .getByRole('navigation') + .getByRole('link', { name: 'Fast Serial' }) + .click() + await expect(page).toHaveURL('/fast-serial') + await expect(page.getByTestId('server-data')).toBeVisible() + + await page + .getByRole('navigation') + .getByRole('link', { name: 'Home' }) + .click() + await expect(page).toHaveURL('/') + }) + + test('home -> slow-render -> home works', async ({ page }) => { + await page + .getByRole('navigation') + .getByRole('link', { name: 'Slow Render' }) + .click() + await expect(page).toHaveURL('/slow-render') + await expect(page.getByTestId('quick-data')).toBeVisible() + + await page + .getByRole('navigation') + .getByRole('link', { name: 'Home' }) + .click() + await expect(page).toHaveURL('/') + }) + + test('home -> nested-deferred -> home works', async ({ page }) => { + await page + .getByRole('navigation') + .getByRole('link', { name: 'Nested Deferred' }) + .click() + await expect(page).toHaveURL('/nested-deferred') + + // Wait for all levels to load + await expect(page.getByTestId('level3-data')).toBeVisible({ timeout: 5000 }) + + await page + .getByRole('navigation') + .getByRole('link', { name: 'Home' }) + .click() + await expect(page).toHaveURL('/') + }) + + test('rapid navigation between routes works', async ({ page }) => { + // Console errors are monitored by the fixture automatically + + // Rapid navigation sequence + await page + .getByRole('navigation') + .getByRole('link', { name: 'Sync Only' }) + .click() + await expect(page).toHaveURL('/sync-only') + + await page + .getByRole('navigation') + .getByRole('link', { name: 'Deferred', exact: true }) + .click() + await expect(page).toHaveURL('/deferred') + + await page + .getByRole('navigation') + .getByRole('link', { name: 'Stream' }) + .click() + await expect(page).toHaveURL('/stream') + + await page + .getByRole('navigation') + .getByRole('link', { name: 'Fast Serial' }) + .click() + await expect(page).toHaveURL('/fast-serial') + + await page + .getByRole('navigation') + .getByRole('link', { name: 'Slow Render' }) + .click() + await expect(page).toHaveURL('/slow-render') + + await page + .getByRole('navigation') + .getByRole('link', { name: 'Nested Deferred' }) + .click() + await expect(page).toHaveURL('/nested-deferred') + + await page + .getByRole('navigation') + .getByRole('link', { name: 'Home' }) + .click() + await expect(page).toHaveURL('/') + }) +}) + +test.describe('Direct navigation followed by client navigation', () => { + test('direct to stream -> client nav to deferred works', async ({ page }) => { + // Direct navigation to stream + await page.goto('/stream') + await expect(page.getByTestId('promise-data')).toBeVisible({ + timeout: 5000, + }) + + // Client navigation to deferred (use exact: true) + await page + .getByRole('navigation') + .getByRole('link', { name: 'Deferred', exact: true }) + .click() + await expect(page).toHaveURL('/deferred') + await expect(page.getByTestId('immediate-data')).toBeVisible() + }) + + test('direct to deferred -> client nav to stream works', async ({ page }) => { + // Console errors are monitored by the fixture automatically + + // Direct navigation to deferred + await page.goto('/deferred') + await expect(page.getByTestId('immediate-data')).toBeVisible() + + // Client navigation to stream + await page + .getByRole('navigation') + .getByRole('link', { name: 'Stream' }) + .click() + await expect(page).toHaveURL('/stream') + await expect(page.getByTestId('stream-complete')).toBeVisible({ + timeout: 10000, + }) + }) + + test('direct to sync-only -> client nav to all routes works', async ({ + page, + }) => { + await page.goto('/sync-only') + await expect(page.getByTestId('sync-message')).toBeVisible() + + // Navigate through all routes + await page + .getByRole('navigation') + .getByRole('link', { name: 'Deferred', exact: true }) + .click() + await expect(page).toHaveURL('/deferred') + + await page + .getByRole('navigation') + .getByRole('link', { name: 'Stream' }) + .click() + await expect(page).toHaveURL('/stream') + + await page + .getByRole('navigation') + .getByRole('link', { name: 'Fast Serial' }) + .click() + await expect(page).toHaveURL('/fast-serial') + + await page + .getByRole('navigation') + .getByRole('link', { name: 'Home' }) + .click() + await expect(page).toHaveURL('/') + }) +}) + +testWithHydration.describe('Hydration after client navigation', () => { + testWithHydration( + 'interactive elements work after navigating to deferred', + async ({ page }) => { + await page.goto('/') + await page.waitForLoadState('networkidle') + + await page + .getByRole('navigation') + .getByRole('link', { name: 'Deferred', exact: true }) + .click() + await expect(page).toHaveURL('/deferred') + + // Wait for the page to be fully loaded + await expect(page.getByTestId('immediate-data')).toBeVisible() + }, + ) + + testWithHydration( + 'interactive elements work after navigating to fast-serial', + async ({ page }) => { + await page.goto('/') + await page.waitForLoadState('networkidle') + + await page + .getByRole('navigation') + .getByRole('link', { name: 'Fast Serial' }) + .click() + await expect(page).toHaveURL('/fast-serial') + + // Wait for page to load + await expect(page.getByTestId('server-data')).toBeVisible() + }, + ) + + testWithHydration( + 'interactive elements work after navigating to nested-deferred', + async ({ page }) => { + await page.goto('/') + await page.waitForLoadState('networkidle') + + await page + .getByRole('navigation') + .getByRole('link', { name: 'Nested Deferred' }) + .click() + await expect(page).toHaveURL('/nested-deferred') + + // Wait for page to load + await expect(page.getByTestId('plain-deferred')).toBeVisible({ + timeout: 5000, + }) + }, + ) + + testWithHydration( + 'interactive elements work after navigating to slow-render', + async ({ page }) => { + await page.goto('/') + await page.waitForLoadState('networkidle') + + await page + .getByRole('navigation') + .getByRole('link', { name: 'Slow Render' }) + .click() + await expect(page).toHaveURL('/slow-render') + + // Wait for page to load (slow-render has blocking loops) + await expect(page.getByTestId('quick-data')).toBeVisible() + }, + ) +}) diff --git a/e2e/react-start/streaming-ssr/tests/concurrent.spec.ts b/e2e/react-start/streaming-ssr/tests/concurrent.spec.ts index 8625473a58..10e32c6809 100644 --- a/e2e/react-start/streaming-ssr/tests/concurrent.spec.ts +++ b/e2e/react-start/streaming-ssr/tests/concurrent.spec.ts @@ -1 +1,100 @@ -import '../../../streaming-ssr-specs/concurrent' +import { expect, test, testWithHydration } from './fixtures' + +test.describe('Concurrent promise resolution (15 promises in 3 batches)', () => { + test('all concurrent promises resolve correctly', async ({ page }) => { + await page.goto('/concurrent') + + // Batch 1 (5 promises at 100ms) + await expect(page.getByTestId('concurrent-1-1')).toContainText( + 'concurrent-1', + { timeout: 5000 }, + ) + await expect(page.getByTestId('concurrent-1-2')).toContainText( + 'concurrent-2', + { timeout: 5000 }, + ) + await expect(page.getByTestId('concurrent-1-3')).toContainText( + 'concurrent-3', + { timeout: 5000 }, + ) + await expect(page.getByTestId('concurrent-1-4')).toContainText( + 'concurrent-4', + { timeout: 5000 }, + ) + await expect(page.getByTestId('concurrent-1-5')).toContainText( + 'concurrent-5', + { timeout: 5000 }, + ) + + // Batch 2 (5 promises at 200ms) + await expect(page.getByTestId('concurrent-2-1')).toContainText( + 'concurrent-1', + { timeout: 5000 }, + ) + await expect(page.getByTestId('concurrent-2-2')).toContainText( + 'concurrent-2', + { timeout: 5000 }, + ) + await expect(page.getByTestId('concurrent-2-3')).toContainText( + 'concurrent-3', + { timeout: 5000 }, + ) + await expect(page.getByTestId('concurrent-2-4')).toContainText( + 'concurrent-4', + { timeout: 5000 }, + ) + await expect(page.getByTestId('concurrent-2-5')).toContainText( + 'concurrent-5', + { timeout: 5000 }, + ) + + // Batch 3 (5 promises at 300ms) + await expect(page.getByTestId('concurrent-3-1')).toContainText( + 'concurrent-1', + { timeout: 5000 }, + ) + await expect(page.getByTestId('concurrent-3-2')).toContainText( + 'concurrent-2', + { timeout: 5000 }, + ) + await expect(page.getByTestId('concurrent-3-3')).toContainText( + 'concurrent-3', + { timeout: 5000 }, + ) + await expect(page.getByTestId('concurrent-3-4')).toContainText( + 'concurrent-4', + { timeout: 5000 }, + ) + await expect(page.getByTestId('concurrent-3-5')).toContainText( + 'concurrent-5', + { timeout: 5000 }, + ) + }) + + test('batch 1 resolves before batch 3', async ({ page }) => { + await page.goto('/concurrent', { waitUntil: 'commit' }) + + // Batch 1 should be visible before batch 3 + await expect(page.getByTestId('concurrent-1-1')).toBeVisible({ + timeout: 3000, + }) + + // Eventually batch 3 should also be visible + await expect(page.getByTestId('concurrent-3-5')).toBeVisible({ + timeout: 5000, + }) + }) + + testWithHydration( + 'hydration works with concurrent resolutions', + async ({ page }) => { + await page.goto('/concurrent') + await page.waitForLoadState('networkidle') + + // Wait for all batches + await expect(page.getByTestId('concurrent-3-5')).toBeVisible({ + timeout: 5000, + }) + }, + ) +}) diff --git a/e2e/react-start/streaming-ssr/tests/deferred-rejection.spec.ts b/e2e/react-start/streaming-ssr/tests/deferred-rejection.spec.ts index 355b5019bc..3b8144072c 100644 --- a/e2e/react-start/streaming-ssr/tests/deferred-rejection.spec.ts +++ b/e2e/react-start/streaming-ssr/tests/deferred-rejection.spec.ts @@ -1 +1,21 @@ -import '../../../streaming-ssr-specs/deferred-rejection' +import { expect, test } from './fixtures' + +test.use({ + whitelistErrors: ['Error in deferred object'], +}) + +test('rejected deferred Await renders the route error boundary without killing SSR', async ({ + page, +}) => { + await page.goto('/deferred-rejection') + + await expect(page.getByTestId('deferred-error-boundary')).toContainText( + 'Error in deferred object', + { timeout: 5000 }, + ) + + await page.goto('/sync-only') + await expect(page.getByTestId('sync-message')).toContainText( + 'Hello from sync loader!', + ) +}) diff --git a/e2e/react-start/streaming-ssr/tests/deferred.spec.ts b/e2e/react-start/streaming-ssr/tests/deferred.spec.ts index 3145897d7b..90ee16edc0 100644 --- a/e2e/react-start/streaming-ssr/tests/deferred.spec.ts +++ b/e2e/react-start/streaming-ssr/tests/deferred.spec.ts @@ -1 +1,120 @@ -import '../../../streaming-ssr-specs/deferred' +import { expect, test, testWithHydration } from './fixtures' + +test.describe('Deferred data streaming', () => { + test('shows immediate data right away and deferred data after loading', async ({ + page, + }) => { + await page.goto('/deferred') + + // Immediate data should be available right away + await expect(page.getByTestId('immediate-data')).toBeVisible() + await expect(page.getByTestId('immediate-data')).toContainText( + 'Immediate: Fast User', + ) + + // Verify immediate data came from server + await expect(page.getByTestId('immediate-source')).toContainText( + 'Immediate source: server', + ) + await expect(page.getByTestId('loader-source')).toContainText( + 'Loader source: server', + ) + + // Deferred data should eventually appear with server source + await expect(page.getByTestId('deferred-data')).toContainText( + 'Deferred data loaded!', + { timeout: 5000 }, + ) + await expect(page.getByTestId('deferred-data')).toContainText( + 'source: server', + { timeout: 5000 }, + ) + await expect(page.getByTestId('deferred-server-data')).toContainText( + 'Server: Slow User', + { timeout: 5000 }, + ) + await expect(page.getByTestId('deferred-server-data')).toContainText( + 'source: server', + { timeout: 5000 }, + ) + }) + + test('shows loading states for deferred content', async ({ page }) => { + // Navigate with cache disabled to ensure fresh load + await page.goto('/deferred', { waitUntil: 'commit' }) + + // Should see loading states initially (may be very brief) + // We check that deferred content eventually shows + await expect(page.getByTestId('deferred-data')).toBeVisible({ + timeout: 5000, + }) + await expect(page.getByTestId('deferred-server-data')).toBeVisible({ + timeout: 5000, + }) + }) + + testWithHydration( + 'hydration works - interactive elements respond', + async ({ page }) => { + await page.goto('/deferred') + await page.waitForLoadState('networkidle') + + // Wait for all deferred content to load + await expect(page.getByTestId('deferred-data')).toBeVisible({ + timeout: 5000, + }) + + // Verify all data came from server after hydration + await expect(page.getByTestId('loader-source')).toContainText( + 'Loader source: server', + ) + await expect(page.getByTestId('deferred-data')).toContainText( + 'source: server', + ) + }, + ) + + test('client-side navigation to deferred route works', async ({ page }) => { + await page.goto('/') + await page.waitForLoadState('networkidle') + + // Navigate via client-side routing using nav link + await page.getByRole('link', { name: 'Deferred' }).first().click() + await expect(page).toHaveURL('/deferred') + + // Data should load + await expect(page.getByTestId('immediate-data')).toContainText('Fast User') + await expect(page.getByTestId('deferred-data')).toContainText( + 'Deferred data loaded!', + { timeout: 5000 }, + ) + }) + + test('all data sources are server - proves SSR streaming works', async ({ + page, + }) => { + await page.goto('/deferred') + + // Wait for all deferred content + await expect(page.getByTestId('deferred-data')).toBeVisible({ + timeout: 5000, + }) + await expect(page.getByTestId('deferred-server-data')).toBeVisible({ + timeout: 5000, + }) + + // Count all elements showing 'server' source - should be 4: + // 1. immediate-source + // 2. loader-source + // 3. deferred-data (contains "source: server") + // 4. deferred-server-data (contains "source: server") + await expect(page.getByTestId('immediate-source')).toContainText('server') + await expect(page.getByTestId('loader-source')).toContainText('server') + await expect(page.getByTestId('deferred-data')).toContainText( + 'source: server', + ) + await expect(page.getByTestId('deferred-server-data')).toContainText( + 'source: server', + ) + }) +}) diff --git a/e2e/react-start/streaming-ssr/tests/fast-serial.spec.ts b/e2e/react-start/streaming-ssr/tests/fast-serial.spec.ts index 95df0555e2..339d6408ea 100644 --- a/e2e/react-start/streaming-ssr/tests/fast-serial.spec.ts +++ b/e2e/react-start/streaming-ssr/tests/fast-serial.spec.ts @@ -1 +1,72 @@ -import '../../../streaming-ssr-specs/fast-serial' +import { expect, test, testWithHydration } from './fixtures' + +test.describe('Fast serialization (serialization completes before render)', () => { + test('initial HTML contains router bootstrap + barrier', async ({ page }) => { + let responseHtml = '' + await page.route('/fast-serial', async (route) => { + const response = await route.fetch() + responseHtml = await response.text() + await route.fulfill({ response }) + }) + + await page.goto('/fast-serial') + await expect(page.getByTestId('server-data')).toBeVisible() + + expect(responseHtml).toContain('$_TSR') + expect(responseHtml).toContain('$_TSR.router') + expect(responseHtml).toContain('$_TSR.e()') + expect(responseHtml).toContain('$tsr-stream-barrier') + }) + + test('all data is available immediately', async ({ page }) => { + await page.goto('/fast-serial') + await page.waitForLoadState('networkidle') + + // All data should be visible + await expect(page.getByTestId('server-data')).toContainText('small-data') + await expect(page.getByTestId('static-data')).toContainText( + 'This is static data', + ) + await expect(page.getByTestId('loader-timestamp')).toBeVisible() + + // Verify data came from server (proves SSR streaming worked) + await expect(page.getByTestId('loader-source')).toContainText( + 'Loader source: server', + ) + await expect(page.getByTestId('server-fn-source')).toContainText( + 'Server function source: server', + ) + }) + + testWithHydration('hydration works correctly', async ({ page }) => { + await page.goto('/fast-serial') + await page.waitForLoadState('networkidle') + + // Verify data came from server after hydration + await expect(page.getByTestId('loader-source')).toContainText( + 'Loader source: server', + ) + }) + + test('direct navigation renders correctly', async ({ page }) => { + // Direct navigation (SSR) + await page.goto('/fast-serial') + + // Should render without errors and show server source + await expect(page.getByTestId('server-data')).toBeVisible() + await expect(page.getByTestId('loader-source')).toContainText( + 'Loader source: server', + ) + }) + + test('client-side navigation works', async ({ page }) => { + await page.goto('/') + await page.waitForLoadState('networkidle') + + // Navigate via nav link + await page.getByRole('link', { name: 'Fast Serial' }).first().click() + await expect(page).toHaveURL('/fast-serial') + + await expect(page.getByTestId('server-data')).toContainText('small-data') + }) +}) diff --git a/e2e/react-start/streaming-ssr/tests/fixtures.ts b/e2e/react-start/streaming-ssr/tests/fixtures.ts new file mode 100644 index 0000000000..71c564aebe --- /dev/null +++ b/e2e/react-start/streaming-ssr/tests/fixtures.ts @@ -0,0 +1,90 @@ +import { test as base, expect, type Page } from '@playwright/test' + +/** + * Verifies that React hydration has completed by clicking the global + * hydration check button and verifying the status changes. + * + * This is the canonical way to verify hydration in streaming-ssr tests. + * The HydrationCheck component is rendered in the root layout (__root.tsx). + * + * The function retries clicking until the status changes to 'hydrated', + * which handles the case where the button is visible from SSR before + * React has finished hydrating. + */ +async function verifyHydration( + page: Page, + options: { timeout?: number } = {}, +): Promise { + const timeout = options.timeout ?? 10000 + const button = page.getByTestId('hydration-check-btn') + const status = page.getByTestId('hydration-status') + + // Ensure the button is visible + await expect(button).toBeVisible() + + // Retry clicking until hydration succeeds + // This handles the case where SSR renders the button before React hydrates + await expect(async () => { + // Click the button to trigger hydration verification + await button.click() + + // Check if the status changed to 'hydrated' + await expect(status).toHaveText('hydrated', { timeout: 100 }) + }).toPass({ timeout }) +} + +export interface StreamingSsrOptions { + /** + * List of error message patterns to ignore in console output. + */ + whitelistErrors: Array +} + +/** + * Base test fixture for streaming-ssr e2e tests. + * Provides console error monitoring. + */ +export const test = base.extend({ + whitelistErrors: [[], { option: true }], + + page: async ({ page, whitelistErrors }, use) => { + const errorMessages: Array = [] + + page.on('console', (m) => { + if (m.type() === 'error') { + const text = m.text() + for (const whitelistError of whitelistErrors) { + if ( + (typeof whitelistError === 'string' && + text.includes(whitelistError)) || + (whitelistError instanceof RegExp && whitelistError.test(text)) + ) { + return + } + } + errorMessages.push(text) + } + }) + + await use(page) + + // Assert no unexpected console errors + expect(errorMessages).toEqual([]) + }, +}) + +/** + * Extended test fixture that automatically verifies hydration at the end. + * Use this for tests where you want to confirm React hydration succeeded. + */ +export const testWithHydration = test.extend({ + page: async ({ page }, use) => { + await use(page) + + // Automatically verify hydration at the end of the test + await verifyHydration(page) + }, +}) + +// Re-export expect for convenience +export { expect } diff --git a/e2e/react-start/streaming-ssr/tests/home.spec.ts b/e2e/react-start/streaming-ssr/tests/home.spec.ts index 5d49d34a56..e231d007fb 100644 --- a/e2e/react-start/streaming-ssr/tests/home.spec.ts +++ b/e2e/react-start/streaming-ssr/tests/home.spec.ts @@ -1 +1,34 @@ -import '../../../streaming-ssr-specs/home' +import { expect, test, testWithHydration } from './fixtures' + +test.describe('Home page', () => { + testWithHydration( + 'renders index page with all navigation links', + async ({ page }) => { + await page.goto('/') + await page.waitForLoadState('networkidle') + + await expect(page.getByTestId('index-title')).toContainText( + 'Streaming SSR Test Scenarios', + ) + // Check links exist (they're in the nav and the body) + await expect( + page.getByRole('link', { name: 'Deferred' }).first(), + ).toBeVisible() + await expect( + page.getByRole('link', { name: 'Stream' }).first(), + ).toBeVisible() + }, + ) + + testWithHydration( + 'navigation from home to routes works', + async ({ page }) => { + await page.goto('/') + await page.waitForLoadState('networkidle') + + // Use the link in the content (not nav) + await page.getByTestId('link-deferred').click() + await expect(page).toHaveURL('/deferred') + }, + ) +}) diff --git a/e2e/react-start/streaming-ssr/tests/many-promises.spec.ts b/e2e/react-start/streaming-ssr/tests/many-promises.spec.ts index b747bd7d0a..034ab74220 100644 --- a/e2e/react-start/streaming-ssr/tests/many-promises.spec.ts +++ b/e2e/react-start/streaming-ssr/tests/many-promises.spec.ts @@ -1 +1,93 @@ -import '../../../streaming-ssr-specs/many-promises' +import { expect, test, testWithHydration } from './fixtures' + +test.describe('Many promises streaming (15 deferred)', () => { + test('all 15 promises eventually resolve', async ({ page }) => { + await page.goto('/many-promises') + + // Immediate group (0-20ms) + await expect(page.getByTestId('immediate-1')).toContainText('immediate-1', { + timeout: 5000, + }) + await expect(page.getByTestId('immediate-2')).toContainText('immediate-2', { + timeout: 5000, + }) + await expect(page.getByTestId('immediate-3')).toContainText('immediate-3', { + timeout: 5000, + }) + + // Fast group (50-125ms) + await expect(page.getByTestId('fast-1')).toContainText('fast-1', { + timeout: 5000, + }) + await expect(page.getByTestId('fast-2')).toContainText('fast-2', { + timeout: 5000, + }) + await expect(page.getByTestId('fast-3')).toContainText('fast-3', { + timeout: 5000, + }) + await expect(page.getByTestId('fast-4')).toContainText('fast-4', { + timeout: 5000, + }) + + // Medium group (150-250ms) + await expect(page.getByTestId('medium-1')).toContainText('medium-1', { + timeout: 5000, + }) + await expect(page.getByTestId('medium-2')).toContainText('medium-2', { + timeout: 5000, + }) + await expect(page.getByTestId('medium-3')).toContainText('medium-3', { + timeout: 5000, + }) + + // Slow group (300-500ms) + await expect(page.getByTestId('slow-1')).toContainText('slow-1', { + timeout: 5000, + }) + await expect(page.getByTestId('slow-2')).toContainText('slow-2', { + timeout: 5000, + }) + await expect(page.getByTestId('slow-3')).toContainText('slow-3', { + timeout: 5000, + }) + + // Very slow group (600-800ms) + await expect(page.getByTestId('very-slow-1')).toContainText('very-slow-1', { + timeout: 5000, + }) + await expect(page.getByTestId('very-slow-2')).toContainText('very-slow-2', { + timeout: 5000, + }) + }) + + testWithHydration('hydration works with many promises', async ({ page }) => { + await page.goto('/many-promises') + await page.waitForLoadState('networkidle') + + // Wait for all promises to resolve + await expect(page.getByTestId('very-slow-2')).toBeVisible({ timeout: 5000 }) + }) + + test('client-side navigation works', async ({ page }) => { + await page.goto('/') + await page.waitForLoadState('networkidle') + + // Navigate via nav link + await page.getByRole('link', { name: 'Many Promises' }).click() + await expect(page).toHaveURL('/many-promises') + + // All promises should eventually resolve + await expect(page.getByTestId('very-slow-2')).toBeVisible({ timeout: 5000 }) + }) + + test('fast promises resolve before slow ones', async ({ page }) => { + // Navigate and check ordering - faster promises should be visible first + await page.goto('/many-promises', { waitUntil: 'commit' }) + + // Immediate promises should appear first + await expect(page.getByTestId('immediate-1')).toBeVisible({ timeout: 2000 }) + + // By the time we check very-slow, all should be visible + await expect(page.getByTestId('very-slow-2')).toBeVisible({ timeout: 5000 }) + }) +}) diff --git a/e2e/react-start/streaming-ssr/tests/nested-deferred.spec.ts b/e2e/react-start/streaming-ssr/tests/nested-deferred.spec.ts index 8df20a8a95..dbf6df4265 100644 --- a/e2e/react-start/streaming-ssr/tests/nested-deferred.spec.ts +++ b/e2e/react-start/streaming-ssr/tests/nested-deferred.spec.ts @@ -1 +1,77 @@ -import '../../../streaming-ssr-specs/nested-deferred' +import { expect, test, testWithHydration } from './fixtures' + +test.describe('Nested deferred (multiple levels of deferred data)', () => { + test('all levels of deferred data eventually resolve', async ({ page }) => { + await page.goto('/nested-deferred') + + // Plain deferred should resolve first (300ms) + await expect(page.getByTestId('plain-deferred')).toContainText( + 'Plain deferred resolved!', + { timeout: 5000 }, + ) + + // Level 1 should resolve (200ms) + await expect(page.getByTestId('level1-data')).toContainText('Level 1:', { + timeout: 5000, + }) + + // Level 2 should resolve (400ms) + await expect(page.getByTestId('level2-data')).toContainText('Level 2:', { + timeout: 5000, + }) + + // Level 3 should resolve (600ms) + await expect(page.getByTestId('level3-data')).toContainText('Level 3:', { + timeout: 5000, + }) + }) + + test('shows loading states while data is loading', async ({ page }) => { + // Use fast navigation to catch loading states + await page.goto('/nested-deferred', { waitUntil: 'commit' }) + + // Eventually all data should be visible + await expect(page.getByTestId('level3-data')).toBeVisible({ + timeout: 10000, + }) + }) + + testWithHydration( + 'hydration works with nested deferred', + async ({ page }) => { + await page.goto('/nested-deferred') + await page.waitForLoadState('networkidle') + + // Wait for all data + await expect(page.getByTestId('level3-data')).toBeVisible({ + timeout: 10000, + }) + }, + ) + + test('client-side navigation works', async ({ page }) => { + await page.goto('/') + await page.waitForLoadState('networkidle') + + // Navigate via nav link + await page.getByRole('link', { name: 'Nested Deferred' }).first().click() + await expect(page).toHaveURL('/nested-deferred') + + // All levels should eventually render + await expect(page.getByTestId('level3-data')).toBeVisible({ + timeout: 10000, + }) + }) + + test('data resolves in expected order (fastest first)', async ({ page }) => { + await page.goto('/nested-deferred') + + // Wait for all to be visible + await expect(page.getByTestId('level1-data')).toBeVisible({ timeout: 5000 }) + await expect(page.getByTestId('level2-data')).toBeVisible({ timeout: 5000 }) + await expect(page.getByTestId('level3-data')).toBeVisible({ timeout: 5000 }) + await expect(page.getByTestId('plain-deferred')).toBeVisible({ + timeout: 5000, + }) + }) +}) diff --git a/e2e/react-start/streaming-ssr/tests/preview-streaming.spec.ts b/e2e/react-start/streaming-ssr/tests/preview-streaming.spec.ts index 34241cfbaa..319219c519 100644 --- a/e2e/react-start/streaming-ssr/tests/preview-streaming.spec.ts +++ b/e2e/react-start/streaming-ssr/tests/preview-streaming.spec.ts @@ -1 +1,21 @@ -import '../../../streaming-ssr-specs/preview-streaming' +import { expect, test } from './fixtures' + +test('vite preview streams HTML incrementally', async ({ page }) => { + // /deferred has immediate data + deferred data with a ~1s delay. + // Without streaming, compression buffers the entire response. + await page.goto('/deferred', { waitUntil: 'commit' }) + + // Immediate data should arrive in the first chunk + await expect(page.getByTestId('immediate-data')).toBeVisible({ + timeout: 3000, + }) + + // Deferred data (1s delay) should still be loading at this point + await expect(page.getByTestId('deferred-loading')).toBeVisible() + + // Wait for it to resolve + await expect(page.getByTestId('deferred-data')).toContainText( + 'Deferred data loaded!', + { timeout: 5000 }, + ) +}) diff --git a/e2e/react-start/streaming-ssr/tests/query-heavy.spec.ts b/e2e/react-start/streaming-ssr/tests/query-heavy.spec.ts index e0d617106c..8e735040c2 100644 --- a/e2e/react-start/streaming-ssr/tests/query-heavy.spec.ts +++ b/e2e/react-start/streaming-ssr/tests/query-heavy.spec.ts @@ -1,18 +1,168 @@ -import '../../../streaming-ssr-specs/query-heavy' -import { expect, test } from '../../../streaming-ssr-assertions' +import { expect, test, testWithHydration } from './fixtures' -test('batches same-turn queries into one stream chunk', async ({ request }) => { - const response = await request.get('/query-heavy') - const html = await response.text() - const scripts = Array.from( - html.matchAll(/]*>([\s\S]*?)<\/script>/g), - (match) => match[1]!, - ) - const syncQueryChunk = scripts.find((script) => - script.includes('sync-value-1'), - ) +test.describe('Query heavy route (9 useSuspenseQuery)', () => { + test('all queries resolve with server data', async ({ page }) => { + await page.goto('/query-heavy') - expect(syncQueryChunk).toBeDefined() - expect(syncQueryChunk).toContain('sync-value-2') - expect(syncQueryChunk).toContain('sync-value-3') + // Sync queries should show server source + await expect(page.getByTestId('sync-query-1')).toContainText( + 'source: server', + { timeout: 5000 }, + ) + await expect(page.getByTestId('sync-query-2')).toContainText( + 'source: server', + { timeout: 5000 }, + ) + await expect(page.getByTestId('sync-query-3')).toContainText( + 'source: server', + { timeout: 5000 }, + ) + + // Fast async queries should show server source + await expect(page.getByTestId('fast-async-query-1')).toContainText( + 'source: server', + { timeout: 5000 }, + ) + await expect(page.getByTestId('fast-async-query-2')).toContainText( + 'source: server', + { timeout: 5000 }, + ) + await expect(page.getByTestId('fast-async-query-3')).toContainText( + 'source: server', + { timeout: 5000 }, + ) + + // Slow async queries should show server source + await expect(page.getByTestId('slow-async-query-1')).toContainText( + 'source: server', + { timeout: 5000 }, + ) + await expect(page.getByTestId('slow-async-query-2')).toContainText( + 'source: server', + { timeout: 5000 }, + ) + await expect(page.getByTestId('slow-async-query-3')).toContainText( + 'source: server', + { timeout: 5000 }, + ) + }) + + test('sync queries have correct values', async ({ page }) => { + await page.goto('/query-heavy') + + await expect(page.getByTestId('sync-query-1')).toContainText('sync-value-1') + await expect(page.getByTestId('sync-query-2')).toContainText('sync-value-2') + await expect(page.getByTestId('sync-query-3')).toContainText('sync-value-3') + }) + + test('async queries have correct values', async ({ page }) => { + await page.goto('/query-heavy') + + await expect(page.getByTestId('fast-async-query-1')).toContainText( + 'fast-async-1', + { timeout: 5000 }, + ) + await expect(page.getByTestId('fast-async-query-2')).toContainText( + 'fast-async-2', + { timeout: 5000 }, + ) + await expect(page.getByTestId('fast-async-query-3')).toContainText( + 'fast-async-3', + { timeout: 5000 }, + ) + + await expect(page.getByTestId('slow-async-query-1')).toContainText( + 'slow-async-1', + { timeout: 5000 }, + ) + await expect(page.getByTestId('slow-async-query-2')).toContainText( + 'slow-async-2', + { timeout: 5000 }, + ) + await expect(page.getByTestId('slow-async-query-3')).toContainText( + 'slow-async-3', + { timeout: 5000 }, + ) + }) + + testWithHydration('hydration works with many queries', async ({ page }) => { + await page.goto('/query-heavy') + await page.waitForLoadState('networkidle') + + // Wait for all queries to resolve + await expect(page.getByTestId('slow-async-query-3')).toBeVisible({ + timeout: 5000, + }) + }) + + test('client-side navigation works', async ({ page }) => { + await page.goto('/') + await page.waitForLoadState('networkidle') + + // Navigate via nav link + await page.getByRole('link', { name: 'Query Heavy' }).click() + await expect(page).toHaveURL('/query-heavy') + + // All queries should eventually resolve (on client) + await expect(page.getByTestId('slow-async-query-3')).toBeVisible({ + timeout: 5000, + }) + }) + + test('no hydration mismatch - queries streamed from server', async ({ + page, + }) => { + // This test verifies that query data is streamed from server + // If it wasn't, the queries would re-execute on client and show 'client' as source + await page.goto('/query-heavy') + + // Wait for all queries + await expect(page.getByTestId('slow-async-query-3')).toBeVisible({ + timeout: 5000, + }) + + // Verify all show 'server' - this proves data was streamed, not re-fetched + const serverSourceCount = await page + .locator('[data-testid*="query-"]') + .filter({ hasText: 'source: server' }) + .count() + expect(serverSourceCount).toBe(9) + }) + + test('emits query stream data before stream end marker', async ({ + request, + }) => { + const response = await request.get('/query-heavy') + const html = await response.text() + const endMarker = '$_TSR.e()' + const endIndex = html.indexOf(endMarker) + const slowAsyncPayloadIndex = html.indexOf('"slow-async-3"') + const lastScriptOpen = html.lastIndexOf('', endIndex) + + expect(endIndex).toBeGreaterThan(-1) + expect(lastScriptOpen).toBeGreaterThan(lastScriptClose) + expect(slowAsyncPayloadIndex).toBeGreaterThan(-1) + expect(slowAsyncPayloadIndex).toBeLessThan(endIndex) + expect(html.slice(lastScriptOpen, endIndex)).toContain('.return(void 0)') + expect(endIndex).toBeLessThan(html.indexOf('')) + }) + + test('batches same-turn queries into one stream chunk', async ({ + request, + }) => { + const response = await request.get('/query-heavy') + const html = await response.text() + const scripts = Array.from( + html.matchAll(/]*>([\s\S]*?)<\/script>/g), + (match) => match[1]!, + ) + const syncQueryChunk = scripts.find( + (script) => script.includes('.next(') && script.includes('sync-value-1'), + ) + + expect(syncQueryChunk).toBeDefined() + expect(syncQueryChunk).toContain('sync-value-2') + expect(syncQueryChunk).toContain('sync-value-3') + }) }) diff --git a/e2e/react-start/streaming-ssr/tests/router-html-buffer.spec.ts b/e2e/react-start/streaming-ssr/tests/router-html-buffer.spec.ts deleted file mode 100644 index a9cf8a8142..0000000000 --- a/e2e/react-start/streaming-ssr/tests/router-html-buffer.spec.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { - STREAM_PART_SELECTOR, - expect, - test, - testWithHydration, -} from '../../../streaming-ssr-assertions' - -const runBufferReproduction = - process.env.RUN_SSR_ROUTER_HTML_BUFFER_REPRO === 'true' - -test.describe('SSR router HTML buffer', () => { - test.skip( - !runBufferReproduction, - 'The 17 MiB ASCII reproduction is intentionally opt-in: pnpm test:e2e:buffer-repro', - ) - - testWithHydration( - 'hydrates a large deferred loader payload from server state', - async ({ page }) => { - const response = await page.goto('/router-html-buffer') - - expect(response?.ok()).toBe(true) - await expect(page.getByTestId('router-html-payload-length')).toHaveText( - '17825792', - ) - await expect(page.locator(STREAM_PART_SELECTOR)).toHaveCount(0) - - await page.getByTestId('router-html-payload-check').click() - await expect(page.getByTestId('router-html-payload-result')).toHaveText( - 'server:17825792:x', - ) - }, - ) -}) diff --git a/e2e/react-start/streaming-ssr/tests/slow-render.spec.ts b/e2e/react-start/streaming-ssr/tests/slow-render.spec.ts index 0d5a87363f..c3631a7fc0 100644 --- a/e2e/react-start/streaming-ssr/tests/slow-render.spec.ts +++ b/e2e/react-start/streaming-ssr/tests/slow-render.spec.ts @@ -1 +1,73 @@ -import '../../../streaming-ssr-specs/slow-render' +import { expect, test, testWithHydration } from './fixtures' + +test.describe('Slow render (render takes longer than serialization)', () => { + test('all data eventually renders with server source', async ({ page }) => { + await page.goto('/slow-render') + await page.waitForLoadState('networkidle') + + // Quick data should be available with server source + await expect(page.getByTestId('quick-data')).toContainText('Quick:') + await expect(page.getByTestId('quick-source')).toContainText( + 'Quick data source: server', + ) + await expect(page.getByTestId('loader-source')).toContainText( + 'Loader source: server', + ) + + // Deferred data should resolve with server source + await expect(page.getByTestId('deferred-resolved')).toContainText( + 'Deferred resolved!', + { timeout: 5000 }, + ) + await expect(page.getByTestId('deferred-resolved')).toContainText( + 'source: server', + { timeout: 5000 }, + ) + + // Slow components should have rendered + await expect(page.getByTestId('slow-component-1')).toBeVisible() + await expect(page.getByTestId('slow-component-2')).toBeVisible() + await expect(page.getByTestId('slow-component-3')).toBeVisible() + }) + + testWithHydration('hydration works after slow render', async ({ page }) => { + await page.goto('/slow-render') + await page.waitForLoadState('networkidle') + + // Wait for content and verify server source + await expect(page.getByTestId('slow-component-1')).toBeVisible() + await expect(page.getByTestId('loader-source')).toContainText( + 'Loader source: server', + ) + }) + + test('client-side navigation works', async ({ page }) => { + await page.goto('/') + await page.waitForLoadState('networkidle') + + // Navigate via nav link + await page.getByRole('link', { name: 'Slow Render' }).first().click() + await expect(page).toHaveURL('/slow-render') + + await expect(page.getByTestId('quick-data')).toBeVisible({ timeout: 10000 }) + }) + + test('all data sources are server - proves SSR streaming works', async ({ + page, + }) => { + await page.goto('/slow-render') + await page.waitForLoadState('networkidle') + + // Wait for deferred content + await expect(page.getByTestId('deferred-resolved')).toBeVisible({ + timeout: 5000, + }) + + // Verify all sources are server + await expect(page.getByTestId('quick-source')).toContainText('server') + await expect(page.getByTestId('loader-source')).toContainText('server') + await expect(page.getByTestId('deferred-resolved')).toContainText( + 'source: server', + ) + }) +}) diff --git a/e2e/react-start/streaming-ssr/tests/stream.spec.ts b/e2e/react-start/streaming-ssr/tests/stream.spec.ts index a51614f09a..5e4c134f82 100644 --- a/e2e/react-start/streaming-ssr/tests/stream.spec.ts +++ b/e2e/react-start/streaming-ssr/tests/stream.spec.ts @@ -1 +1,46 @@ -import '../../../streaming-ssr-specs/stream' +import { expect, test, testWithHydration } from './fixtures' + +test.describe('ReadableStream streaming', () => { + testWithHydration('promise data resolves correctly', async ({ page }) => { + await page.goto('/stream') + + // Promise should resolve + await expect(page.getByTestId('promise-data')).toContainText( + 'promise-resolved', + { timeout: 5000 }, + ) + }) + + testWithHydration('stream chunks arrive incrementally', async ({ page }) => { + await page.goto('/stream') + + // Wait for stream to complete + await expect(page.getByTestId('stream-complete')).toBeVisible({ + timeout: 10000, + }) + + // All chunks should be present + await expect(page.getByTestId('stream-chunk-0')).toContainText('chunk-0') + await expect(page.getByTestId('stream-chunk-1')).toContainText('chunk-1') + await expect(page.getByTestId('stream-chunk-2')).toContainText('chunk-2') + await expect(page.getByTestId('stream-chunk-3')).toContainText('chunk-3') + await expect(page.getByTestId('stream-chunk-4')).toContainText('chunk-4') + }) + + testWithHydration( + 'client-side navigation to stream route works', + async ({ page }) => { + await page.goto('/') + await page.waitForLoadState('networkidle') + + // Navigate via nav link + await page.getByRole('link', { name: 'Stream' }).first().click() + await expect(page).toHaveURL('/stream') + + // Wait for stream to complete + await expect(page.getByTestId('stream-complete')).toBeVisible({ + timeout: 10000, + }) + }, + ) +}) diff --git a/e2e/react-start/streaming-ssr/tests/sync-only.spec.ts b/e2e/react-start/streaming-ssr/tests/sync-only.spec.ts index 0e9278d3f2..a0060a07ee 100644 --- a/e2e/react-start/streaming-ssr/tests/sync-only.spec.ts +++ b/e2e/react-start/streaming-ssr/tests/sync-only.spec.ts @@ -1 +1,84 @@ -import '../../../streaming-ssr-specs/sync-only' +import { expect } from '@playwright/test' +import { test, testWithHydration } from './fixtures' + +/** + * Tests for synchronous serialization - no deferred data, no streaming. + * This is the most common case where all loader data is immediately available. + * The hydration scripts should be included in the initial HTML response. + */ + +test('Sync-only route renders with loader data', async ({ page }) => { + await page.goto('/sync-only') + + // Verify the page content is rendered + await expect(page.getByTestId('sync-title')).toContainText( + 'Synchronous Serialization Test', + ) + await expect(page.getByTestId('sync-message')).toContainText( + 'Hello from sync loader!', + ) + + // Verify loader data items are rendered + await expect(page.getByTestId('sync-item-item-1')).toBeVisible() + await expect(page.getByTestId('sync-item-item-2')).toBeVisible() + await expect(page.getByTestId('sync-item-item-3')).toBeVisible() + + // Verify data came from server (proves SSR streaming worked) + await expect(page.getByTestId('sync-source')).toContainText('Source: server') +}) + +testWithHydration('Sync-only route hydrates correctly', async ({ page }) => { + await page.goto('/sync-only') + + // Verify client-side navigation works (proves hydration succeeded) + await page.getByRole('navigation').getByRole('link', { name: 'Home' }).click() + await expect(page.getByTestId('index-title')).toBeVisible() + + // Navigate back to sync-only via client-side navigation (use nav link to be specific) + await page + .getByRole('navigation') + .getByRole('link', { name: 'Sync Only' }) + .click() + await expect(page.getByTestId('sync-title')).toBeVisible() +}) + +test('Sync-only route has bootstrap scripts in initial HTML', async ({ + page, +}) => { + // Intercept the response to check the raw HTML + let responseHtml = '' + await page.route('/sync-only', async (route) => { + const response = await route.fetch() + responseHtml = await response.text() + await route.fulfill({ response }) + }) + + await page.goto('/sync-only') + + // Wait for page to load + await expect(page.getByTestId('sync-title')).toBeVisible() + + // The HTML should contain the bootstrap scripts + // $_TSR.router should be present (the dehydrated router state) + expect(responseHtml).toContain('$_TSR') + expect(responseHtml).toContain('$_TSR.router') + // The serialization end marker should be present + expect(responseHtml).toContain('$_TSR.e()') + + // SSR should include the barrier script tag in the HTML (rendered by ) + // This is the critical marker transformStreamWithRouter can scan for. + expect(responseHtml).toContain('$tsr-stream-barrier') +}) + +test('Navigating to sync-only from home page', async ({ page }) => { + await page.goto('/') + + await page.getByTestId('link-sync-only').click() + + await expect(page.getByTestId('sync-title')).toContainText( + 'Synchronous Serialization Test', + ) + await expect(page.getByTestId('sync-message')).toContainText( + 'Hello from sync loader!', + ) +}) diff --git a/e2e/react-start/streaming-ssr/vite.config.ts b/e2e/react-start/streaming-ssr/vite.config.ts index 0590c197a5..275bfacde2 100644 --- a/e2e/react-start/streaming-ssr/vite.config.ts +++ b/e2e/react-start/streaming-ssr/vite.config.ts @@ -1,10 +1,9 @@ import { defineConfig } from 'vite' import { tanstackStart } from '@tanstack/react-start/plugin/vite' -import viteReact from '@vitejs/plugin-react' export default defineConfig({ server: { port: 3000, }, - plugins: [tanstackStart(), viteReact()], + plugins: [tanstackStart()], }) diff --git a/e2e/react-start/transform-asset-urls/package.json b/e2e/react-start/transform-asset-urls/package.json index e0a5ffec59..95e39e459b 100644 --- a/e2e/react-start/transform-asset-urls/package.json +++ b/e2e/react-start/transform-asset-urls/package.json @@ -16,19 +16,19 @@ "manual:both:options": "TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=createTransform pnpm manual:both", "manual:both:options:transform": "TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=transform pnpm manual:both", "manual:both:options:createTransform": "TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=createTransform pnpm manual:both", - "test:e2e:string": "rm -rf dist; TRANSFORM_ASSETS_MODE=string playwright test --project=chromium", - "test:e2e:function": "rm -rf dist; TRANSFORM_ASSETS_MODE=function playwright test --project=chromium", - "test:e2e:options": "rm -rf dist; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=transform playwright test --project=chromium", - "test:e2e:options:transform": "rm -rf dist; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=transform playwright test --project=chromium", - "test:e2e:options:createTransform": "rm -rf dist; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=createTransform playwright test --project=chromium", - "test:e2e:options:transform:cache-true:warmup-true": "rm -rf dist; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=transform TRANSFORM_ASSETS_OPTIONS_CACHE=true TRANSFORM_ASSETS_OPTIONS_WARMUP=true playwright test --project=chromium", - "test:e2e:options:transform:cache-true:warmup-false": "rm -rf dist; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=transform TRANSFORM_ASSETS_OPTIONS_CACHE=true TRANSFORM_ASSETS_OPTIONS_WARMUP=false playwright test --project=chromium", - "test:e2e:options:transform:cache-false:warmup-true": "rm -rf dist; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=transform TRANSFORM_ASSETS_OPTIONS_CACHE=false TRANSFORM_ASSETS_OPTIONS_WARMUP=true playwright test --project=chromium", - "test:e2e:options:transform:cache-false:warmup-false": "rm -rf dist; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=transform TRANSFORM_ASSETS_OPTIONS_CACHE=false TRANSFORM_ASSETS_OPTIONS_WARMUP=false playwright test --project=chromium", - "test:e2e:options:createTransform:cache-true:warmup-true": "rm -rf dist; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=createTransform TRANSFORM_ASSETS_OPTIONS_CACHE=true TRANSFORM_ASSETS_OPTIONS_WARMUP=true playwright test --project=chromium", - "test:e2e:options:createTransform:cache-true:warmup-false": "rm -rf dist; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=createTransform TRANSFORM_ASSETS_OPTIONS_CACHE=true TRANSFORM_ASSETS_OPTIONS_WARMUP=false playwright test --project=chromium", - "test:e2e:options:createTransform:cache-false:warmup-true": "rm -rf dist; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=createTransform TRANSFORM_ASSETS_OPTIONS_CACHE=false TRANSFORM_ASSETS_OPTIONS_WARMUP=true playwright test --project=chromium", - "test:e2e:options:createTransform:cache-false:warmup-false": "rm -rf dist; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=createTransform TRANSFORM_ASSETS_OPTIONS_CACHE=false TRANSFORM_ASSETS_OPTIONS_WARMUP=false playwright test --project=chromium", + "test:e2e:string": "rm -rf dist; rm -rf port*.txt; TRANSFORM_ASSETS_MODE=string playwright test --project=chromium", + "test:e2e:function": "rm -rf dist; rm -rf port*.txt; TRANSFORM_ASSETS_MODE=function playwright test --project=chromium", + "test:e2e:options": "rm -rf dist; rm -rf port*.txt; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=transform playwright test --project=chromium", + "test:e2e:options:transform": "rm -rf dist; rm -rf port*.txt; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=transform playwright test --project=chromium", + "test:e2e:options:createTransform": "rm -rf dist; rm -rf port*.txt; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=createTransform playwright test --project=chromium", + "test:e2e:options:transform:cache-true:warmup-true": "rm -rf dist; rm -rf port*.txt; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=transform TRANSFORM_ASSETS_OPTIONS_CACHE=true TRANSFORM_ASSETS_OPTIONS_WARMUP=true playwright test --project=chromium", + "test:e2e:options:transform:cache-true:warmup-false": "rm -rf dist; rm -rf port*.txt; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=transform TRANSFORM_ASSETS_OPTIONS_CACHE=true TRANSFORM_ASSETS_OPTIONS_WARMUP=false playwright test --project=chromium", + "test:e2e:options:transform:cache-false:warmup-true": "rm -rf dist; rm -rf port*.txt; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=transform TRANSFORM_ASSETS_OPTIONS_CACHE=false TRANSFORM_ASSETS_OPTIONS_WARMUP=true playwright test --project=chromium", + "test:e2e:options:transform:cache-false:warmup-false": "rm -rf dist; rm -rf port*.txt; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=transform TRANSFORM_ASSETS_OPTIONS_CACHE=false TRANSFORM_ASSETS_OPTIONS_WARMUP=false playwright test --project=chromium", + "test:e2e:options:createTransform:cache-true:warmup-true": "rm -rf dist; rm -rf port*.txt; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=createTransform TRANSFORM_ASSETS_OPTIONS_CACHE=true TRANSFORM_ASSETS_OPTIONS_WARMUP=true playwright test --project=chromium", + "test:e2e:options:createTransform:cache-true:warmup-false": "rm -rf dist; rm -rf port*.txt; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=createTransform TRANSFORM_ASSETS_OPTIONS_CACHE=true TRANSFORM_ASSETS_OPTIONS_WARMUP=false playwright test --project=chromium", + "test:e2e:options:createTransform:cache-false:warmup-true": "rm -rf dist; rm -rf port*.txt; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=createTransform TRANSFORM_ASSETS_OPTIONS_CACHE=false TRANSFORM_ASSETS_OPTIONS_WARMUP=true playwright test --project=chromium", + "test:e2e:options:createTransform:cache-false:warmup-false": "rm -rf dist; rm -rf port*.txt; TRANSFORM_ASSETS_MODE=options TRANSFORM_ASSETS_OPTIONS_KIND=createTransform TRANSFORM_ASSETS_OPTIONS_CACHE=false TRANSFORM_ASSETS_OPTIONS_WARMUP=false playwright test --project=chromium", "test:e2e:options:matrix": "pnpm test:e2e:options:transform:cache-true:warmup-true && pnpm test:e2e:options:transform:cache-true:warmup-false && pnpm test:e2e:options:transform:cache-false:warmup-true && pnpm test:e2e:options:transform:cache-false:warmup-false && pnpm test:e2e:options:createTransform:cache-true:warmup-true && pnpm test:e2e:options:createTransform:cache-true:warmup-false && pnpm test:e2e:options:createTransform:cache-false:warmup-true && pnpm test:e2e:options:createTransform:cache-false:warmup-false", "test:e2e": "pnpm test:e2e:string && pnpm test:e2e:function && pnpm test:e2e:options:matrix" }, @@ -46,7 +46,7 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "srvx": "^1.0.0", + "srvx": "^0.11.9", "@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/playwright.config.ts b/e2e/react-start/transform-asset-urls/playwright.config.ts index 209a7e0596..bbef6838fe 100644 --- a/e2e/react-start/transform-asset-urls/playwright.config.ts +++ b/e2e/react-start/transform-asset-urls/playwright.config.ts @@ -1,10 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const APP_PORT = Number(process.env.E2E_APP_PORT ?? 0) -const CDN_PORT = Number(process.env.E2E_CDN_PORT ?? 0) +const APP_PORT = await getTestServerPort(packageJson.name) +const CDN_PORT = await getTestServerPort(`${packageJson.name}_cdn`) const baseURL = `http://localhost:${APP_PORT}` +const cdnOrigin = `http://localhost:${CDN_PORT}` const transformMode = process.env.TRANSFORM_ASSETS_MODE || 'string' const optionsKind = process.env.TRANSFORM_ASSETS_OPTIONS_KIND || 'createTransform' @@ -24,11 +26,8 @@ export default defineConfig({ { // CDN server — serves built client assets on a separate port with CORS command: `node tests/cdn-server.mjs`, - wait: { - stdout: - /CDN Server: (?http:\/\/localhost:(?\d+))/, - }, - reuseExistingServer: false, + url: `http://localhost:${CDN_PORT}/health`, + reuseExistingServer: !process.env.CI, stdout: 'pipe', env: { CDN_PORT: String(CDN_PORT), @@ -38,11 +37,12 @@ export default defineConfig({ // App server — builds the project then starts the srvx server // with CDN_ORIGIN so that transformAssets rewrites manifest URLs command: `pnpm build && pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', env: { PORT: String(APP_PORT), + CDN_ORIGIN: cdnOrigin, TRANSFORM_ASSETS_MODE: transformMode, TRANSFORM_ASSETS_OPTIONS_KIND: optionsKind, TRANSFORM_ASSETS_OPTIONS_CACHE: optionsCache, diff --git a/e2e/react-start/transform-asset-urls/src/server.ts b/e2e/react-start/transform-asset-urls/src/server.ts index a51f29ad66..241fc2fe51 100644 --- a/e2e/react-start/transform-asset-urls/src/server.ts +++ b/e2e/react-start/transform-asset-urls/src/server.ts @@ -83,18 +83,4 @@ const handler = createStartHandler( : defaultStreamHandler, ) -export default createServerEntry({ - fetch(request, options) { - const scriptUrl = request.headers.get('x-test-script-url') - if (scriptUrl) { - return createStartHandler({ - handler: defaultStreamHandler, - transformAssets: ({ kind, url }) => ({ - href: kind === 'script' ? scriptUrl : url, - }), - })(request, options) - } - - return handler(request, options) - }, -}) +export default createServerEntry({ fetch: handler }) diff --git a/e2e/react-start/transform-asset-urls/tests/cdn-server.mjs b/e2e/react-start/transform-asset-urls/tests/cdn-server.mjs index 280c626867..ea9bf62cd0 100644 --- a/e2e/react-start/transform-asset-urls/tests/cdn-server.mjs +++ b/e2e/react-start/transform-asset-urls/tests/cdn-server.mjs @@ -3,7 +3,7 @@ import path from 'node:path' import { fileURLToPath } from 'node:url' const __dirname = path.dirname(fileURLToPath(import.meta.url)) -const port = Number(process.env.CDN_PORT ?? 0) +const port = process.env.CDN_PORT || 3002 const app = express() @@ -36,7 +36,7 @@ app.use((req, res, next) => { app.use(express.static(path.resolve(__dirname, '..', 'dist', 'client'))) -const server = app.listen(port, (error) => { +app.listen(port, (error) => { if (error) throw error - console.info(`CDN Server: http://localhost:${server.address().port}`) + console.info(`CDN Server: http://localhost:${port}`) }) diff --git a/e2e/react-start/transform-asset-urls/tests/script-url-escaping.spec.ts b/e2e/react-start/transform-asset-urls/tests/script-url-escaping.spec.ts deleted file mode 100644 index 22251df671..0000000000 --- a/e2e/react-start/transform-asset-urls/tests/script-url-escaping.spec.ts +++ /dev/null @@ -1,46 +0,0 @@ -import { expect, test } from '@playwright/test' - -for (const [name, scriptUrl] of [ - [ - 'closing script tag', - '', endIndex) - const scriptCloseIndex = html.indexOf('', endIndex) - const bodyCloseIndex = html.indexOf('', scriptCloseIndex) - const htmlCloseIndex = html.indexOf('', bodyCloseIndex) - - expect(endIndex).toBeGreaterThan(-1) - expect(scriptOpenIndex).toBeGreaterThan(previousScriptCloseIndex) - expect(scriptCloseIndex).toBeGreaterThan(endIndex) - expect(payloadIndex).toBeGreaterThan(-1) - expect(payloadIndex).toBeLessThan(endIndex) - expect(html.slice(endIndex, scriptCloseIndex)).toContain(LATE_RECORD_CLOSE) - expect(scriptCloseIndex).toBeLessThan(bodyCloseIndex) - expect(bodyCloseIndex).toBeLessThan(htmlCloseIndex) -} - -async function verifyHydration( - page: Page, - { timeout = 10_000 }: { timeout?: number } = {}, -) { - const button = page.getByTestId('hydration-check-btn') - const status = page.getByTestId('hydration-status') - - await expect(button).toBeVisible() - await expect(async () => { - await button.click() - await expect(status).toHaveText('hydrated', { timeout: 100 }) - }).toPass({ timeout }) - - await expect(page.locator(STREAM_PART_SELECTOR)).toHaveCount(0) - await expect( - page.locator('script').filter({ hasText: STREAM_BOUNDARY_MARKER }), - ).toHaveCount(0) -} - -export { test } - -export const testWithHydration = test.extend({ - page: async ({ page }, use) => { - await use(page) - await verifyHydration(page) - }, -}) - -export { expect } diff --git a/e2e/streaming-ssr-fixtures/index.ts b/e2e/streaming-ssr-fixtures/index.ts deleted file mode 100644 index a70ef94459..0000000000 --- a/e2e/streaming-ssr-fixtures/index.ts +++ /dev/null @@ -1,381 +0,0 @@ -export type SourceMarker = 'server' | 'client' - -export type ServerData = { - name: string - timestamp: number - source: 'server' -} - -export type DeferredMessage = { - message: string - source: SourceMarker -} - -export type QueryType = 'sync' | 'fast-async' | 'slow-async' - -export type QueryData = { - type: QueryType - id: number - value: string - source: SourceMarker -} - -export const deferredDataMessage = 'Deferred data loaded!' -export const deferredDataDelay = 1000 -export const deferredServerDelay = 800 -export const deferredImmediateName = 'Fast User' -export const deferredSlowName = 'Slow User' -export const deferredErrorMessage = 'Error in deferred object' - -export const fastSerialStaticData = 'This is static data' -export const fastSerialSmallValue = 'small-data' - -export const syncOnlyMessage = 'Hello from sync loader!' -export const syncOnlyItems = ['item-1', 'item-2', 'item-3'] as const - -export const slowRenderDeferredMessage = 'Deferred resolved!' -export const slowRenderDeferredDelay = 50 -export const slowRenderQuickName = 'Quick data' -export const slowRenderComponents = [ - 'Slow component 1', - 'Slow component 2', - 'Slow component 3', -] as const - -export const nestedLevelDelays = [200, 400, 600] as const -export const nestedPlainDelay = 300 -export const nestedPlainMessage = 'Plain deferred resolved!' - -export const streamPromiseValue = 'promise-resolved' -export const streamPromiseDelay = 150 -export const streamChunkDelay = 200 -export const streamChunks = Array.from({ length: 5 }, (_, i) => `chunk-${i}`) - -export const routerHtmlPayloadChars = 17 * 1024 * 1024 -export const routerHtmlPayloadChar = 'x' -export const routerHtmlPayloadDelay = 100 - -export const manyPromiseItems = [ - { - key: 'immediate1', - testId: 'immediate-1', - label: 'Immediate 1', - value: 'immediate-1', - delayMs: 0, - }, - { - key: 'immediate2', - testId: 'immediate-2', - label: 'Immediate 2', - value: 'immediate-2', - delayMs: 10, - }, - { - key: 'immediate3', - testId: 'immediate-3', - label: 'Immediate 3', - value: 'immediate-3', - delayMs: 20, - }, - { - key: 'fast1', - testId: 'fast-1', - label: 'Fast 1', - value: 'fast-1', - delayMs: 50, - }, - { - key: 'fast2', - testId: 'fast-2', - label: 'Fast 2', - value: 'fast-2', - delayMs: 75, - }, - { - key: 'fast3', - testId: 'fast-3', - label: 'Fast 3', - value: 'fast-3', - delayMs: 100, - }, - { - key: 'fast4', - testId: 'fast-4', - label: 'Fast 4', - value: 'fast-4', - delayMs: 125, - }, - { - key: 'medium1', - testId: 'medium-1', - label: 'Medium 1', - value: 'medium-1', - delayMs: 150, - }, - { - key: 'medium2', - testId: 'medium-2', - label: 'Medium 2', - value: 'medium-2', - delayMs: 200, - }, - { - key: 'medium3', - testId: 'medium-3', - label: 'Medium 3', - value: 'medium-3', - delayMs: 250, - }, - { - key: 'slow1', - testId: 'slow-1', - label: 'Slow 1', - value: 'slow-1', - delayMs: 300, - }, - { - key: 'slow2', - testId: 'slow-2', - label: 'Slow 2', - value: 'slow-2', - delayMs: 400, - }, - { - key: 'slow3', - testId: 'slow-3', - label: 'Slow 3', - value: 'slow-3', - delayMs: 500, - }, - { - key: 'verySlow1', - testId: 'very-slow-1', - label: 'Very Slow 1', - value: 'very-slow-1', - delayMs: 600, - }, - { - key: 'verySlow2', - testId: 'very-slow-2', - label: 'Very Slow 2', - value: 'very-slow-2', - delayMs: 800, - }, -] as const - -export const concurrentBatchCount = 5 -export const concurrentBatchDelays = [100, 200, 300] as const - -export const queryHeavyItems = [ - { - type: 'sync', - id: 1, - value: 'sync-value-1', - delayMs: 0, - testId: 'sync-query-1', - fallback: 'Loading sync 1...', - }, - { - type: 'sync', - id: 2, - value: 'sync-value-2', - delayMs: 0, - testId: 'sync-query-2', - fallback: 'Loading sync 2...', - }, - { - type: 'sync', - id: 3, - value: 'sync-value-3', - delayMs: 0, - testId: 'sync-query-3', - fallback: 'Loading sync 3...', - }, - { - type: 'fast-async', - id: 1, - value: 'fast-async-1', - delayMs: 50, - testId: 'fast-async-query-1', - fallback: 'Loading fast 1...', - }, - { - type: 'fast-async', - id: 2, - value: 'fast-async-2', - delayMs: 75, - testId: 'fast-async-query-2', - fallback: 'Loading fast 2...', - }, - { - type: 'fast-async', - id: 3, - value: 'fast-async-3', - delayMs: 100, - testId: 'fast-async-query-3', - fallback: 'Loading fast 3...', - }, - { - type: 'slow-async', - id: 1, - value: 'slow-async-1', - delayMs: 200, - testId: 'slow-async-query-1', - fallback: 'Loading slow 1...', - }, - { - type: 'slow-async', - id: 2, - value: 'slow-async-2', - delayMs: 300, - testId: 'slow-async-query-2', - fallback: 'Loading slow 2...', - }, - { - type: 'slow-async', - id: 3, - value: 'slow-async-3', - delayMs: 400, - testId: 'slow-async-query-3', - fallback: 'Loading slow 3...', - }, -] as const - -export function sourceMarker(): SourceMarker { - return typeof window === 'undefined' ? 'server' : 'client' -} - -export function delay(ms: number): Promise { - return new Promise((resolve) => setTimeout(resolve, ms)) -} - -export function makeServerData(name: string): ServerData { - return { - name, - timestamp: Date.now(), - source: 'server', - } -} - -export function makeDeferred(value: T, delayMs: number): Promise { - return new Promise((resolve) => setTimeout(() => resolve(value), delayMs)) -} - -export function makeDeferredMessage( - message: string, - delayMs: number, -): Promise { - return makeDeferred({ message, source: sourceMarker() }, delayMs) -} - -export function makeFastSerialSmallData() { - return { - value: fastSerialSmallValue, - timestamp: Date.now(), - source: 'server' as const, - } -} - -export function makeSyncOnlyData() { - return { - message: syncOnlyMessage, - timestamp: Date.now(), - items: syncOnlyItems, - source: sourceMarker(), - } -} - -export function makeLevelData(level: number) { - return { level, timestamp: Date.now() } -} - -export function makeQueryData(item: { - type: QueryType - id: number - value: string -}): QueryData { - return { - type: item.type, - id: item.id, - value: item.value, - source: sourceMarker(), - } -} - -export function createManyPromises() { - return Object.fromEntries( - manyPromiseItems.map((item) => [ - item.key, - makeDeferred(item.value, item.delayMs), - ]), - ) as Record<(typeof manyPromiseItems)[number]['key'], Promise> -} - -export function createConcurrentPromises( - count: number, - delayMs: number, -): Array> { - const sharedPromise = delay(delayMs) - return Array.from({ length: count }, (_, i) => - sharedPromise.then(() => `concurrent-${i + 1}`), - ) -} - -export function createConcurrentLoaderData() { - const batch1 = createConcurrentPromises( - concurrentBatchCount, - concurrentBatchDelays[0], - ) - const batch2 = createConcurrentPromises( - concurrentBatchCount, - concurrentBatchDelays[1], - ) - const batch3 = createConcurrentPromises( - concurrentBatchCount, - concurrentBatchDelays[2], - ) - - return { - concurrent1_1: batch1[0], - concurrent1_2: batch1[1], - concurrent1_3: batch1[2], - concurrent1_4: batch1[3], - concurrent1_5: batch1[4], - concurrent2_1: batch2[0], - concurrent2_2: batch2[1], - concurrent2_3: batch2[2], - concurrent2_4: batch2[3], - concurrent2_5: batch2[4], - concurrent3_1: batch3[0], - concurrent3_2: batch3[1], - concurrent3_3: batch3[2], - concurrent3_4: batch3[3], - concurrent3_5: batch3[4], - } -} - -export function createStreamPromise(): Promise { - return makeDeferred(streamPromiseValue, streamPromiseDelay) -} - -export function createChunkStream(): ReadableStream { - return new ReadableStream({ - async start(controller) { - for (const chunk of streamChunks) { - await delay(streamChunkDelay) - controller.enqueue(chunk) - } - controller.close() - }, - }) -} - -export function createRouterHtmlPayload() { - return makeDeferred( - { - value: routerHtmlPayloadChar.repeat(routerHtmlPayloadChars), - source: sourceMarker(), - }, - routerHtmlPayloadDelay, - ) -} diff --git a/e2e/streaming-ssr-specs/client-navigation.ts b/e2e/streaming-ssr-specs/client-navigation.ts deleted file mode 100644 index 759f8e0282..0000000000 --- a/e2e/streaming-ssr-specs/client-navigation.ts +++ /dev/null @@ -1,372 +0,0 @@ -import { expect, test, testWithHydration } from '../streaming-ssr-assertions' - -test.describe('Client-side navigation between all routes', () => { - test.beforeEach(async ({ page }) => { - // Start from home page - await page.goto('/') - await page.waitForLoadState('networkidle') - }) - - test('home -> sync-only -> home works', async ({ page }) => { - // Navigate to sync-only - await page - .getByRole('navigation') - .getByRole('link', { name: 'Sync Only' }) - .click() - await expect(page).toHaveURL('/sync-only') - await expect(page.getByTestId('sync-message')).toBeVisible() - - // Navigate back to home - await page - .getByRole('navigation') - .getByRole('link', { name: 'Home' }) - .click() - await expect(page).toHaveURL('/') - await expect(page.getByTestId('index-title')).toBeVisible() - }) - - test('home -> deferred -> home works', async ({ page }) => { - // Navigate to deferred (use exact: true to avoid matching "Nested Deferred") - await page - .getByRole('navigation') - .getByRole('link', { name: 'Deferred', exact: true }) - .click() - await expect(page).toHaveURL('/deferred') - await expect(page.getByTestId('immediate-data')).toBeVisible() - - // Wait for deferred data - await expect(page.getByTestId('deferred-data')).toBeVisible({ - timeout: 5000, - }) - - // Navigate back to home - await page - .getByRole('navigation') - .getByRole('link', { name: 'Home' }) - .click() - await expect(page).toHaveURL('/') - }) - - test('home -> stream -> home works (no stream locking error)', async ({ - page, - }) => { - // This test specifically validates the ReadableStream locking fix - // Console errors are monitored by the fixture automatically - - // Navigate to stream - await page - .getByRole('navigation') - .getByRole('link', { name: 'Stream' }) - .click() - await expect(page).toHaveURL('/stream') - - // Wait for stream to start (at least one chunk or promise resolved) - await expect(page.getByTestId('promise-data')).toBeVisible({ - timeout: 5000, - }) - - // Navigate back without waiting for stream completion. - await page - .getByRole('navigation') - .getByRole('link', { name: 'Home' }) - .click() - await expect(page).toHaveURL('/') - }) - - test('home -> stream -> wait for completion -> home works', async ({ - page, - }) => { - // Navigate to stream - await page - .getByRole('navigation') - .getByRole('link', { name: 'Stream' }) - .click() - await expect(page).toHaveURL('/stream') - - // Wait for stream to complete - await expect(page.getByTestId('stream-complete')).toBeVisible({ - timeout: 10000, - }) - - // Navigate back to home - await page - .getByRole('navigation') - .getByRole('link', { name: 'Home' }) - .click() - await expect(page).toHaveURL('/') - await expect(page.getByTestId('index-title')).toBeVisible() - }) - - test('home -> stream -> home -> stream again works (fresh stream each time)', async ({ - page, - }) => { - // Console errors are monitored by the fixture automatically - - // First navigation to stream - await page - .getByRole('navigation') - .getByRole('link', { name: 'Stream' }) - .click() - await expect(page).toHaveURL('/stream') - await expect(page.getByTestId('promise-data')).toBeVisible({ - timeout: 5000, - }) - - // Navigate back to home - await page - .getByRole('navigation') - .getByRole('link', { name: 'Home' }) - .click() - await expect(page).toHaveURL('/') - - // Second navigation to stream - should get fresh stream without errors - await page - .getByRole('navigation') - .getByRole('link', { name: 'Stream' }) - .click() - await expect(page).toHaveURL('/stream') - - // Wait for stream to complete - await expect(page.getByTestId('stream-complete')).toBeVisible({ - timeout: 10000, - }) - - // Verify all chunks are present - await expect(page.getByTestId('stream-chunk-0')).toBeVisible() - await expect(page.getByTestId('stream-chunk-4')).toBeVisible() - }) - - test('home -> fast-serial -> home works', async ({ page }) => { - await page - .getByRole('navigation') - .getByRole('link', { name: 'Fast Serial' }) - .click() - await expect(page).toHaveURL('/fast-serial') - await expect(page.getByTestId('server-data')).toBeVisible() - - await page - .getByRole('navigation') - .getByRole('link', { name: 'Home' }) - .click() - await expect(page).toHaveURL('/') - }) - - test('home -> slow-render -> home works', async ({ page }) => { - await page - .getByRole('navigation') - .getByRole('link', { name: 'Slow Render' }) - .click() - await expect(page).toHaveURL('/slow-render') - await expect(page.getByTestId('quick-data')).toBeVisible() - - await page - .getByRole('navigation') - .getByRole('link', { name: 'Home' }) - .click() - await expect(page).toHaveURL('/') - }) - - test('home -> nested-deferred -> home works', async ({ page }) => { - await page - .getByRole('navigation') - .getByRole('link', { name: 'Nested Deferred' }) - .click() - await expect(page).toHaveURL('/nested-deferred') - - // Wait for all levels to load - await expect(page.getByTestId('level3-data')).toBeVisible({ timeout: 5000 }) - - await page - .getByRole('navigation') - .getByRole('link', { name: 'Home' }) - .click() - await expect(page).toHaveURL('/') - }) - - test('navigation without waiting for route data works', async ({ page }) => { - // Console errors are monitored by the fixture automatically - - // Change routes as soon as each URL updates, without waiting for route data. - await page - .getByRole('navigation') - .getByRole('link', { name: 'Sync Only' }) - .click() - await expect(page).toHaveURL('/sync-only') - - await page - .getByRole('navigation') - .getByRole('link', { name: 'Deferred', exact: true }) - .click() - await expect(page).toHaveURL('/deferred') - - await page - .getByRole('navigation') - .getByRole('link', { name: 'Stream' }) - .click() - await expect(page).toHaveURL('/stream') - - await page - .getByRole('navigation') - .getByRole('link', { name: 'Fast Serial' }) - .click() - await expect(page).toHaveURL('/fast-serial') - - await page - .getByRole('navigation') - .getByRole('link', { name: 'Slow Render' }) - .click() - await expect(page).toHaveURL('/slow-render') - - await page - .getByRole('navigation') - .getByRole('link', { name: 'Nested Deferred' }) - .click() - await expect(page).toHaveURL('/nested-deferred') - - await page - .getByRole('navigation') - .getByRole('link', { name: 'Home' }) - .click() - await expect(page).toHaveURL('/') - }) -}) - -test.describe('Direct navigation followed by client navigation', () => { - test('direct to stream -> client nav to deferred works', async ({ page }) => { - // Direct navigation to stream - await page.goto('/stream') - await expect(page.getByTestId('promise-data')).toBeVisible({ - timeout: 5000, - }) - - // Client navigation to deferred (use exact: true) - await page - .getByRole('navigation') - .getByRole('link', { name: 'Deferred', exact: true }) - .click() - await expect(page).toHaveURL('/deferred') - await expect(page.getByTestId('immediate-data')).toBeVisible() - }) - - test('direct to deferred -> client nav to stream works', async ({ page }) => { - // Console errors are monitored by the fixture automatically - - // Direct navigation to deferred - await page.goto('/deferred') - await expect(page.getByTestId('immediate-data')).toBeVisible() - - // Client navigation to stream - await page - .getByRole('navigation') - .getByRole('link', { name: 'Stream' }) - .click() - await expect(page).toHaveURL('/stream') - await expect(page.getByTestId('stream-complete')).toBeVisible({ - timeout: 10000, - }) - }) - - test('direct to sync-only -> client nav to all routes works', async ({ - page, - }) => { - await page.goto('/sync-only') - await expect(page.getByTestId('sync-message')).toBeVisible() - - // Navigate through all routes - await page - .getByRole('navigation') - .getByRole('link', { name: 'Deferred', exact: true }) - .click() - await expect(page).toHaveURL('/deferred') - - await page - .getByRole('navigation') - .getByRole('link', { name: 'Stream' }) - .click() - await expect(page).toHaveURL('/stream') - - await page - .getByRole('navigation') - .getByRole('link', { name: 'Fast Serial' }) - .click() - await expect(page).toHaveURL('/fast-serial') - - await page - .getByRole('navigation') - .getByRole('link', { name: 'Home' }) - .click() - await expect(page).toHaveURL('/') - }) -}) - -testWithHydration.describe('Hydration after client navigation', () => { - testWithHydration( - 'interactive elements work after navigating to deferred', - async ({ page }) => { - await page.goto('/') - await page.waitForLoadState('networkidle') - - await page - .getByRole('navigation') - .getByRole('link', { name: 'Deferred', exact: true }) - .click() - await expect(page).toHaveURL('/deferred') - - // Wait for the page to be fully loaded - await expect(page.getByTestId('immediate-data')).toBeVisible() - }, - ) - - testWithHydration( - 'interactive elements work after navigating to fast-serial', - async ({ page }) => { - await page.goto('/') - await page.waitForLoadState('networkidle') - - await page - .getByRole('navigation') - .getByRole('link', { name: 'Fast Serial' }) - .click() - await expect(page).toHaveURL('/fast-serial') - - // Wait for page to load - await expect(page.getByTestId('server-data')).toBeVisible() - }, - ) - - testWithHydration( - 'interactive elements work after navigating to nested-deferred', - async ({ page }) => { - await page.goto('/') - await page.waitForLoadState('networkidle') - - await page - .getByRole('navigation') - .getByRole('link', { name: 'Nested Deferred' }) - .click() - await expect(page).toHaveURL('/nested-deferred') - - // Wait for page to load - await expect(page.getByTestId('plain-deferred')).toBeVisible({ - timeout: 5000, - }) - }, - ) - - testWithHydration( - 'interactive elements work after navigating to slow-render', - async ({ page }) => { - await page.goto('/') - await page.waitForLoadState('networkidle') - - await page - .getByRole('navigation') - .getByRole('link', { name: 'Slow Render' }) - .click() - await expect(page).toHaveURL('/slow-render') - - // Wait for page to load (slow-render has blocking loops) - await expect(page.getByTestId('quick-data')).toBeVisible() - }, - ) -}) diff --git a/e2e/streaming-ssr-specs/concurrent.ts b/e2e/streaming-ssr-specs/concurrent.ts deleted file mode 100644 index ef14f80367..0000000000 --- a/e2e/streaming-ssr-specs/concurrent.ts +++ /dev/null @@ -1,86 +0,0 @@ -import { expect, test, testWithHydration } from '../streaming-ssr-assertions' - -test.describe('Concurrent promise resolution (15 promises in 3 batches)', () => { - test('all concurrent promises resolve correctly', async ({ page }) => { - await page.goto('/concurrent') - - // Batch 1 (5 promises at 100ms) - await expect(page.getByTestId('concurrent-1-1')).toContainText( - 'concurrent-1', - { timeout: 5000 }, - ) - await expect(page.getByTestId('concurrent-1-2')).toContainText( - 'concurrent-2', - { timeout: 5000 }, - ) - await expect(page.getByTestId('concurrent-1-3')).toContainText( - 'concurrent-3', - { timeout: 5000 }, - ) - await expect(page.getByTestId('concurrent-1-4')).toContainText( - 'concurrent-4', - { timeout: 5000 }, - ) - await expect(page.getByTestId('concurrent-1-5')).toContainText( - 'concurrent-5', - { timeout: 5000 }, - ) - - // Batch 2 (5 promises at 200ms) - await expect(page.getByTestId('concurrent-2-1')).toContainText( - 'concurrent-1', - { timeout: 5000 }, - ) - await expect(page.getByTestId('concurrent-2-2')).toContainText( - 'concurrent-2', - { timeout: 5000 }, - ) - await expect(page.getByTestId('concurrent-2-3')).toContainText( - 'concurrent-3', - { timeout: 5000 }, - ) - await expect(page.getByTestId('concurrent-2-4')).toContainText( - 'concurrent-4', - { timeout: 5000 }, - ) - await expect(page.getByTestId('concurrent-2-5')).toContainText( - 'concurrent-5', - { timeout: 5000 }, - ) - - // Batch 3 (5 promises at 300ms) - await expect(page.getByTestId('concurrent-3-1')).toContainText( - 'concurrent-1', - { timeout: 5000 }, - ) - await expect(page.getByTestId('concurrent-3-2')).toContainText( - 'concurrent-2', - { timeout: 5000 }, - ) - await expect(page.getByTestId('concurrent-3-3')).toContainText( - 'concurrent-3', - { timeout: 5000 }, - ) - await expect(page.getByTestId('concurrent-3-4')).toContainText( - 'concurrent-4', - { timeout: 5000 }, - ) - await expect(page.getByTestId('concurrent-3-5')).toContainText( - 'concurrent-5', - { timeout: 5000 }, - ) - }) - - testWithHydration( - 'hydration works with concurrent resolutions', - async ({ page }) => { - await page.goto('/concurrent') - await page.waitForLoadState('networkidle') - - // Wait for all batches - await expect(page.getByTestId('concurrent-3-5')).toBeVisible({ - timeout: 5000, - }) - }, - ) -}) diff --git a/e2e/streaming-ssr-specs/deferred-rejection.ts b/e2e/streaming-ssr-specs/deferred-rejection.ts deleted file mode 100644 index 3e944b1c0c..0000000000 --- a/e2e/streaming-ssr-specs/deferred-rejection.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { expect, test } from '../streaming-ssr-assertions' - -test.use({ - whitelistErrors: ['Error in deferred object'], -}) - -test('rejected deferred Await renders the route error boundary without killing SSR', async ({ - page, -}) => { - await page.goto('/deferred-rejection') - - await expect(page.getByTestId('deferred-error-boundary')).toContainText( - 'Error in deferred object', - { timeout: 5000 }, - ) - - await page.goto('/sync-only') - await expect(page.getByTestId('sync-message')).toContainText( - 'Hello from sync loader!', - ) -}) diff --git a/e2e/streaming-ssr-specs/deferred.ts b/e2e/streaming-ssr-specs/deferred.ts deleted file mode 100644 index abece0b43e..0000000000 --- a/e2e/streaming-ssr-specs/deferred.ts +++ /dev/null @@ -1,113 +0,0 @@ -import { - expect, - expectDeferredRouteResponseOrder, - test, - testWithHydration, -} from '../streaming-ssr-assertions' - -test.describe('Deferred data streaming', () => { - test('finishes the router stream after renderer output', async ({ - baseURL, - }) => { - await expectDeferredRouteResponseOrder(baseURL) - }) - - test('renders immediate and deferred server data', async ({ page }) => { - await page.goto('/deferred') - - // Immediate loader data is rendered. - await expect(page.getByTestId('immediate-data')).toBeVisible() - await expect(page.getByTestId('immediate-data')).toContainText( - 'Immediate: Fast User', - ) - - // Verify immediate data came from server - await expect(page.getByTestId('immediate-source')).toContainText( - 'Immediate source: server', - ) - await expect(page.getByTestId('loader-source')).toContainText( - 'Loader source: server', - ) - - // Deferred data should eventually appear with server source - await expect(page.getByTestId('deferred-data')).toContainText( - 'Deferred data loaded!', - { timeout: 5000 }, - ) - await expect(page.getByTestId('deferred-data')).toContainText( - 'source: server', - { timeout: 5000 }, - ) - await expect(page.getByTestId('deferred-server-data')).toContainText( - 'Server: Slow User', - { timeout: 5000 }, - ) - await expect(page.getByTestId('deferred-server-data')).toContainText( - 'source: server', - { timeout: 5000 }, - ) - }) - - testWithHydration( - 'hydration works - interactive elements respond', - async ({ page }) => { - await page.goto('/deferred') - await page.waitForLoadState('networkidle') - - // Wait for all deferred content to load - await expect(page.getByTestId('deferred-data')).toBeVisible({ - timeout: 5000, - }) - - // Verify all data came from server after hydration - await expect(page.getByTestId('loader-source')).toContainText( - 'Loader source: server', - ) - await expect(page.getByTestId('deferred-data')).toContainText( - 'source: server', - ) - }, - ) - - test('client-side navigation to deferred route works', async ({ page }) => { - await page.goto('/') - await page.waitForLoadState('networkidle') - - // Navigate via client-side routing using nav link - await page.getByRole('link', { name: 'Deferred' }).first().click() - await expect(page).toHaveURL('/deferred') - - // Data should load - await expect(page.getByTestId('immediate-data')).toContainText('Fast User') - await expect(page.getByTestId('deferred-data')).toContainText( - 'Deferred data loaded!', - { timeout: 5000 }, - ) - }) - - test('all data sources are server', async ({ page }) => { - await page.goto('/deferred') - - // Wait for all deferred content - await expect(page.getByTestId('deferred-data')).toBeVisible({ - timeout: 5000, - }) - await expect(page.getByTestId('deferred-server-data')).toBeVisible({ - timeout: 5000, - }) - - // Count all elements showing 'server' source - should be 4: - // 1. immediate-source - // 2. loader-source - // 3. deferred-data (contains "source: server") - // 4. deferred-server-data (contains "source: server") - await expect(page.getByTestId('immediate-source')).toContainText('server') - await expect(page.getByTestId('loader-source')).toContainText('server') - await expect(page.getByTestId('deferred-data')).toContainText( - 'source: server', - ) - await expect(page.getByTestId('deferred-server-data')).toContainText( - 'source: server', - ) - }) -}) diff --git a/e2e/streaming-ssr-specs/fast-serial.ts b/e2e/streaming-ssr-specs/fast-serial.ts deleted file mode 100644 index 03201f0a55..0000000000 --- a/e2e/streaming-ssr-specs/fast-serial.ts +++ /dev/null @@ -1,74 +0,0 @@ -import { - expect, - expectRouterHydrationMarkers, - test, - testWithHydration, -} from '../streaming-ssr-assertions' - -test.describe('Fast serialization (serialization completes before render)', () => { - test('initial HTML contains router bootstrap + barrier', async ({ page }) => { - let responseHtml = '' - await page.route('/fast-serial', async (route) => { - const response = await route.fetch() - responseHtml = await response.text() - await route.fulfill({ response }) - }) - - await page.goto('/fast-serial') - await expect(page.getByTestId('server-data')).toBeVisible() - - expectRouterHydrationMarkers(responseHtml) - }) - - test('renders all server data', async ({ page }) => { - await page.goto('/fast-serial') - await page.waitForLoadState('networkidle') - - // All data should be visible - await expect(page.getByTestId('server-data')).toContainText('small-data') - await expect(page.getByTestId('static-data')).toContainText( - 'This is static data', - ) - await expect(page.getByTestId('loader-timestamp')).toBeVisible() - - // Verify the loader and server function ran during SSR. - await expect(page.getByTestId('loader-source')).toContainText( - 'Loader source: server', - ) - await expect(page.getByTestId('server-fn-source')).toContainText( - 'Server function source: server', - ) - }) - - testWithHydration('hydration works correctly', async ({ page }) => { - await page.goto('/fast-serial') - await page.waitForLoadState('networkidle') - - // Verify data came from server after hydration - await expect(page.getByTestId('loader-source')).toContainText( - 'Loader source: server', - ) - }) - - test('direct navigation renders correctly', async ({ page }) => { - // Direct navigation (SSR) - await page.goto('/fast-serial') - - // Should render without errors and show server source - await expect(page.getByTestId('server-data')).toBeVisible() - await expect(page.getByTestId('loader-source')).toContainText( - 'Loader source: server', - ) - }) - - test('client-side navigation works', async ({ page }) => { - await page.goto('/') - await page.waitForLoadState('networkidle') - - // Navigate via nav link - await page.getByRole('link', { name: 'Fast Serial' }).first().click() - await expect(page).toHaveURL('/fast-serial') - - await expect(page.getByTestId('server-data')).toContainText('small-data') - }) -}) diff --git a/e2e/streaming-ssr-specs/home.ts b/e2e/streaming-ssr-specs/home.ts deleted file mode 100644 index d85e19bfa7..0000000000 --- a/e2e/streaming-ssr-specs/home.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { expect, test, testWithHydration } from '../streaming-ssr-assertions' - -test.describe('Home page', () => { - testWithHydration( - 'renders index page with all navigation links', - async ({ page }) => { - await page.goto('/') - await page.waitForLoadState('networkidle') - - await expect(page.getByTestId('index-title')).toContainText( - 'Streaming SSR Test Scenarios', - ) - // Check links exist (they're in the nav and the body) - await expect( - page.getByRole('link', { name: 'Deferred' }).first(), - ).toBeVisible() - await expect( - page.getByRole('link', { name: 'Stream' }).first(), - ).toBeVisible() - }, - ) - - testWithHydration( - 'navigation from home to routes works', - async ({ page }) => { - await page.goto('/') - await page.waitForLoadState('networkidle') - - // Use the link in the content (not nav) - await page.getByTestId('link-deferred').click() - await expect(page).toHaveURL('/deferred') - }, - ) -}) diff --git a/e2e/streaming-ssr-specs/many-promises.ts b/e2e/streaming-ssr-specs/many-promises.ts deleted file mode 100644 index 768859c7e4..0000000000 --- a/e2e/streaming-ssr-specs/many-promises.ts +++ /dev/null @@ -1,82 +0,0 @@ -import { expect, test, testWithHydration } from '../streaming-ssr-assertions' - -test.describe('Many promises streaming (15 deferred)', () => { - test('all 15 promises eventually resolve', async ({ page }) => { - await page.goto('/many-promises') - - // Immediate group (0-20ms) - await expect(page.getByTestId('immediate-1')).toContainText('immediate-1', { - timeout: 5000, - }) - await expect(page.getByTestId('immediate-2')).toContainText('immediate-2', { - timeout: 5000, - }) - await expect(page.getByTestId('immediate-3')).toContainText('immediate-3', { - timeout: 5000, - }) - - // Fast group (50-125ms) - await expect(page.getByTestId('fast-1')).toContainText('fast-1', { - timeout: 5000, - }) - await expect(page.getByTestId('fast-2')).toContainText('fast-2', { - timeout: 5000, - }) - await expect(page.getByTestId('fast-3')).toContainText('fast-3', { - timeout: 5000, - }) - await expect(page.getByTestId('fast-4')).toContainText('fast-4', { - timeout: 5000, - }) - - // Medium group (150-250ms) - await expect(page.getByTestId('medium-1')).toContainText('medium-1', { - timeout: 5000, - }) - await expect(page.getByTestId('medium-2')).toContainText('medium-2', { - timeout: 5000, - }) - await expect(page.getByTestId('medium-3')).toContainText('medium-3', { - timeout: 5000, - }) - - // Slow group (300-500ms) - await expect(page.getByTestId('slow-1')).toContainText('slow-1', { - timeout: 5000, - }) - await expect(page.getByTestId('slow-2')).toContainText('slow-2', { - timeout: 5000, - }) - await expect(page.getByTestId('slow-3')).toContainText('slow-3', { - timeout: 5000, - }) - - // Very slow group (600-800ms) - await expect(page.getByTestId('very-slow-1')).toContainText('very-slow-1', { - timeout: 5000, - }) - await expect(page.getByTestId('very-slow-2')).toContainText('very-slow-2', { - timeout: 5000, - }) - }) - - testWithHydration('hydration works with many promises', async ({ page }) => { - await page.goto('/many-promises') - await page.waitForLoadState('networkidle') - - // Wait for all promises to resolve - await expect(page.getByTestId('very-slow-2')).toBeVisible({ timeout: 5000 }) - }) - - test('client-side navigation works', async ({ page }) => { - await page.goto('/') - await page.waitForLoadState('networkidle') - - // Navigate via nav link - await page.getByRole('link', { name: 'Many Promises' }).click() - await expect(page).toHaveURL('/many-promises') - - // All promises should eventually resolve - await expect(page.getByTestId('very-slow-2')).toBeVisible({ timeout: 5000 }) - }) -}) diff --git a/e2e/streaming-ssr-specs/nested-deferred.ts b/e2e/streaming-ssr-specs/nested-deferred.ts deleted file mode 100644 index 0146a23162..0000000000 --- a/e2e/streaming-ssr-specs/nested-deferred.ts +++ /dev/null @@ -1,52 +0,0 @@ -import { expect, test, testWithHydration } from '../streaming-ssr-assertions' - -test.describe('Nested deferred (multiple levels of deferred data)', () => { - test('all levels of deferred data eventually resolve', async ({ page }) => { - await page.goto('/nested-deferred') - - // All deferred values should eventually resolve. - await expect(page.getByTestId('plain-deferred')).toContainText( - 'Plain deferred resolved!', - { timeout: 5000 }, - ) - - await expect(page.getByTestId('level1-data')).toContainText('Level 1:', { - timeout: 5000, - }) - - await expect(page.getByTestId('level2-data')).toContainText('Level 2:', { - timeout: 5000, - }) - - await expect(page.getByTestId('level3-data')).toContainText('Level 3:', { - timeout: 5000, - }) - }) - - testWithHydration( - 'hydration works with nested deferred', - async ({ page }) => { - await page.goto('/nested-deferred') - await page.waitForLoadState('networkidle') - - // Wait for all data - await expect(page.getByTestId('level3-data')).toBeVisible({ - timeout: 10000, - }) - }, - ) - - test('client-side navigation works', async ({ page }) => { - await page.goto('/') - await page.waitForLoadState('networkidle') - - // Navigate via nav link - await page.getByRole('link', { name: 'Nested Deferred' }).first().click() - await expect(page).toHaveURL('/nested-deferred') - - // All levels should eventually render - await expect(page.getByTestId('level3-data')).toBeVisible({ - timeout: 10000, - }) - }) -}) diff --git a/e2e/streaming-ssr-specs/preview-streaming.ts b/e2e/streaming-ssr-specs/preview-streaming.ts deleted file mode 100644 index 5087dff730..0000000000 --- a/e2e/streaming-ssr-specs/preview-streaming.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { - expectDeferredRouteResponseOrder, - test, -} from '../streaming-ssr-assertions' - -test.skip( - process.env.MODE !== 'preview', - 'Only runs against vite preview: pnpm test:e2e:preview', -) - -test('vite preview preserves deferred HTML order', async ({ baseURL }) => { - await expectDeferredRouteResponseOrder(baseURL) -}) diff --git a/e2e/streaming-ssr-specs/query-heavy.ts b/e2e/streaming-ssr-specs/query-heavy.ts deleted file mode 100644 index b33a64f366..0000000000 --- a/e2e/streaming-ssr-specs/query-heavy.ts +++ /dev/null @@ -1,142 +0,0 @@ -import { - expect, - expectQueryHeavyRouteStreamOrder, - test, - testWithHydration, -} from '../streaming-ssr-assertions' - -test.describe('Query heavy route (9 queries)', () => { - test('emits the complete router stream before document closes', async ({ - baseURL, - }) => { - await expectQueryHeavyRouteStreamOrder(baseURL) - }) - - test('all queries resolve with server data', async ({ page }) => { - await page.goto('/query-heavy') - - // Sync queries should show server source - await expect(page.getByTestId('sync-query-1')).toContainText( - 'source: server', - { timeout: 5000 }, - ) - await expect(page.getByTestId('sync-query-2')).toContainText( - 'source: server', - { timeout: 5000 }, - ) - await expect(page.getByTestId('sync-query-3')).toContainText( - 'source: server', - { timeout: 5000 }, - ) - - // Fast async queries should show server source - await expect(page.getByTestId('fast-async-query-1')).toContainText( - 'source: server', - { timeout: 5000 }, - ) - await expect(page.getByTestId('fast-async-query-2')).toContainText( - 'source: server', - { timeout: 5000 }, - ) - await expect(page.getByTestId('fast-async-query-3')).toContainText( - 'source: server', - { timeout: 5000 }, - ) - - // Slow async queries should show server source - await expect(page.getByTestId('slow-async-query-1')).toContainText( - 'source: server', - { timeout: 5000 }, - ) - await expect(page.getByTestId('slow-async-query-2')).toContainText( - 'source: server', - { timeout: 5000 }, - ) - await expect(page.getByTestId('slow-async-query-3')).toContainText( - 'source: server', - { timeout: 5000 }, - ) - }) - - test('sync queries have correct values', async ({ page }) => { - await page.goto('/query-heavy') - - await expect(page.getByTestId('sync-query-1')).toContainText('sync-value-1') - await expect(page.getByTestId('sync-query-2')).toContainText('sync-value-2') - await expect(page.getByTestId('sync-query-3')).toContainText('sync-value-3') - }) - - test('async queries have correct values', async ({ page }) => { - await page.goto('/query-heavy') - - await expect(page.getByTestId('fast-async-query-1')).toContainText( - 'fast-async-1', - { timeout: 5000 }, - ) - await expect(page.getByTestId('fast-async-query-2')).toContainText( - 'fast-async-2', - { timeout: 5000 }, - ) - await expect(page.getByTestId('fast-async-query-3')).toContainText( - 'fast-async-3', - { timeout: 5000 }, - ) - - await expect(page.getByTestId('slow-async-query-1')).toContainText( - 'slow-async-1', - { timeout: 5000 }, - ) - await expect(page.getByTestId('slow-async-query-2')).toContainText( - 'slow-async-2', - { timeout: 5000 }, - ) - await expect(page.getByTestId('slow-async-query-3')).toContainText( - 'slow-async-3', - { timeout: 5000 }, - ) - }) - - testWithHydration('hydration works with many queries', async ({ page }) => { - await page.goto('/query-heavy') - await page.waitForLoadState('networkidle') - - // Wait for all queries to resolve - await expect(page.getByTestId('slow-async-query-3')).toBeVisible({ - timeout: 5000, - }) - }) - - test('client-side navigation works', async ({ page }) => { - await page.goto('/') - await page.waitForLoadState('networkidle') - - // Navigate via nav link - await page.getByRole('link', { name: 'Query Heavy' }).click() - await expect(page).toHaveURL('/query-heavy') - - // All queries should eventually resolve (on client) - await expect(page.getByTestId('slow-async-query-3')).toBeVisible({ - timeout: 5000, - }) - }) - - test('server query data hydrates without client refetch', async ({ - page, - }) => { - // If hydration missed the server data, these queries would re-execute on - // the client and show "client" as their source. - await page.goto('/query-heavy') - - // Wait for all queries - await expect(page.getByTestId('slow-async-query-3')).toBeVisible({ - timeout: 5000, - }) - - // Verify that all server results hydrated without a client refetch. - const serverSourceCount = await page - .locator('[data-testid*="query-"]') - .filter({ hasText: 'source: server' }) - .count() - expect(serverSourceCount).toBe(9) - }) -}) diff --git a/e2e/streaming-ssr-specs/slow-render.ts b/e2e/streaming-ssr-specs/slow-render.ts deleted file mode 100644 index 117559701e..0000000000 --- a/e2e/streaming-ssr-specs/slow-render.ts +++ /dev/null @@ -1,71 +0,0 @@ -import { expect, test, testWithHydration } from '../streaming-ssr-assertions' - -test.describe('Slow render (render takes longer than serialization)', () => { - test('all data eventually renders with server source', async ({ page }) => { - await page.goto('/slow-render') - await page.waitForLoadState('networkidle') - - // Quick data should be available with server source - await expect(page.getByTestId('quick-data')).toContainText('Quick:') - await expect(page.getByTestId('quick-source')).toContainText( - 'Quick data source: server', - ) - await expect(page.getByTestId('loader-source')).toContainText( - 'Loader source: server', - ) - - // Deferred data should resolve with server source - await expect(page.getByTestId('deferred-resolved')).toContainText( - 'Deferred resolved!', - { timeout: 5000 }, - ) - await expect(page.getByTestId('deferred-resolved')).toContainText( - 'source: server', - { timeout: 5000 }, - ) - - // Slow components should have rendered - await expect(page.getByTestId('slow-component-1')).toBeVisible() - await expect(page.getByTestId('slow-component-2')).toBeVisible() - await expect(page.getByTestId('slow-component-3')).toBeVisible() - }) - - testWithHydration('hydration works after slow render', async ({ page }) => { - await page.goto('/slow-render') - await page.waitForLoadState('networkidle') - - // Wait for content and verify server source - await expect(page.getByTestId('slow-component-1')).toBeVisible() - await expect(page.getByTestId('loader-source')).toContainText( - 'Loader source: server', - ) - }) - - test('client-side navigation works', async ({ page }) => { - await page.goto('/') - await page.waitForLoadState('networkidle') - - // Navigate via nav link - await page.getByRole('link', { name: 'Slow Render' }).first().click() - await expect(page).toHaveURL('/slow-render') - - await expect(page.getByTestId('quick-data')).toBeVisible({ timeout: 10000 }) - }) - - test('all data sources are server', async ({ page }) => { - await page.goto('/slow-render') - await page.waitForLoadState('networkidle') - - // Wait for deferred content - await expect(page.getByTestId('deferred-resolved')).toBeVisible({ - timeout: 5000, - }) - - // Verify all sources are server - await expect(page.getByTestId('quick-source')).toContainText('server') - await expect(page.getByTestId('loader-source')).toContainText('server') - await expect(page.getByTestId('deferred-resolved')).toContainText( - 'source: server', - ) - }) -}) diff --git a/e2e/streaming-ssr-specs/stream.ts b/e2e/streaming-ssr-specs/stream.ts deleted file mode 100644 index ee61f170de..0000000000 --- a/e2e/streaming-ssr-specs/stream.ts +++ /dev/null @@ -1,55 +0,0 @@ -import { expect, test, testWithHydration } from '../streaming-ssr-assertions' - -const expectedStreamChunks = [ - 'chunk-0', - 'chunk-1', - 'chunk-2', - 'chunk-3', - 'chunk-4', -] - -test.describe('ReadableStream deserialization', () => { - testWithHydration('promise data deserializes correctly', async ({ page }) => { - await page.goto('/stream') - - await expect(page.getByTestId('promise-data')).toContainText( - 'promise-resolved', - { timeout: 5000 }, - ) - }) - - testWithHydration( - 'stream chunks deserialize in source order', - async ({ page }) => { - await page.goto('/stream') - - await expect(page.getByTestId('stream-complete')).toBeVisible({ - timeout: 10000, - }) - - const chunks = page - .getByTestId('stream-data') - .locator('[data-testid^="stream-chunk-"]') - await expect(chunks).toHaveText(expectedStreamChunks) - - // This browser assertion covers deserialization and source order. The - // raw `/deferred` assertion covers server-response and router ordering. - }, - ) - - testWithHydration( - 'client-side navigation to stream route works', - async ({ page }) => { - await page.goto('/') - await page.waitForLoadState('networkidle') - - // Navigate via nav link - await page.getByRole('link', { name: 'Stream' }).first().click() - await expect(page).toHaveURL('/stream') - - await expect(page.getByTestId('stream-complete')).toBeVisible({ - timeout: 10000, - }) - }, - ) -}) diff --git a/e2e/streaming-ssr-specs/sync-only.ts b/e2e/streaming-ssr-specs/sync-only.ts deleted file mode 100644 index 9850265109..0000000000 --- a/e2e/streaming-ssr-specs/sync-only.ts +++ /dev/null @@ -1,80 +0,0 @@ -import { - expect, - expectRouterHydrationMarkers, - test, - testWithHydration, -} from '../streaming-ssr-assertions' - -/** - * Tests for synchronous serialization - no deferred data, no streaming. - * This is the most common case where all loader data is immediately available. - * The hydration scripts should be included in the initial HTML response. - */ - -test('Sync-only route renders with loader data', async ({ page }) => { - await page.goto('/sync-only') - - // Verify the page content is rendered - await expect(page.getByTestId('sync-title')).toContainText( - 'Synchronous Serialization Test', - ) - await expect(page.getByTestId('sync-message')).toContainText( - 'Hello from sync loader!', - ) - - // Verify loader data items are rendered - await expect(page.getByTestId('sync-item-item-1')).toBeVisible() - await expect(page.getByTestId('sync-item-item-2')).toBeVisible() - await expect(page.getByTestId('sync-item-item-3')).toBeVisible() - - // Verify the loader ran during SSR. - await expect(page.getByTestId('sync-source')).toContainText('Source: server') -}) - -testWithHydration('Sync-only route hydrates correctly', async ({ page }) => { - await page.goto('/sync-only') - - // Verify client-side navigation works (proves hydration succeeded) - await page.getByRole('navigation').getByRole('link', { name: 'Home' }).click() - await expect(page.getByTestId('index-title')).toBeVisible() - - // Navigate back to sync-only via client-side navigation (use nav link to be specific) - await page - .getByRole('navigation') - .getByRole('link', { name: 'Sync Only' }) - .click() - await expect(page.getByTestId('sync-title')).toBeVisible() -}) - -test('Sync-only route has bootstrap scripts in initial HTML', async ({ - page, -}) => { - // Intercept the response to check the raw HTML - let responseHtml = '' - await page.route('/sync-only', async (route) => { - const response = await route.fetch() - responseHtml = await response.text() - await route.fulfill({ response }) - }) - - await page.goto('/sync-only') - - // Wait for page to load - await expect(page.getByTestId('sync-title')).toBeVisible() - - // Bootstrap, end record, and the boundary rendered by . - expectRouterHydrationMarkers(responseHtml) -}) - -test('Navigating to sync-only from home page', async ({ page }) => { - await page.goto('/') - - await page.getByTestId('link-sync-only').click() - - await expect(page.getByTestId('sync-title')).toContainText( - 'Synchronous Serialization Test', - ) - await expect(page.getByTestId('sync-message')).toContainText( - 'Hello from sync loader!', - ) -}) diff --git a/e2e/vue-router/basepath-file-based/package.json b/e2e/vue-router/basepath-file-based/package.json index 3af9176e83..f39c09dda9 100644 --- a/e2e/vue-router/basepath-file-based/package.json +++ b/e2e/vue-router/basepath-file-based/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/vue-router/basepath-file-based/playwright.config.ts b/e2e/vue-router/basepath-file-based/playwright.config.ts index 4eead86444..6069bbe59f 100644 --- a/e2e/vue-router/basepath-file-based/playwright.config.ts +++ b/e2e/vue-router/basepath-file-based/playwright.config.ts @@ -1,7 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -12,15 +17,18 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `pnpm build && pnpm preview --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/vue-router/basepath-file-based/tests/setup/global.setup.ts b/e2e/vue-router/basepath-file-based/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/vue-router/basepath-file-based/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/vue-router/basepath-file-based/tests/setup/global.teardown.ts b/e2e/vue-router/basepath-file-based/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/vue-router/basepath-file-based/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/vue-router/basic-esbuild-file-based/package.json b/e2e/vue-router/basic-esbuild-file-based/package.json index a51cf9149c..7eec606557 100644 --- a/e2e/vue-router/basic-esbuild-file-based/package.json +++ b/e2e/vue-router/basic-esbuild-file-based/package.json @@ -7,7 +7,7 @@ "build": "node src/esbuild.run.js build && vue-tsc --noEmit", "preview": "node src/esbuild.run.js preview", "start": "pnpm dev", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/router-plugin": "workspace:^", diff --git a/e2e/vue-router/basic-esbuild-file-based/playwright.config.ts b/e2e/vue-router/basic-esbuild-file-based/playwright.config.ts index 9d9c8d49a3..836ea41bd8 100644 --- a/e2e/vue-router/basic-esbuild-file-based/playwright.config.ts +++ b/e2e/vue-router/basic-esbuild-file-based/playwright.config.ts @@ -1,7 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -12,15 +17,18 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, 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 16f6fbca44..c4aba8798e 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,6 +9,7 @@ export default { }), tanstackRouter({ target: 'vue', + autoCodeSplitting: true, }), ], } diff --git a/e2e/vue-router/basic-esbuild-file-based/src/esbuild.run.js b/e2e/vue-router/basic-esbuild-file-based/src/esbuild.run.js index 0ab294f2bf..19e882c1a9 100644 --- a/e2e/vue-router/basic-esbuild-file-based/src/esbuild.run.js +++ b/e2e/vue-router/basic-esbuild-file-based/src/esbuild.run.js @@ -1,7 +1,8 @@ -import http from 'node:http' -import { createReadStream, promises as fs } from 'node:fs' -import path from 'node:path' import * as esbuild from 'esbuild' +import http from 'node:http' +import { createReadStream } from 'node:fs' +import { promises as fs } from 'node:fs' +import path from 'node:path' import esbuildConfig from './esbuild.config.js' const args = process.argv.slice(2) @@ -17,7 +18,7 @@ function getPort() { const fromArg = getArgValue('--port') const fromEnv = process.env.VITE_SERVER_PORT const port = Number(fromArg ?? fromEnv ?? 5601) - if (!Number.isFinite(port) || port < 0) { + if (!Number.isFinite(port) || port <= 0) { throw new Error(`Invalid port: ${String(fromArg ?? fromEnv)}`) } return port @@ -137,7 +138,7 @@ function startStaticServer({ port }) { return new Promise((resolve) => { server.listen(port, () => { - console.log(`E2E app: http://localhost:${server.address().port}`) + console.log(`http://localhost:${port}`) resolve(server) }) }) diff --git a/e2e/vue-router/basic-esbuild-file-based/src/routes/(another-group)/onlyrouteinside.tsx b/e2e/vue-router/basic-esbuild-file-based/src/routes/(another-group)/onlyrouteinside.tsx index 8869cefc01..727c1b4d94 100644 --- a/e2e/vue-router/basic-esbuild-file-based/src/routes/(another-group)/onlyrouteinside.tsx +++ b/e2e/vue-router/basic-esbuild-file-based/src/routes/(another-group)/onlyrouteinside.tsx @@ -1,32 +1,27 @@ -import { defineComponent } from 'vue' import { createFileRoute, getRouteApi, useSearch } from '@tanstack/vue-router' import { z } from 'zod' -const OnlyRouteInsideComponent = defineComponent({ - setup() { - const searchViaHook = useSearch({ - from: '/(another-group)/onlyrouteinside', - }) - const searchViaRouteHook = routeApi.useSearch() - const searchViaRouteApi = routeApi.useSearch() - - return () => ( -
-
{searchViaHook.value.hello}
-
- {searchViaRouteHook.value.hello} -
-
- {searchViaRouteApi.value.hello} -
-
- ) - }, -}) - export const Route = createFileRoute('/(another-group)/onlyrouteinside')({ validateSearch: z.object({ hello: z.string().optional() }), component: OnlyRouteInsideComponent, }) const routeApi = getRouteApi('/(another-group)/onlyrouteinside') + +function OnlyRouteInsideComponent() { + const searchViaHook = useSearch({ from: '/(another-group)/onlyrouteinside' }) + const searchViaRouteHook = routeApi.useSearch() + const searchViaRouteApi = routeApi.useSearch() + + return ( +
+
{searchViaHook.value.hello}
+
+ {searchViaRouteHook.value.hello} +
+
+ {searchViaRouteApi.value.hello} +
+
+ ) +} diff --git a/e2e/vue-router/basic-esbuild-file-based/src/routes/(group)/_layout.insidelayout.tsx b/e2e/vue-router/basic-esbuild-file-based/src/routes/(group)/_layout.insidelayout.tsx index f2998803fd..4b239f3ef4 100644 --- a/e2e/vue-router/basic-esbuild-file-based/src/routes/(group)/_layout.insidelayout.tsx +++ b/e2e/vue-router/basic-esbuild-file-based/src/routes/(group)/_layout.insidelayout.tsx @@ -1,30 +1,27 @@ -import { defineComponent } from 'vue' import { createFileRoute, getRouteApi, useSearch } from '@tanstack/vue-router' import { z } from 'zod' -const InsideLayoutComponent = defineComponent({ - setup() { - const searchViaHook = useSearch({ from: '/(group)/_layout/insidelayout' }) - const searchViaRouteHook = routeApi.useSearch() - const searchViaRouteApi = routeApi.useSearch() - - return () => ( -
-
{searchViaHook.value.hello}
-
- {searchViaRouteHook.value.hello} -
-
- {searchViaRouteApi.value.hello} -
-
- ) - }, -}) - export const Route = createFileRoute('/(group)/_layout/insidelayout')({ validateSearch: z.object({ hello: z.string().optional() }), component: InsideLayoutComponent, }) const routeApi = getRouteApi('/(group)/_layout/insidelayout') + +function InsideLayoutComponent() { + const searchViaHook = useSearch({ from: '/(group)/_layout/insidelayout' }) + const searchViaRouteHook = routeApi.useSearch() + const searchViaRouteApi = routeApi.useSearch() + + return ( +
+
{searchViaHook.value.hello}
+
+ {searchViaRouteHook.value.hello} +
+
+ {searchViaRouteApi.value.hello} +
+
+ ) +} diff --git a/e2e/vue-router/basic-esbuild-file-based/src/routes/(group)/inside.tsx b/e2e/vue-router/basic-esbuild-file-based/src/routes/(group)/inside.tsx index 20e0d5afdb..f12ca517d3 100644 --- a/e2e/vue-router/basic-esbuild-file-based/src/routes/(group)/inside.tsx +++ b/e2e/vue-router/basic-esbuild-file-based/src/routes/(group)/inside.tsx @@ -1,30 +1,27 @@ -import { defineComponent } from 'vue' import { createFileRoute, getRouteApi, useSearch } from '@tanstack/vue-router' import { z } from 'zod' -const InsideComponent = defineComponent({ - setup() { - const searchViaHook = useSearch({ from: '/(group)/inside' }) - const searchViaRouteHook = routeApi.useSearch() - const searchViaRouteApi = routeApi.useSearch() - - return () => ( -
-
{searchViaHook.value.hello}
-
- {searchViaRouteHook.value.hello} -
-
- {searchViaRouteApi.value.hello} -
-
- ) - }, -}) - export const Route = createFileRoute('/(group)/inside')({ validateSearch: z.object({ hello: z.string().optional() }), component: InsideComponent, }) const routeApi = getRouteApi('/(group)/inside') + +function InsideComponent() { + const searchViaHook = useSearch({ from: '/(group)/inside' }) + const searchViaRouteHook = routeApi.useSearch() + const searchViaRouteApi = routeApi.useSearch() + + return ( +
+
{searchViaHook.value.hello}
+
+ {searchViaRouteHook.value.hello} +
+
+ {searchViaRouteApi.value.hello} +
+
+ ) +} diff --git a/e2e/vue-router/basic-esbuild-file-based/src/routes/(group)/lazyinside.tsx b/e2e/vue-router/basic-esbuild-file-based/src/routes/(group)/lazyinside.tsx index a46da658d6..05b34eb201 100644 --- a/e2e/vue-router/basic-esbuild-file-based/src/routes/(group)/lazyinside.tsx +++ b/e2e/vue-router/basic-esbuild-file-based/src/routes/(group)/lazyinside.tsx @@ -1,30 +1,27 @@ -import { defineComponent } from 'vue' import { createFileRoute, getRouteApi, useSearch } from '@tanstack/vue-router' import { z } from 'zod' -const LazyInsideComponent = defineComponent({ - setup() { - const searchViaHook = useSearch({ from: '/(group)/lazyinside' }) - const searchViaRouteHook = routeApi.useSearch() - const searchViaRouteApi = routeApi.useSearch() - - return () => ( -
-
{searchViaHook.value.hello}
-
- {searchViaRouteHook.value.hello} -
-
- {searchViaRouteApi.value.hello} -
-
- ) - }, -}) - export const Route = createFileRoute('/(group)/lazyinside')({ validateSearch: z.object({ hello: z.string().optional() }), component: LazyInsideComponent, }) const routeApi = getRouteApi('/(group)/lazyinside') + +function LazyInsideComponent() { + const searchViaHook = useSearch({ from: '/(group)/lazyinside' }) + const searchViaRouteHook = routeApi.useSearch() + const searchViaRouteApi = routeApi.useSearch() + + return ( +
+
{searchViaHook.value.hello}
+
+ {searchViaRouteHook.value.hello} +
+
+ {searchViaRouteApi.value.hello} +
+
+ ) +} diff --git a/e2e/vue-router/basic-esbuild-file-based/src/routes/(group)/subfolder/inside.tsx b/e2e/vue-router/basic-esbuild-file-based/src/routes/(group)/subfolder/inside.tsx index 715d2cc972..317c766186 100644 --- a/e2e/vue-router/basic-esbuild-file-based/src/routes/(group)/subfolder/inside.tsx +++ b/e2e/vue-router/basic-esbuild-file-based/src/routes/(group)/subfolder/inside.tsx @@ -1,30 +1,27 @@ -import { defineComponent } from 'vue' import { createFileRoute, getRouteApi, useSearch } from '@tanstack/vue-router' import { z } from 'zod' -const SubfolderInsideComponent = defineComponent({ - setup() { - const searchViaHook = useSearch({ from: '/(group)/subfolder/inside' }) - const searchViaRouteHook = routeApi.useSearch() - const searchViaRouteApi = routeApi.useSearch() - - return () => ( -
-
{searchViaHook.value.hello}
-
- {searchViaRouteHook.value.hello} -
-
- {searchViaRouteApi.value.hello} -
-
- ) - }, -}) - export const Route = createFileRoute('/(group)/subfolder/inside')({ validateSearch: z.object({ hello: z.string().optional() }), component: SubfolderInsideComponent, }) const routeApi = getRouteApi('/(group)/subfolder/inside') + +function SubfolderInsideComponent() { + const searchViaHook = useSearch({ from: '/(group)/subfolder/inside' }) + const searchViaRouteHook = routeApi.useSearch() + const searchViaRouteApi = routeApi.useSearch() + + return ( +
+
{searchViaHook.value.hello}
+
+ {searchViaRouteHook.value.hello} +
+
+ {searchViaRouteApi.value.hello} +
+
+ ) +} diff --git a/e2e/vue-router/basic-esbuild-file-based/src/routes/__root.tsx b/e2e/vue-router/basic-esbuild-file-based/src/routes/__root.tsx index 62c4af3aa4..59c9e6fa48 100644 --- a/e2e/vue-router/basic-esbuild-file-based/src/routes/__root.tsx +++ b/e2e/vue-router/basic-esbuild-file-based/src/routes/__root.tsx @@ -1,4 +1,3 @@ -import { defineComponent } from 'vue' import { HeadContent, Link, @@ -11,97 +10,95 @@ import { import { TanStackRouterDevtools } from '@tanstack/vue-router-devtools' import NotFoundComponent from '../components/NotFoundComponent.vue' -const RootComponent = defineComponent({ - setup() { - const router = useRouter() - const canGoBack = useCanGoBack() - // test useRouterState doesn't crash client side navigation - const _state = useRouterState() - - return () => ( - <> - -
- - - Home - - - Posts - - - Layout - - - Only Route Inside Group - - - Inside Group - - - Inside Subfolder Inside Group - - - Inside Group Inside Layout - - - Lazy Inside Group - - - unicode path - - - This Route Does Not Exist - -
-
- - - - ) - }, -}) - export const Route = createRootRoute({ component: RootComponent, notFoundComponent: NotFoundComponent, }) + +function RootComponent() { + const router = useRouter() + const canGoBack = useCanGoBack() + // test useRouterState doesn't crash client side navigation + const _state = useRouterState() + + return ( + <> + +
+ + + Home + + + Posts + + + Layout + + + Only Route Inside Group + + + Inside Group + + + Inside Subfolder Inside Group + + + Inside Group Inside Layout + + + Lazy Inside Group + + + unicode path + + + This Route Does Not Exist + +
+
+ + + + ) +} diff --git a/e2e/vue-router/basic-esbuild-file-based/src/routes/posts.$postId.tsx b/e2e/vue-router/basic-esbuild-file-based/src/routes/posts.$postId.tsx index 54ae789c8e..15d17387c8 100644 --- a/e2e/vue-router/basic-esbuild-file-based/src/routes/posts.$postId.tsx +++ b/e2e/vue-router/basic-esbuild-file-based/src/routes/posts.$postId.tsx @@ -1,27 +1,24 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' import PostErrorComponent from '../components/PostErrorComponent.vue' import { fetchPost } from '../posts' import type { PostType } from '../posts' -const PostComponent = defineComponent({ - setup() { - const post = Route.useLoaderData() - - return () => ( -
-

- {(post.value as PostType).title} -

-
{(post.value as PostType).body}
-
- ) - }, -}) - export const Route = createFileRoute('/posts/$postId')({ loader: async ({ params: { postId } }) => fetchPost(postId), component: PostComponent, errorComponent: PostErrorComponent, notFoundComponent: () =>

Post not found

, }) + +function PostComponent() { + const post = Route.useLoaderData() + + return ( +
+

+ {(post.value as PostType).title} +

+
{(post.value as PostType).body}
+
+ ) +} diff --git a/e2e/vue-router/basic-esbuild-file-based/src/routes/posts.tsx b/e2e/vue-router/basic-esbuild-file-based/src/routes/posts.tsx index e0afd27b4c..ae580dfc02 100644 --- a/e2e/vue-router/basic-esbuild-file-based/src/routes/posts.tsx +++ b/e2e/vue-router/basic-esbuild-file-based/src/routes/posts.tsx @@ -1,38 +1,7 @@ -import { defineComponent } from 'vue' import { Link, Outlet, createFileRoute } from '@tanstack/vue-router' import { fetchPosts } from '../posts' import type { PostType } from '../posts' -const PostsComponent = defineComponent({ - setup() { - const posts = Route.useLoaderData() - - return () => ( -
-
    - {[ - ...(posts.value as Array), - { id: 'i-do-not-exist', title: 'Non-existent Post' }, - ].map((post) => ( -
  • - -
    {post.title.substring(0, 20)}
    - -
  • - ))} -
-
- -
- ) - }, -}) - export const Route = createFileRoute('/posts')({ head: () => ({ meta: [ @@ -44,3 +13,31 @@ export const Route = createFileRoute('/posts')({ loader: fetchPosts, component: PostsComponent, }) + +function PostsComponent() { + const posts = Route.useLoaderData() + + return ( +
+
    + {[ + ...(posts.value as Array), + { id: 'i-do-not-exist', title: 'Non-existent Post' }, + ].map((post) => ( +
  • + +
    {post.title.substring(0, 20)}
    + +
  • + ))} +
+
+ +
+ ) +} diff --git a/e2e/vue-router/basic-esbuild-file-based/src/routes/posts_.$postId.edit.tsx b/e2e/vue-router/basic-esbuild-file-based/src/routes/posts_.$postId.edit.tsx index 22979c93c9..57963c6b64 100644 --- a/e2e/vue-router/basic-esbuild-file-based/src/routes/posts_.$postId.edit.tsx +++ b/e2e/vue-router/basic-esbuild-file-based/src/routes/posts_.$postId.edit.tsx @@ -1,28 +1,23 @@ -import { defineComponent } from 'vue' import { createFileRoute, getRouteApi, useParams } from '@tanstack/vue-router' -const PostEditComponent = defineComponent({ - setup() { - const paramsViaApi = api.useParams() - const paramsViaHook = useParams({ from: '/posts_/$postId/edit' }) - const paramsViaRouteHook = api.useParams() - - return () => ( -
-
{paramsViaHook.value.postId}
-
- {paramsViaRouteHook.value.postId} -
-
- {paramsViaApi.value.postId} -
-
- ) - }, -}) - export const Route = createFileRoute('/posts_/$postId/edit')({ component: PostEditComponent, }) const api = getRouteApi('/posts_/$postId/edit') + +function PostEditComponent() { + const paramsViaApi = api.useParams() + const paramsViaHook = useParams({ from: '/posts_/$postId/edit' }) + const paramsViaRouteHook = api.useParams() + + return ( +
+
{paramsViaHook.value.postId}
+
+ {paramsViaRouteHook.value.postId} +
+
{paramsViaApi.value.postId}
+
+ ) +} diff --git a/e2e/vue-router/basic-esbuild-file-based/tests/app.spec.ts b/e2e/vue-router/basic-esbuild-file-based/tests/app.spec.ts index 7380859e7b..543746d64d 100644 --- a/e2e/vue-router/basic-esbuild-file-based/tests/app.spec.ts +++ b/e2e/vue-router/basic-esbuild-file-based/tests/app.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' import type { Page } from '@playwright/test' test.beforeEach(async ({ page }) => { diff --git a/e2e/vue-router/basic-esbuild-file-based/tests/setup/global.setup.ts b/e2e/vue-router/basic-esbuild-file-based/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/vue-router/basic-esbuild-file-based/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/vue-router/basic-esbuild-file-based/tests/setup/global.teardown.ts b/e2e/vue-router/basic-esbuild-file-based/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/vue-router/basic-esbuild-file-based/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/vue-router/basic-file-based-jsx/package.json b/e2e/vue-router/basic-file-based-jsx/package.json index 9ab7f21e82..0cdca0cd87 100644 --- a/e2e/vue-router/basic-file-based-jsx/package.json +++ b/e2e/vue-router/basic-file-based-jsx/package.json @@ -8,7 +8,7 @@ "build": "vite build && vue-tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/vue-router/basic-file-based-jsx/playwright.config.ts b/e2e/vue-router/basic-file-based-jsx/playwright.config.ts index 4eead86444..836ea41bd8 100644 --- a/e2e/vue-router/basic-file-based-jsx/playwright.config.ts +++ b/e2e/vue-router/basic-file-based-jsx/playwright.config.ts @@ -1,7 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -12,15 +17,18 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `pnpm build && pnpm preview --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/vue-router/basic-file-based-jsx/src/posts.tsx b/e2e/vue-router/basic-file-based-jsx/src/posts.tsx index f7a1941605..1b4c92b41d 100644 --- a/e2e/vue-router/basic-file-based-jsx/src/posts.tsx +++ b/e2e/vue-router/basic-file-based-jsx/src/posts.tsx @@ -7,7 +7,11 @@ export type PostType = { body: string } -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) 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 5922c5f7b1..3922025c82 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-jsx/src/routes/(another-group)/onlyrouteinside.tsx b/e2e/vue-router/basic-file-based-jsx/src/routes/(another-group)/onlyrouteinside.tsx index 8869cefc01..727c1b4d94 100644 --- a/e2e/vue-router/basic-file-based-jsx/src/routes/(another-group)/onlyrouteinside.tsx +++ b/e2e/vue-router/basic-file-based-jsx/src/routes/(another-group)/onlyrouteinside.tsx @@ -1,32 +1,27 @@ -import { defineComponent } from 'vue' import { createFileRoute, getRouteApi, useSearch } from '@tanstack/vue-router' import { z } from 'zod' -const OnlyRouteInsideComponent = defineComponent({ - setup() { - const searchViaHook = useSearch({ - from: '/(another-group)/onlyrouteinside', - }) - const searchViaRouteHook = routeApi.useSearch() - const searchViaRouteApi = routeApi.useSearch() - - return () => ( -
-
{searchViaHook.value.hello}
-
- {searchViaRouteHook.value.hello} -
-
- {searchViaRouteApi.value.hello} -
-
- ) - }, -}) - export const Route = createFileRoute('/(another-group)/onlyrouteinside')({ validateSearch: z.object({ hello: z.string().optional() }), component: OnlyRouteInsideComponent, }) const routeApi = getRouteApi('/(another-group)/onlyrouteinside') + +function OnlyRouteInsideComponent() { + const searchViaHook = useSearch({ from: '/(another-group)/onlyrouteinside' }) + const searchViaRouteHook = routeApi.useSearch() + const searchViaRouteApi = routeApi.useSearch() + + return ( +
+
{searchViaHook.value.hello}
+
+ {searchViaRouteHook.value.hello} +
+
+ {searchViaRouteApi.value.hello} +
+
+ ) +} diff --git a/e2e/vue-router/basic-file-based-jsx/src/routes/(group)/_layout.insidelayout.tsx b/e2e/vue-router/basic-file-based-jsx/src/routes/(group)/_layout.insidelayout.tsx index f2998803fd..4b239f3ef4 100644 --- a/e2e/vue-router/basic-file-based-jsx/src/routes/(group)/_layout.insidelayout.tsx +++ b/e2e/vue-router/basic-file-based-jsx/src/routes/(group)/_layout.insidelayout.tsx @@ -1,30 +1,27 @@ -import { defineComponent } from 'vue' import { createFileRoute, getRouteApi, useSearch } from '@tanstack/vue-router' import { z } from 'zod' -const InsideLayoutComponent = defineComponent({ - setup() { - const searchViaHook = useSearch({ from: '/(group)/_layout/insidelayout' }) - const searchViaRouteHook = routeApi.useSearch() - const searchViaRouteApi = routeApi.useSearch() - - return () => ( -
-
{searchViaHook.value.hello}
-
- {searchViaRouteHook.value.hello} -
-
- {searchViaRouteApi.value.hello} -
-
- ) - }, -}) - export const Route = createFileRoute('/(group)/_layout/insidelayout')({ validateSearch: z.object({ hello: z.string().optional() }), component: InsideLayoutComponent, }) const routeApi = getRouteApi('/(group)/_layout/insidelayout') + +function InsideLayoutComponent() { + const searchViaHook = useSearch({ from: '/(group)/_layout/insidelayout' }) + const searchViaRouteHook = routeApi.useSearch() + const searchViaRouteApi = routeApi.useSearch() + + return ( +
+
{searchViaHook.value.hello}
+
+ {searchViaRouteHook.value.hello} +
+
+ {searchViaRouteApi.value.hello} +
+
+ ) +} diff --git a/e2e/vue-router/basic-file-based-jsx/src/routes/(group)/inside.tsx b/e2e/vue-router/basic-file-based-jsx/src/routes/(group)/inside.tsx index 20e0d5afdb..f12ca517d3 100644 --- a/e2e/vue-router/basic-file-based-jsx/src/routes/(group)/inside.tsx +++ b/e2e/vue-router/basic-file-based-jsx/src/routes/(group)/inside.tsx @@ -1,30 +1,27 @@ -import { defineComponent } from 'vue' import { createFileRoute, getRouteApi, useSearch } from '@tanstack/vue-router' import { z } from 'zod' -const InsideComponent = defineComponent({ - setup() { - const searchViaHook = useSearch({ from: '/(group)/inside' }) - const searchViaRouteHook = routeApi.useSearch() - const searchViaRouteApi = routeApi.useSearch() - - return () => ( -
-
{searchViaHook.value.hello}
-
- {searchViaRouteHook.value.hello} -
-
- {searchViaRouteApi.value.hello} -
-
- ) - }, -}) - export const Route = createFileRoute('/(group)/inside')({ validateSearch: z.object({ hello: z.string().optional() }), component: InsideComponent, }) const routeApi = getRouteApi('/(group)/inside') + +function InsideComponent() { + const searchViaHook = useSearch({ from: '/(group)/inside' }) + const searchViaRouteHook = routeApi.useSearch() + const searchViaRouteApi = routeApi.useSearch() + + return ( +
+
{searchViaHook.value.hello}
+
+ {searchViaRouteHook.value.hello} +
+
+ {searchViaRouteApi.value.hello} +
+
+ ) +} diff --git a/e2e/vue-router/basic-file-based-jsx/src/routes/(group)/lazyinside.tsx b/e2e/vue-router/basic-file-based-jsx/src/routes/(group)/lazyinside.tsx index a46da658d6..05b34eb201 100644 --- a/e2e/vue-router/basic-file-based-jsx/src/routes/(group)/lazyinside.tsx +++ b/e2e/vue-router/basic-file-based-jsx/src/routes/(group)/lazyinside.tsx @@ -1,30 +1,27 @@ -import { defineComponent } from 'vue' import { createFileRoute, getRouteApi, useSearch } from '@tanstack/vue-router' import { z } from 'zod' -const LazyInsideComponent = defineComponent({ - setup() { - const searchViaHook = useSearch({ from: '/(group)/lazyinside' }) - const searchViaRouteHook = routeApi.useSearch() - const searchViaRouteApi = routeApi.useSearch() - - return () => ( -
-
{searchViaHook.value.hello}
-
- {searchViaRouteHook.value.hello} -
-
- {searchViaRouteApi.value.hello} -
-
- ) - }, -}) - export const Route = createFileRoute('/(group)/lazyinside')({ validateSearch: z.object({ hello: z.string().optional() }), component: LazyInsideComponent, }) const routeApi = getRouteApi('/(group)/lazyinside') + +function LazyInsideComponent() { + const searchViaHook = useSearch({ from: '/(group)/lazyinside' }) + const searchViaRouteHook = routeApi.useSearch() + const searchViaRouteApi = routeApi.useSearch() + + return ( +
+
{searchViaHook.value.hello}
+
+ {searchViaRouteHook.value.hello} +
+
+ {searchViaRouteApi.value.hello} +
+
+ ) +} diff --git a/e2e/vue-router/basic-file-based-jsx/src/routes/(group)/subfolder/inside.tsx b/e2e/vue-router/basic-file-based-jsx/src/routes/(group)/subfolder/inside.tsx index 715d2cc972..317c766186 100644 --- a/e2e/vue-router/basic-file-based-jsx/src/routes/(group)/subfolder/inside.tsx +++ b/e2e/vue-router/basic-file-based-jsx/src/routes/(group)/subfolder/inside.tsx @@ -1,30 +1,27 @@ -import { defineComponent } from 'vue' import { createFileRoute, getRouteApi, useSearch } from '@tanstack/vue-router' import { z } from 'zod' -const SubfolderInsideComponent = defineComponent({ - setup() { - const searchViaHook = useSearch({ from: '/(group)/subfolder/inside' }) - const searchViaRouteHook = routeApi.useSearch() - const searchViaRouteApi = routeApi.useSearch() - - return () => ( -
-
{searchViaHook.value.hello}
-
- {searchViaRouteHook.value.hello} -
-
- {searchViaRouteApi.value.hello} -
-
- ) - }, -}) - export const Route = createFileRoute('/(group)/subfolder/inside')({ validateSearch: z.object({ hello: z.string().optional() }), component: SubfolderInsideComponent, }) const routeApi = getRouteApi('/(group)/subfolder/inside') + +function SubfolderInsideComponent() { + const searchViaHook = useSearch({ from: '/(group)/subfolder/inside' }) + const searchViaRouteHook = routeApi.useSearch() + const searchViaRouteApi = routeApi.useSearch() + + return ( +
+
{searchViaHook.value.hello}
+
+ {searchViaRouteHook.value.hello} +
+
+ {searchViaRouteApi.value.hello} +
+
+ ) +} diff --git a/e2e/vue-router/basic-file-based-jsx/src/routes/__root.tsx b/e2e/vue-router/basic-file-based-jsx/src/routes/__root.tsx index 62c4af3aa4..59c9e6fa48 100644 --- a/e2e/vue-router/basic-file-based-jsx/src/routes/__root.tsx +++ b/e2e/vue-router/basic-file-based-jsx/src/routes/__root.tsx @@ -1,4 +1,3 @@ -import { defineComponent } from 'vue' import { HeadContent, Link, @@ -11,97 +10,95 @@ import { import { TanStackRouterDevtools } from '@tanstack/vue-router-devtools' import NotFoundComponent from '../components/NotFoundComponent.vue' -const RootComponent = defineComponent({ - setup() { - const router = useRouter() - const canGoBack = useCanGoBack() - // test useRouterState doesn't crash client side navigation - const _state = useRouterState() - - return () => ( - <> - -
- - - Home - - - Posts - - - Layout - - - Only Route Inside Group - - - Inside Group - - - Inside Subfolder Inside Group - - - Inside Group Inside Layout - - - Lazy Inside Group - - - unicode path - - - This Route Does Not Exist - -
-
- - - - ) - }, -}) - export const Route = createRootRoute({ component: RootComponent, notFoundComponent: NotFoundComponent, }) + +function RootComponent() { + const router = useRouter() + const canGoBack = useCanGoBack() + // test useRouterState doesn't crash client side navigation + const _state = useRouterState() + + return ( + <> + +
+ + + Home + + + Posts + + + Layout + + + Only Route Inside Group + + + Inside Group + + + Inside Subfolder Inside Group + + + Inside Group Inside Layout + + + Lazy Inside Group + + + unicode path + + + This Route Does Not Exist + +
+
+ + + + ) +} diff --git a/e2e/vue-router/basic-file-based-jsx/src/routes/posts.$postId.tsx b/e2e/vue-router/basic-file-based-jsx/src/routes/posts.$postId.tsx index 54ae789c8e..15d17387c8 100644 --- a/e2e/vue-router/basic-file-based-jsx/src/routes/posts.$postId.tsx +++ b/e2e/vue-router/basic-file-based-jsx/src/routes/posts.$postId.tsx @@ -1,27 +1,24 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' import PostErrorComponent from '../components/PostErrorComponent.vue' import { fetchPost } from '../posts' import type { PostType } from '../posts' -const PostComponent = defineComponent({ - setup() { - const post = Route.useLoaderData() - - return () => ( -
-

- {(post.value as PostType).title} -

-
{(post.value as PostType).body}
-
- ) - }, -}) - export const Route = createFileRoute('/posts/$postId')({ loader: async ({ params: { postId } }) => fetchPost(postId), component: PostComponent, errorComponent: PostErrorComponent, notFoundComponent: () =>

Post not found

, }) + +function PostComponent() { + const post = Route.useLoaderData() + + return ( +
+

+ {(post.value as PostType).title} +

+
{(post.value as PostType).body}
+
+ ) +} diff --git a/e2e/vue-router/basic-file-based-jsx/src/routes/posts.tsx b/e2e/vue-router/basic-file-based-jsx/src/routes/posts.tsx index e0afd27b4c..ae580dfc02 100644 --- a/e2e/vue-router/basic-file-based-jsx/src/routes/posts.tsx +++ b/e2e/vue-router/basic-file-based-jsx/src/routes/posts.tsx @@ -1,38 +1,7 @@ -import { defineComponent } from 'vue' import { Link, Outlet, createFileRoute } from '@tanstack/vue-router' import { fetchPosts } from '../posts' import type { PostType } from '../posts' -const PostsComponent = defineComponent({ - setup() { - const posts = Route.useLoaderData() - - return () => ( -
-
    - {[ - ...(posts.value as Array), - { id: 'i-do-not-exist', title: 'Non-existent Post' }, - ].map((post) => ( -
  • - -
    {post.title.substring(0, 20)}
    - -
  • - ))} -
-
- -
- ) - }, -}) - export const Route = createFileRoute('/posts')({ head: () => ({ meta: [ @@ -44,3 +13,31 @@ export const Route = createFileRoute('/posts')({ loader: fetchPosts, component: PostsComponent, }) + +function PostsComponent() { + const posts = Route.useLoaderData() + + return ( +
+
    + {[ + ...(posts.value as Array), + { id: 'i-do-not-exist', title: 'Non-existent Post' }, + ].map((post) => ( +
  • + +
    {post.title.substring(0, 20)}
    + +
  • + ))} +
+
+ +
+ ) +} diff --git a/e2e/vue-router/basic-file-based-jsx/src/routes/posts_.$postId.edit.tsx b/e2e/vue-router/basic-file-based-jsx/src/routes/posts_.$postId.edit.tsx index 22979c93c9..57963c6b64 100644 --- a/e2e/vue-router/basic-file-based-jsx/src/routes/posts_.$postId.edit.tsx +++ b/e2e/vue-router/basic-file-based-jsx/src/routes/posts_.$postId.edit.tsx @@ -1,28 +1,23 @@ -import { defineComponent } from 'vue' import { createFileRoute, getRouteApi, useParams } from '@tanstack/vue-router' -const PostEditComponent = defineComponent({ - setup() { - const paramsViaApi = api.useParams() - const paramsViaHook = useParams({ from: '/posts_/$postId/edit' }) - const paramsViaRouteHook = api.useParams() - - return () => ( -
-
{paramsViaHook.value.postId}
-
- {paramsViaRouteHook.value.postId} -
-
- {paramsViaApi.value.postId} -
-
- ) - }, -}) - export const Route = createFileRoute('/posts_/$postId/edit')({ component: PostEditComponent, }) const api = getRouteApi('/posts_/$postId/edit') + +function PostEditComponent() { + const paramsViaApi = api.useParams() + const paramsViaHook = useParams({ from: '/posts_/$postId/edit' }) + const paramsViaRouteHook = api.useParams() + + return ( +
+
{paramsViaHook.value.postId}
+
+ {paramsViaRouteHook.value.postId} +
+
{paramsViaApi.value.postId}
+
+ ) +} diff --git a/e2e/vue-router/basic-file-based-jsx/tests/app.spec.ts b/e2e/vue-router/basic-file-based-jsx/tests/app.spec.ts index 7380859e7b..543746d64d 100644 --- a/e2e/vue-router/basic-file-based-jsx/tests/app.spec.ts +++ b/e2e/vue-router/basic-file-based-jsx/tests/app.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' import type { Page } from '@playwright/test' test.beforeEach(async ({ page }) => { diff --git a/e2e/vue-router/basic-file-based-jsx/tests/setup/global.setup.ts b/e2e/vue-router/basic-file-based-jsx/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/vue-router/basic-file-based-jsx/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/vue-router/basic-file-based-jsx/tests/setup/global.teardown.ts b/e2e/vue-router/basic-file-based-jsx/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/vue-router/basic-file-based-jsx/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/vue-router/basic-file-based-sfc/package.json b/e2e/vue-router/basic-file-based-sfc/package.json index e6ffa156f9..c3e7d69bfa 100644 --- a/e2e/vue-router/basic-file-based-sfc/package.json +++ b/e2e/vue-router/basic-file-based-sfc/package.json @@ -8,7 +8,7 @@ "build": "vite build && vue-tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/vue-router/basic-file-based-sfc/playwright.config.ts b/e2e/vue-router/basic-file-based-sfc/playwright.config.ts index 4eead86444..836ea41bd8 100644 --- a/e2e/vue-router/basic-file-based-sfc/playwright.config.ts +++ b/e2e/vue-router/basic-file-based-sfc/playwright.config.ts @@ -1,7 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -12,15 +17,18 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `pnpm build && pnpm preview --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/vue-router/basic-file-based-sfc/src/posts.ts b/e2e/vue-router/basic-file-based-sfc/src/posts.ts index f7a1941605..1b4c92b41d 100644 --- a/e2e/vue-router/basic-file-based-sfc/src/posts.ts +++ b/e2e/vue-router/basic-file-based-sfc/src/posts.ts @@ -7,7 +7,11 @@ export type PostType = { body: string } -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) 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 0bfdddab3d..09d62b0706 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/basic-file-based-sfc/tests/app.spec.ts b/e2e/vue-router/basic-file-based-sfc/tests/app.spec.ts index 7380859e7b..543746d64d 100644 --- a/e2e/vue-router/basic-file-based-sfc/tests/app.spec.ts +++ b/e2e/vue-router/basic-file-based-sfc/tests/app.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' import type { Page } from '@playwright/test' test.beforeEach(async ({ page }) => { diff --git a/e2e/vue-router/basic-file-based-sfc/tests/setup/global.setup.ts b/e2e/vue-router/basic-file-based-sfc/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/vue-router/basic-file-based-sfc/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/vue-router/basic-file-based-sfc/tests/setup/global.teardown.ts b/e2e/vue-router/basic-file-based-sfc/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/vue-router/basic-file-based-sfc/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/vue-router/basic-scroll-restoration/package.json b/e2e/vue-router/basic-scroll-restoration/package.json index f4616a5651..965a59aa79 100644 --- a/e2e/vue-router/basic-scroll-restoration/package.json +++ b/e2e/vue-router/basic-scroll-restoration/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/vue-router/basic-scroll-restoration/playwright.config.ts b/e2e/vue-router/basic-scroll-restoration/playwright.config.ts index 6a684ac89e..0c5cee43e4 100644 --- a/e2e/vue-router/basic-scroll-restoration/playwright.config.ts +++ b/e2e/vue-router/basic-scroll-restoration/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,8 +20,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/vue-router/basic-virtual-file-based/package.json b/e2e/vue-router/basic-virtual-file-based/package.json index 3701c2254c..374ea348e2 100644 --- a/e2e/vue-router/basic-virtual-file-based/package.json +++ b/e2e/vue-router/basic-virtual-file-based/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/vue-router/basic-virtual-file-based/playwright.config.ts b/e2e/vue-router/basic-virtual-file-based/playwright.config.ts index 4eead86444..836ea41bd8 100644 --- a/e2e/vue-router/basic-virtual-file-based/playwright.config.ts +++ b/e2e/vue-router/basic-virtual-file-based/playwright.config.ts @@ -1,7 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -12,15 +17,18 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `pnpm build && pnpm preview --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/vue-router/basic-virtual-file-based/src/posts.tsx b/e2e/vue-router/basic-virtual-file-based/src/posts.tsx index 5f5463a668..8576a3799a 100644 --- a/e2e/vue-router/basic-virtual-file-based/src/posts.tsx +++ b/e2e/vue-router/basic-virtual-file-based/src/posts.tsx @@ -7,7 +7,11 @@ export type PostType = { body: string } -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/vue-router/basic-virtual-file-based/src/routes/posts/posts-detail.tsx b/e2e/vue-router/basic-virtual-file-based/src/routes/posts/posts-detail.tsx index aa5387a4d8..b4c91d3e85 100644 --- a/e2e/vue-router/basic-virtual-file-based/src/routes/posts/posts-detail.tsx +++ b/e2e/vue-router/basic-virtual-file-based/src/routes/posts/posts-detail.tsx @@ -1,4 +1,3 @@ -import { defineComponent } from 'vue' import { ErrorComponent, createFileRoute } from '@tanstack/vue-router' import { fetchPost } from '../../posts' import type { ErrorComponentProps } from '@tanstack/vue-router' @@ -7,19 +6,6 @@ export function PostErrorComponent({ error }: ErrorComponentProps) { return } -const PostComponent = defineComponent({ - setup() { - const post = Route.useLoaderData() - - return () => ( -
-

{post.value?.title}

-
{post.value?.body}
-
- ) - }, -}) - export const Route = createFileRoute('/posts/$postId')({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent as any, @@ -28,3 +14,14 @@ export const Route = createFileRoute('/posts/$postId')({ }, component: PostComponent, }) + +function PostComponent() { + const post = Route.useLoaderData() + + return ( +
+

{post.value?.title}

+
{post.value?.body}
+
+ ) +} diff --git a/e2e/vue-router/basic-virtual-file-based/src/routes/posts/posts.tsx b/e2e/vue-router/basic-virtual-file-based/src/routes/posts/posts.tsx index 2a4e8deddd..265faaf650 100644 --- a/e2e/vue-router/basic-virtual-file-based/src/routes/posts/posts.tsx +++ b/e2e/vue-router/basic-virtual-file-based/src/routes/posts/posts.tsx @@ -1,42 +1,39 @@ -import { defineComponent } from 'vue' import { Link, Outlet, createFileRoute } from '@tanstack/vue-router' import { fetchPosts } from '../../posts' -const PostsComponent = defineComponent({ - setup() { - const posts = Route.useLoaderData() - - return () => ( -
-
    - {[ - ...posts.value, - { id: 'i-do-not-exist', title: 'Non-existent Post' }, - ].map((post) => { - return ( -
  • - -
    {post.title.substring(0, 20)}
    - -
  • - ) - })} -
-
- -
- ) - }, -}) - export const Route = createFileRoute('/posts')({ loader: fetchPosts, component: PostsComponent, }) + +function PostsComponent() { + const posts = Route.useLoaderData() + + return ( +
+
    + {[ + ...posts.value, + { id: 'i-do-not-exist', title: 'Non-existent Post' }, + ].map((post) => { + return ( +
  • + +
    {post.title.substring(0, 20)}
    + +
  • + ) + })} +
+
+ +
+ ) +} diff --git a/e2e/vue-router/basic-virtual-file-based/tests/app.spec.ts b/e2e/vue-router/basic-virtual-file-based/tests/app.spec.ts index fbf093cd51..3e5a69ccaa 100644 --- a/e2e/vue-router/basic-virtual-file-based/tests/app.spec.ts +++ b/e2e/vue-router/basic-virtual-file-based/tests/app.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/vue-router/basic-virtual-file-based/tests/setup/global.setup.ts b/e2e/vue-router/basic-virtual-file-based/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/vue-router/basic-virtual-file-based/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/vue-router/basic-virtual-file-based/tests/setup/global.teardown.ts b/e2e/vue-router/basic-virtual-file-based/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/vue-router/basic-virtual-file-based/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/vue-router/basic-virtual-named-export-config-file-based/package.json b/e2e/vue-router/basic-virtual-named-export-config-file-based/package.json index d3a69ed573..2e368cbd72 100644 --- a/e2e/vue-router/basic-virtual-named-export-config-file-based/package.json +++ b/e2e/vue-router/basic-virtual-named-export-config-file-based/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/vue-router/basic-virtual-named-export-config-file-based/playwright.config.ts b/e2e/vue-router/basic-virtual-named-export-config-file-based/playwright.config.ts index 4eead86444..836ea41bd8 100644 --- a/e2e/vue-router/basic-virtual-named-export-config-file-based/playwright.config.ts +++ b/e2e/vue-router/basic-virtual-named-export-config-file-based/playwright.config.ts @@ -1,7 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -12,15 +17,18 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `pnpm build && pnpm preview --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/vue-router/basic-virtual-named-export-config-file-based/src/posts.tsx b/e2e/vue-router/basic-virtual-named-export-config-file-based/src/posts.tsx index 5f5463a668..8576a3799a 100644 --- a/e2e/vue-router/basic-virtual-named-export-config-file-based/src/posts.tsx +++ b/e2e/vue-router/basic-virtual-named-export-config-file-based/src/posts.tsx @@ -7,7 +7,11 @@ export type PostType = { body: string } -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/vue-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx b/e2e/vue-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx index aa5387a4d8..b4c91d3e85 100644 --- a/e2e/vue-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx +++ b/e2e/vue-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx @@ -1,4 +1,3 @@ -import { defineComponent } from 'vue' import { ErrorComponent, createFileRoute } from '@tanstack/vue-router' import { fetchPost } from '../../posts' import type { ErrorComponentProps } from '@tanstack/vue-router' @@ -7,19 +6,6 @@ export function PostErrorComponent({ error }: ErrorComponentProps) { return } -const PostComponent = defineComponent({ - setup() { - const post = Route.useLoaderData() - - return () => ( -
-

{post.value?.title}

-
{post.value?.body}
-
- ) - }, -}) - export const Route = createFileRoute('/posts/$postId')({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent as any, @@ -28,3 +14,14 @@ export const Route = createFileRoute('/posts/$postId')({ }, component: PostComponent, }) + +function PostComponent() { + const post = Route.useLoaderData() + + return ( +
+

{post.value?.title}

+
{post.value?.body}
+
+ ) +} diff --git a/e2e/vue-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx b/e2e/vue-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx index 2a4e8deddd..265faaf650 100644 --- a/e2e/vue-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx +++ b/e2e/vue-router/basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx @@ -1,42 +1,39 @@ -import { defineComponent } from 'vue' import { Link, Outlet, createFileRoute } from '@tanstack/vue-router' import { fetchPosts } from '../../posts' -const PostsComponent = defineComponent({ - setup() { - const posts = Route.useLoaderData() - - return () => ( -
-
    - {[ - ...posts.value, - { id: 'i-do-not-exist', title: 'Non-existent Post' }, - ].map((post) => { - return ( -
  • - -
    {post.title.substring(0, 20)}
    - -
  • - ) - })} -
-
- -
- ) - }, -}) - export const Route = createFileRoute('/posts')({ loader: fetchPosts, component: PostsComponent, }) + +function PostsComponent() { + const posts = Route.useLoaderData() + + return ( +
+
    + {[ + ...posts.value, + { id: 'i-do-not-exist', title: 'Non-existent Post' }, + ].map((post) => { + return ( +
  • + +
    {post.title.substring(0, 20)}
    + +
  • + ) + })} +
+
+ +
+ ) +} diff --git a/e2e/vue-router/basic-virtual-named-export-config-file-based/tests/app.spec.ts b/e2e/vue-router/basic-virtual-named-export-config-file-based/tests/app.spec.ts index fbf093cd51..3e5a69ccaa 100644 --- a/e2e/vue-router/basic-virtual-named-export-config-file-based/tests/app.spec.ts +++ b/e2e/vue-router/basic-virtual-named-export-config-file-based/tests/app.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/vue-router/basic-virtual-named-export-config-file-based/tests/setup/global.setup.ts b/e2e/vue-router/basic-virtual-named-export-config-file-based/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/vue-router/basic-virtual-named-export-config-file-based/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/vue-router/basic-virtual-named-export-config-file-based/tests/setup/global.teardown.ts b/e2e/vue-router/basic-virtual-named-export-config-file-based/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/vue-router/basic-virtual-named-export-config-file-based/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/vue-router/basic-vue-query-file-based/package.json b/e2e/vue-router/basic-vue-query-file-based/package.json index 3b4422d8d8..9b2e3cca0d 100644 --- a/e2e/vue-router/basic-vue-query-file-based/package.json +++ b/e2e/vue-router/basic-vue-query-file-based/package.json @@ -8,7 +8,7 @@ "build": "vite build && vue-tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/vue-router/basic-vue-query-file-based/playwright.config.ts b/e2e/vue-router/basic-vue-query-file-based/playwright.config.ts index fbda9bd451..6e7c123f74 100644 --- a/e2e/vue-router/basic-vue-query-file-based/playwright.config.ts +++ b/e2e/vue-router/basic-vue-query-file-based/playwright.config.ts @@ -1,7 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -12,15 +17,17 @@ export default defineConfig({ workers: 1, reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `pnpm build && pnpm preview --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm preview --port ${PORT}`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/vue-router/basic-vue-query-file-based/src/posts.tsx b/e2e/vue-router/basic-vue-query-file-based/src/posts.tsx index 1f6cb8e308..1becc2c242 100644 --- a/e2e/vue-router/basic-vue-query-file-based/src/posts.tsx +++ b/e2e/vue-router/basic-vue-query-file-based/src/posts.tsx @@ -8,7 +8,11 @@ export type PostType = { export class PostNotFoundError extends Error {} -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/vue-router/basic-vue-query-file-based/src/routes/posts.$postId.tsx b/e2e/vue-router/basic-vue-query-file-based/src/routes/posts.$postId.tsx index e8b66ddf5d..72109fc891 100644 --- a/e2e/vue-router/basic-vue-query-file-based/src/routes/posts.$postId.tsx +++ b/e2e/vue-router/basic-vue-query-file-based/src/routes/posts.$postId.tsx @@ -1,4 +1,3 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' import { ErrorComponent, useRouter } from '@tanstack/vue-router' import { useQuery } from '@tanstack/vue-query' @@ -6,21 +5,6 @@ import { PostNotFoundError } from '../posts' import { postQueryOptions } from '../postQueryOptions' import type { ErrorComponentProps } from '@tanstack/vue-router' -const PostComponent = defineComponent({ - setup() { - const params = Route.useParams() - useQuery(() => postQueryOptions(params.value.postId)) - const post = Route.useLoaderData() - - return () => ( -
-

{post.value.title}

-
{post.value.body}
-
- ) - }, -}) - export const Route = createFileRoute('/posts/$postId')({ loader: ({ context: { queryClient }, params: { postId } }) => { return queryClient.ensureQueryData(postQueryOptions(postId)) @@ -48,3 +32,16 @@ export function PostErrorComponent({ error }: ErrorComponentProps) {
) } + +function PostComponent() { + const postId = Route.useParams().value.postId + useQuery(postQueryOptions(postId)) + const post = Route.useLoaderData() + + return ( +
+

{post.value.title}

+
{post.value.body}
+
+ ) +} diff --git a/e2e/vue-router/basic-vue-query-file-based/src/routes/posts.tsx b/e2e/vue-router/basic-vue-query-file-based/src/routes/posts.tsx index e1c35d59ad..f9e20f99d6 100644 --- a/e2e/vue-router/basic-vue-query-file-based/src/routes/posts.tsx +++ b/e2e/vue-router/basic-vue-query-file-based/src/routes/posts.tsx @@ -1,45 +1,42 @@ -import { defineComponent } from 'vue' import { Link, Outlet, createFileRoute } from '@tanstack/vue-router' import { useQuery } from '@tanstack/vue-query' import { postsQueryOptions } from '../postsQueryOptions' -const PostsComponent = defineComponent({ - setup() { - useQuery(postsQueryOptions) - const posts = Route.useLoaderData() - - return () => ( -
-
    - {[ - ...posts.value, - { id: 'i-do-not-exist', title: 'Non-existent Post' }, - ].map((post) => { - return ( -
  • - -
    {post.title.substring(0, 20)}
    - -
  • - ) - })} -
-
- -
- ) - }, -}) - export const Route = createFileRoute('/posts')({ loader: ({ context: { queryClient } }) => queryClient.ensureQueryData(postsQueryOptions), component: PostsComponent, }) + +function PostsComponent() { + useQuery(postsQueryOptions) + const posts = Route.useLoaderData() + + return ( +
+
    + {[ + ...posts.value, + { id: 'i-do-not-exist', title: 'Non-existent Post' }, + ].map((post) => { + return ( +
  • + +
    {post.title.substring(0, 20)}
    + +
  • + ) + })} +
+
+ +
+ ) +} diff --git a/e2e/vue-router/basic-vue-query-file-based/tests/app.spec.ts b/e2e/vue-router/basic-vue-query-file-based/tests/app.spec.ts index 2b42d6d589..d80e8dada5 100644 --- a/e2e/vue-router/basic-vue-query-file-based/tests/app.spec.ts +++ b/e2e/vue-router/basic-vue-query-file-based/tests/app.spec.ts @@ -1,23 +1,24 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' +import { getDummyServerPort } from '@tanstack/router-e2e-utils' +import packageJson from '../package.json' with { type: 'json' } test.beforeEach(async ({ page }) => { await page.goto('/') }) -test('GetPosts with networking disabled', async ({ page, context }) => { - await page.goto('about:blank') - await context.setOffline(true) - const { status, posts, post } = await page.evaluate(async () => { - const response = await fetch('https://jsonplaceholder.typicode.com/posts') - const posts = await response.json() - const post = await fetch( - 'https://jsonplaceholder.typicode.com/posts/1', - ).then((r) => r.json()) - return { status: response.status, posts, post } - }) - expect(status).toBe(200) +test('GetPosts', async () => { + const port = await getDummyServerPort(packageJson.name) + const res = await fetch(`http://localhost:${port}/posts`) + + expect(res.status).toBe(200) + + const posts = await res.json() + expect(posts.length).toBeGreaterThan(0) + + const postRes = await fetch(`http://localhost:${port}/posts/1`) + expect(postRes.status).toBe(200) + const post = await postRes.json() expect(post).toEqual(posts[0]) }) diff --git a/e2e/vue-router/basic-vue-query-file-based/tests/setup/global.setup.ts b/e2e/vue-router/basic-vue-query-file-based/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/vue-router/basic-vue-query-file-based/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/vue-router/basic-vue-query-file-based/tests/setup/global.teardown.ts b/e2e/vue-router/basic-vue-query-file-based/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/vue-router/basic-vue-query-file-based/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/vue-router/basic-vue-query-file-based/tsconfig.json b/e2e/vue-router/basic-vue-query-file-based/tsconfig.json index 28889522fc..123a2f4122 100644 --- a/e2e/vue-router/basic-vue-query-file-based/tsconfig.json +++ b/e2e/vue-router/basic-vue-query-file-based/tsconfig.json @@ -10,7 +10,7 @@ "skipLibCheck": true, "noEmit": true, "resolveJsonModule": true, - "types": ["vite/client", "node"] + "types": ["vite/client"] }, "include": ["src", "tests"], "exclude": ["node_modules", "dist"] diff --git a/e2e/vue-router/basic-vue-query/package.json b/e2e/vue-router/basic-vue-query/package.json index 68f1a8c9ea..ba3f4295d5 100644 --- a/e2e/vue-router/basic-vue-query/package.json +++ b/e2e/vue-router/basic-vue-query/package.json @@ -8,7 +8,7 @@ "build": "vite build && vue-tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/vue-router/basic-vue-query/playwright.config.ts b/e2e/vue-router/basic-vue-query/playwright.config.ts index 4eead86444..836ea41bd8 100644 --- a/e2e/vue-router/basic-vue-query/playwright.config.ts +++ b/e2e/vue-router/basic-vue-query/playwright.config.ts @@ -1,7 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -12,15 +17,18 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `pnpm build && pnpm preview --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/vue-router/basic-vue-query/src/main.tsx b/e2e/vue-router/basic-vue-query/src/main.tsx index 3235f26ce3..4f862a9b31 100644 --- a/e2e/vue-router/basic-vue-query/src/main.tsx +++ b/e2e/vue-router/basic-vue-query/src/main.tsx @@ -1,4 +1,4 @@ -import { createApp, defineComponent } from 'vue' +import { createApp } from 'vue' import { ErrorComponent, Link, @@ -108,21 +108,6 @@ function PostsIndexRouteComponent() { return
Select a post.
} -const PostRouteComponent = defineComponent({ - setup() { - const params = postRoute.useParams() - useQuery(() => postQueryOptions(params.value.postId)) - const post = postRoute.useLoaderData() - - return () => ( -
-

{post.value.title}

-
{post.value.body}
-
- ) - }, -}) - const postRoute = createRoute({ getParentRoute: () => postsRoute, path: '$postId', @@ -152,6 +137,19 @@ function PostErrorComponent({ error }: ErrorComponentProps) { ) } +function PostRouteComponent() { + const postId = postRoute.useParams().value.postId + useQuery(postQueryOptions(postId)) + const post = postRoute.useLoaderData() + + return ( +
+

{post.value.title}

+
{post.value.body}
+
+ ) +} + const layoutRoute = createRoute({ getParentRoute: () => rootRoute, id: '_layout', diff --git a/e2e/vue-router/basic-vue-query/src/posts.lazy.tsx b/e2e/vue-router/basic-vue-query/src/posts.lazy.tsx index d42d3d49dc..eb844bc68d 100644 --- a/e2e/vue-router/basic-vue-query/src/posts.lazy.tsx +++ b/e2e/vue-router/basic-vue-query/src/posts.lazy.tsx @@ -1,42 +1,39 @@ -import { defineComponent } from 'vue' import { Link, Outlet, createLazyRoute } from '@tanstack/vue-router' import { useQuery } from '@tanstack/vue-query' import { postsQueryOptions } from './posts' -const PostsComponent = defineComponent({ - setup() { - const postsQuery = useQuery(postsQueryOptions) - const posts = postsQuery.data - - return () => ( -
-
    - {[ - ...((posts.value ?? []) as Array<{ id: string; title: string }>), - { id: 'i-do-not-exist', title: 'Non-existent Post' }, - ].map((post) => { - return ( -
  • - -
    {post.title.substring(0, 20)}
    - -
  • - ) - })} -
- -
- ) - }, -}) - export const Route = createLazyRoute('/posts')({ component: PostsComponent, }) + +function PostsComponent() { + const postsQuery = useQuery(postsQueryOptions) + const posts = postsQuery.data + + return ( +
+
    + {[ + ...((posts.value ?? []) as Array<{ id: string; title: string }>), + { id: 'i-do-not-exist', title: 'Non-existent Post' }, + ].map((post) => { + return ( +
  • + +
    {post.title.substring(0, 20)}
    + +
  • + ) + })} +
+ +
+ ) +} diff --git a/e2e/vue-router/basic-vue-query/src/posts.ts b/e2e/vue-router/basic-vue-query/src/posts.ts index 69e1814af5..18f8a9f93f 100644 --- a/e2e/vue-router/basic-vue-query/src/posts.ts +++ b/e2e/vue-router/basic-vue-query/src/posts.ts @@ -9,7 +9,11 @@ type PostType = { body: string } -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} const fetchPosts = async () => { console.info('Fetching posts...') diff --git a/e2e/vue-router/basic-vue-query/tests/app.spec.ts b/e2e/vue-router/basic-vue-query/tests/app.spec.ts index fbf093cd51..3e5a69ccaa 100644 --- a/e2e/vue-router/basic-vue-query/tests/app.spec.ts +++ b/e2e/vue-router/basic-vue-query/tests/app.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/vue-router/basic-vue-query/tests/setup/global.setup.ts b/e2e/vue-router/basic-vue-query/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/vue-router/basic-vue-query/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/vue-router/basic-vue-query/tests/setup/global.teardown.ts b/e2e/vue-router/basic-vue-query/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/vue-router/basic-vue-query/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/vue-router/basic/package.json b/e2e/vue-router/basic/package.json index 1b57dae772..e1b7f0ae1a 100644 --- a/e2e/vue-router/basic/package.json +++ b/e2e/vue-router/basic/package.json @@ -8,7 +8,7 @@ "build": "vite build && vue-tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/vue-router/basic/playwright.config.ts b/e2e/vue-router/basic/playwright.config.ts index 4eead86444..836ea41bd8 100644 --- a/e2e/vue-router/basic/playwright.config.ts +++ b/e2e/vue-router/basic/playwright.config.ts @@ -1,7 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -12,15 +17,18 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `pnpm build && pnpm preview --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/vue-router/basic/src/main.tsx b/e2e/vue-router/basic/src/main.tsx index c2293018fc..3e5ac6f1e0 100644 --- a/e2e/vue-router/basic/src/main.tsx +++ b/e2e/vue-router/basic/src/main.tsx @@ -1,4 +1,4 @@ -import { createApp, defineComponent } from 'vue' +import { createApp } from 'vue' import { ErrorComponent, Link, @@ -133,20 +133,6 @@ function PostErrorComponent({ error }: ErrorComponentProps) { return } -const PostComponent = defineComponent({ - setup() { - const post = postRoute.useLoaderData() - - return () => ( -
-

{post.value.title}

-
-
{post.value.body}
-
- ) - }, -}) - const postRoute = createRoute({ getParentRoute: () => postsRoute, path: '$postId', @@ -155,6 +141,18 @@ const postRoute = createRoute({ component: PostComponent, }) +function PostComponent() { + const post = postRoute.useLoaderData() + + return ( +
+

{post.value.title}

+
+
{post.value.body}
+
+ ) +} + const layoutRoute = createRoute({ getParentRoute: () => rootRoute, id: '_layout', @@ -317,30 +315,14 @@ const paramsPsNamedIndexRoute = createRoute({ }, }) -const ParamsNamedFoo = defineComponent({ - setup() { - const p = paramsPsNamedFooRoute.useParams() - return () => ( -
-

ParamsNamedFoo

-
{JSON.stringify(p.value)}
-
- ) - }, -}) - const paramsPsNamedFooRoute = createRoute({ getParentRoute: () => paramsPsNamedRoute, path: '/$foo', - component: ParamsNamedFoo, -}) - -const ParamsNamedFooMarkdown = defineComponent({ - setup() { - const p = paramsPsNamedFooPrefixRoute.useParams() - return () => ( + component: function ParamsNamedFoo() { + const p = paramsPsNamedFooRoute.useParams() + return (
-

ParamsNamedFooPrefix

+

ParamsNamedFoo

{JSON.stringify(p.value)}
) @@ -350,15 +332,11 @@ const ParamsNamedFooMarkdown = defineComponent({ const paramsPsNamedFooPrefixRoute = createRoute({ getParentRoute: () => paramsPsNamedRoute, path: '/prefix{$foo}', - component: ParamsNamedFooMarkdown, -}) - -const ParamsNamedFooSuffix = defineComponent({ - setup() { - const p = paramsPsNamedFooSuffixRoute.useParams() - return () => ( + component: function ParamsNamedFooMarkdown() { + const p = paramsPsNamedFooPrefixRoute.useParams() + return (
-

ParamsNamedFooSuffix

+

ParamsNamedFooPrefix

{JSON.stringify(p.value)}
) @@ -368,7 +346,15 @@ const ParamsNamedFooSuffix = defineComponent({ const paramsPsNamedFooSuffixRoute = createRoute({ getParentRoute: () => paramsPsNamedRoute, path: '/{$foo}suffix', - component: ParamsNamedFooSuffix, + component: function ParamsNamedFooSuffix() { + const p = paramsPsNamedFooSuffixRoute.useParams() + return ( +
+

ParamsNamedFooSuffix

+
{JSON.stringify(p.value)}
+
+ ) + }, }) const paramsPsWildcardRoute = createRoute({ @@ -384,30 +370,14 @@ const paramsPsWildcardIndexRoute = createRoute({ }, }) -const ParamsWildcardSplat = defineComponent({ - setup() { - const p = paramsPsWildcardSplatRoute.useParams() - return () => ( -
-

ParamsWildcardSplat

-
{JSON.stringify(p.value)}
-
- ) - }, -}) - const paramsPsWildcardSplatRoute = createRoute({ getParentRoute: () => paramsPsWildcardRoute, path: '$', - component: ParamsWildcardSplat, -}) - -const ParamsWildcardSplatPrefix = defineComponent({ - setup() { - const p = paramsPsWildcardSplatPrefixRoute.useParams() - return () => ( + component: function ParamsWildcardSplat() { + const p = paramsPsWildcardSplatRoute.useParams() + return (
-

ParamsWildcardSplatPrefix

+

ParamsWildcardSplat

{JSON.stringify(p.value)}
) @@ -417,15 +387,11 @@ const ParamsWildcardSplatPrefix = defineComponent({ const paramsPsWildcardSplatPrefixRoute = createRoute({ getParentRoute: () => paramsPsWildcardRoute, path: 'prefix{$}', - component: ParamsWildcardSplatPrefix, -}) - -const ParamsWildcardSplatSuffix = defineComponent({ - setup() { - const p = paramsPsWildcardSplatSuffixRoute.useParams() - return () => ( + component: function ParamsWildcardSplatPrefix() { + const p = paramsPsWildcardSplatPrefixRoute.useParams() + return (
-

ParamsWildcardSplatSuffix

+

ParamsWildcardSplatPrefix

{JSON.stringify(p.value)}
) @@ -435,7 +401,15 @@ const ParamsWildcardSplatSuffix = defineComponent({ const paramsPsWildcardSplatSuffixRoute = createRoute({ getParentRoute: () => paramsPsWildcardRoute, path: '{$}suffix', - component: ParamsWildcardSplatSuffix, + component: function ParamsWildcardSplatSuffix() { + const p = paramsPsWildcardSplatSuffixRoute.useParams() + return ( +
+

ParamsWildcardSplatSuffix

+
{JSON.stringify(p.value)}
+
+ ) + }, }) const routeTree = rootRoute.addChildren([ diff --git a/e2e/vue-router/basic/src/posts.lazy.tsx b/e2e/vue-router/basic/src/posts.lazy.tsx index a236404d84..b2df740010 100644 --- a/e2e/vue-router/basic/src/posts.lazy.tsx +++ b/e2e/vue-router/basic/src/posts.lazy.tsx @@ -1,39 +1,36 @@ -import { defineComponent } from 'vue' import { Link, Outlet, createLazyRoute } from '@tanstack/vue-router' -const PostsComponent = defineComponent({ - setup() { - const posts = Route.useLoaderData() - - return () => ( -
-
    - {[ - ...posts.value, - { id: 'i-do-not-exist', title: 'Non-existent Post' }, - ].map((post) => { - return ( -
  • - -
    {post.title.substring(0, 20)}
    - -
  • - ) - })} -
- -
- ) - }, -}) - export const Route = createLazyRoute('/posts')({ component: PostsComponent, }) + +function PostsComponent() { + const posts = Route.useLoaderData() + + return ( +
+
    + {[ + ...posts.value, + { id: 'i-do-not-exist', title: 'Non-existent Post' }, + ].map((post) => { + return ( +
  • + +
    {post.title.substring(0, 20)}
    + +
  • + ) + })} +
+ +
+ ) +} diff --git a/e2e/vue-router/basic/src/posts.ts b/e2e/vue-router/basic/src/posts.ts index f72d16fee3..e859645746 100644 --- a/e2e/vue-router/basic/src/posts.ts +++ b/e2e/vue-router/basic/src/posts.ts @@ -8,7 +8,11 @@ type PostType = { body: string } -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export const fetchPosts = async () => { console.info('Fetching posts...') diff --git a/e2e/vue-router/basic/tests/app.spec.ts b/e2e/vue-router/basic/tests/app.spec.ts index 9c0a6b6901..ec0e24d8a4 100644 --- a/e2e/vue-router/basic/tests/app.spec.ts +++ b/e2e/vue-router/basic/tests/app.spec.ts @@ -1,7 +1,8 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from '../package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/vue-router/basic/tests/params.spec.ts b/e2e/vue-router/basic/tests/params.spec.ts index f673138047..ac18f39864 100644 --- a/e2e/vue-router/basic/tests/params.spec.ts +++ b/e2e/vue-router/basic/tests/params.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' test.describe('params operations + prefix/suffix', () => { test.beforeEach(async ({ page }) => { diff --git a/e2e/vue-router/basic/tests/setup/global.setup.ts b/e2e/vue-router/basic/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/vue-router/basic/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/vue-router/basic/tests/setup/global.teardown.ts b/e2e/vue-router/basic/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/vue-router/basic/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/vue-router/generator-cli-only/package.json b/e2e/vue-router/generator-cli-only/package.json index f9324643ac..53e2cc1366 100644 --- a/e2e/vue-router/generator-cli-only/package.json +++ b/e2e/vue-router/generator-cli-only/package.json @@ -8,7 +8,7 @@ "build": "tsr generate && vite build && tsc --noEmit", "preview": "vite preview", "start": "tsr generate && vite", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/vue-router/generator-cli-only/playwright.config.ts b/e2e/vue-router/generator-cli-only/playwright.config.ts index 4eead86444..c9d9a76ae7 100644 --- a/e2e/vue-router/generator-cli-only/playwright.config.ts +++ b/e2e/vue-router/generator-cli-only/playwright.config.ts @@ -1,7 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -12,15 +17,18 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `pnpm build && pnpm preview --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/vue-router/generator-cli-only/src/posts.ts b/e2e/vue-router/generator-cli-only/src/posts.ts index f72d16fee3..e859645746 100644 --- a/e2e/vue-router/generator-cli-only/src/posts.ts +++ b/e2e/vue-router/generator-cli-only/src/posts.ts @@ -8,7 +8,11 @@ type PostType = { body: string } -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export const fetchPosts = async () => { console.info('Fetching posts...') diff --git a/e2e/vue-router/generator-cli-only/src/routes/posts.$postId.tsx b/e2e/vue-router/generator-cli-only/src/routes/posts.$postId.tsx index bb2d728afd..f4f1b04f88 100644 --- a/e2e/vue-router/generator-cli-only/src/routes/posts.$postId.tsx +++ b/e2e/vue-router/generator-cli-only/src/routes/posts.$postId.tsx @@ -1,21 +1,7 @@ -import { defineComponent } from 'vue' import { ErrorComponent, createFileRoute } from '@tanstack/vue-router' import { fetchPost } from '../posts' import type { ErrorComponentProps } from '@tanstack/vue-router' -const PostComponent = defineComponent({ - setup() { - const post = Route.useLoaderData() - - return () => ( -
-

{post.value.title}

-
{post.value.body}
-
- ) - }, -}) - export const Route = createFileRoute('/posts/$postId')({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent, @@ -28,3 +14,14 @@ export const Route = createFileRoute('/posts/$postId')({ export function PostErrorComponent({ error }: ErrorComponentProps) { return } + +function PostComponent() { + const post = Route.useLoaderData() + + return ( +
+

{post.value.title}

+
{post.value.body}
+
+ ) +} diff --git a/e2e/vue-router/generator-cli-only/src/routes/posts.route.tsx b/e2e/vue-router/generator-cli-only/src/routes/posts.route.tsx index 518bdc3d70..eaaa35fd5c 100644 --- a/e2e/vue-router/generator-cli-only/src/routes/posts.route.tsx +++ b/e2e/vue-router/generator-cli-only/src/routes/posts.route.tsx @@ -1,42 +1,39 @@ -import { defineComponent } from 'vue' import { Link, Outlet, createFileRoute } from '@tanstack/vue-router' import { fetchPosts } from '../posts' -const PostsLayoutComponent = defineComponent({ - setup() { - const posts = Route.useLoaderData() - - return () => ( -
-
    - {[ - ...posts.value, - { id: 'i-do-not-exist', title: 'Non-existent Post' }, - ].map((post) => { - return ( -
  • - -
    {post.title.substring(0, 20)}
    - -
  • - ) - })} -
-
- -
- ) - }, -}) - export const Route = createFileRoute('/posts')({ loader: fetchPosts, component: PostsLayoutComponent, }) + +function PostsLayoutComponent() { + const posts = Route.useLoaderData() + + return ( +
+
    + {[ + ...posts.value, + { id: 'i-do-not-exist', title: 'Non-existent Post' }, + ].map((post) => { + return ( +
  • + +
    {post.title.substring(0, 20)}
    + +
  • + ) + })} +
+
+ +
+ ) +} diff --git a/e2e/vue-router/generator-cli-only/tests/app.spec.ts b/e2e/vue-router/generator-cli-only/tests/app.spec.ts index ced5ac9310..5a83a314f2 100644 --- a/e2e/vue-router/generator-cli-only/tests/app.spec.ts +++ b/e2e/vue-router/generator-cli-only/tests/app.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/vue-router/generator-cli-only/tests/setup/global.setup.ts b/e2e/vue-router/generator-cli-only/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/vue-router/generator-cli-only/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/vue-router/generator-cli-only/tests/setup/global.teardown.ts b/e2e/vue-router/generator-cli-only/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/vue-router/generator-cli-only/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/vue-router/js-only-file-based/package.json b/e2e/vue-router/js-only-file-based/package.json index cda098978c..0ac86a7a56 100644 --- a/e2e/vue-router/js-only-file-based/package.json +++ b/e2e/vue-router/js-only-file-based/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/vue-router/js-only-file-based/playwright.config.ts b/e2e/vue-router/js-only-file-based/playwright.config.ts index 0925936d55..4f93bc1413 100644 --- a/e2e/vue-router/js-only-file-based/playwright.config.ts +++ b/e2e/vue-router/js-only-file-based/playwright.config.ts @@ -1,7 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -13,15 +18,18 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `pnpm build && pnpm preview --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/vue-router/js-only-file-based/src/posts.js b/e2e/vue-router/js-only-file-based/src/posts.js index 36c1c281f6..979e5e381c 100644 --- a/e2e/vue-router/js-only-file-based/src/posts.js +++ b/e2e/vue-router/js-only-file-based/src/posts.js @@ -2,7 +2,11 @@ import axios from 'redaxios' export class NotFoundError extends Error {} -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export const fetchPosts = async () => { console.info('Fetching posts...') diff --git a/e2e/vue-router/js-only-file-based/src/routes/posts.$postId.jsx b/e2e/vue-router/js-only-file-based/src/routes/posts.$postId.jsx index 05599a6780..b769e23862 100644 --- a/e2e/vue-router/js-only-file-based/src/routes/posts.$postId.jsx +++ b/e2e/vue-router/js-only-file-based/src/routes/posts.$postId.jsx @@ -1,22 +1,8 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' import { ErrorComponent } from '@tanstack/vue-router' import { fetchPost } from '../posts' -const PostComponent = defineComponent({ - setup() { - const post = Route.useLoaderData() - - return () => ( -
-

{post.value.title}

-
{post.value.body}
-
- ) - }, -}) - export const Route = createFileRoute('/posts/$postId')({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent, @@ -29,3 +15,14 @@ export const Route = createFileRoute('/posts/$postId')({ export function PostErrorComponent({ error }) { return } + +function PostComponent() { + const post = Route.useLoaderData() + + return ( +
+

{post.value.title}

+
{post.value.body}
+
+ ) +} diff --git a/e2e/vue-router/js-only-file-based/src/routes/posts.route.jsx b/e2e/vue-router/js-only-file-based/src/routes/posts.route.jsx index 5925dbed54..c1fef7213d 100644 --- a/e2e/vue-router/js-only-file-based/src/routes/posts.route.jsx +++ b/e2e/vue-router/js-only-file-based/src/routes/posts.route.jsx @@ -1,44 +1,41 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' import { Link, Outlet } from '@tanstack/vue-router' import { fetchPosts } from '../posts' -const PostsLayoutComponent = defineComponent({ - setup() { - const posts = Route.useLoaderData() - - return () => ( -
-
    - {[ - ...posts.value, - { id: 'i-do-not-exist', title: 'Non-existent Post' }, - ].map((post) => { - return ( -
  • - -
    {post.title.substring(0, 20)}
    - -
  • - ) - })} -
-
- -
- ) - }, -}) - export const Route = createFileRoute('/posts')({ loader: fetchPosts, component: PostsLayoutComponent, }) + +function PostsLayoutComponent() { + const posts = Route.useLoaderData() + + return ( +
+
    + {[ + ...posts.value, + { id: 'i-do-not-exist', title: 'Non-existent Post' }, + ].map((post) => { + return ( +
  • + +
    {post.title.substring(0, 20)}
    + +
  • + ) + })} +
+
+ +
+ ) +} diff --git a/e2e/vue-router/js-only-file-based/tests/app.spec.ts b/e2e/vue-router/js-only-file-based/tests/app.spec.ts index ced5ac9310..5a83a314f2 100644 --- a/e2e/vue-router/js-only-file-based/tests/app.spec.ts +++ b/e2e/vue-router/js-only-file-based/tests/app.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/vue-router/js-only-file-based/tests/setup/global.setup.ts b/e2e/vue-router/js-only-file-based/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/vue-router/js-only-file-based/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/vue-router/js-only-file-based/tests/setup/global.teardown.ts b/e2e/vue-router/js-only-file-based/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/vue-router/js-only-file-based/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/vue-router/rspack-basic-file-based/package.json b/e2e/vue-router/rspack-basic-file-based/package.json index 93439f7d5b..449511d8fd 100644 --- a/e2e/vue-router/rspack-basic-file-based/package.json +++ b/e2e/vue-router/rspack-basic-file-based/package.json @@ -7,7 +7,7 @@ "build": "rsbuild build && tsc --noEmit", "preview": "rsbuild preview", "start": "rsbuild preview", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/vue-router": "workspace:^", @@ -17,7 +17,7 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.3.1", + "@rsbuild/core": "^2.1.0", "@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-file-based/playwright.config.ts b/e2e/vue-router/rspack-basic-file-based/playwright.config.ts index 4eead86444..5f20415459 100644 --- a/e2e/vue-router/rspack-basic-file-based/playwright.config.ts +++ b/e2e/vue-router/rspack-basic-file-based/playwright.config.ts @@ -1,7 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -12,15 +17,18 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `pnpm build && pnpm preview --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + command: `PUBLIC_NODE_ENV="test" PUBLIC_EXTERNAL_PORT=${EXTERNAL_PORT} PUBLIC_SERVER_PORT=${PORT} pnpm build && PUBLIC_NODE_ENV="test" PUBLIC_EXTERNAL_PORT=${EXTERNAL_PORT} PUBLIC_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/vue-router/rspack-basic-file-based/rsbuild.config.ts b/e2e/vue-router/rspack-basic-file-based/rsbuild.config.ts index c91449b6c3..d5e4b7456c 100644 --- a/e2e/vue-router/rspack-basic-file-based/rsbuild.config.ts +++ b/e2e/vue-router/rspack-basic-file-based/rsbuild.config.ts @@ -12,6 +12,19 @@ export default defineConfig({ pluginVue(), pluginVueJsx(), ], + source: { + define: { + // Rsbuild only defines `import.meta.env.PUBLIC_*` when the env var exists. + // When it doesn't, rspack can transform `import.meta.env` to `void 0`, which + // makes `import.meta.env.PUBLIC_*` crash at runtime. + 'import.meta.env.PUBLIC_NODE_ENV': JSON.stringify( + process.env.PUBLIC_NODE_ENV ?? '', + ), + 'import.meta.env.PUBLIC_EXTERNAL_PORT': JSON.stringify( + process.env.PUBLIC_EXTERNAL_PORT ?? '', + ), + }, + }, tools: { rspack: { plugins: [tanstackRouter({ target: 'vue', autoCodeSplitting: true })], diff --git a/e2e/vue-router/rspack-basic-file-based/src/posts.tsx b/e2e/vue-router/rspack-basic-file-based/src/posts.tsx index 5f5463a668..0b557a0f65 100644 --- a/e2e/vue-router/rspack-basic-file-based/src/posts.tsx +++ b/e2e/vue-router/rspack-basic-file-based/src/posts.tsx @@ -7,7 +7,11 @@ export type PostType = { body: string } -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.PUBLIC_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.PUBLIC_EXTERNAL_PORT}` +} export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/vue-router/rspack-basic-file-based/src/routes/posts.$postId.tsx b/e2e/vue-router/rspack-basic-file-based/src/routes/posts.$postId.tsx index a86ea0762f..e271c139f5 100644 --- a/e2e/vue-router/rspack-basic-file-based/src/routes/posts.$postId.tsx +++ b/e2e/vue-router/rspack-basic-file-based/src/routes/posts.$postId.tsx @@ -1,4 +1,3 @@ -import { defineComponent } from 'vue' import { ErrorComponent, createFileRoute } from '@tanstack/vue-router' import { fetchPost } from '../posts' import type { ErrorComponentProps } from '@tanstack/vue-router' @@ -7,19 +6,6 @@ export function PostErrorComponent({ error }: ErrorComponentProps) { return } -const PostComponent = defineComponent({ - setup() { - const post = Route.useLoaderData() - - return () => ( -
-

{post.value.title}

-
{post.value.body}
-
- ) - }, -}) - export const Route = createFileRoute('/posts/$postId')({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent, @@ -28,3 +14,14 @@ export const Route = createFileRoute('/posts/$postId')({ }, component: PostComponent, }) + +function PostComponent() { + const post = Route.useLoaderData() + + return ( +
+

{post.value.title}

+
{post.value.body}
+
+ ) +} diff --git a/e2e/vue-router/rspack-basic-file-based/src/routes/posts.tsx b/e2e/vue-router/rspack-basic-file-based/src/routes/posts.tsx index 90744370ff..653918c370 100644 --- a/e2e/vue-router/rspack-basic-file-based/src/routes/posts.tsx +++ b/e2e/vue-router/rspack-basic-file-based/src/routes/posts.tsx @@ -1,43 +1,40 @@ -import { defineComponent } from 'vue' import { Link, Outlet, createFileRoute } from '@tanstack/vue-router' import { fetchPosts } from '../posts' -const PostsComponent = defineComponent({ - setup() { - const posts = Route.useLoaderData() - - return () => ( -
-
    - {[ - ...posts.value, - { id: 'i-do-not-exist', title: 'Non-existent Post' }, - ].map((post) => { - return ( -
  • - -
    {post.title.substring(0, 20)}
    - -
  • - ) - })} -
-
- -
- ) - }, -}) - export const Route = createFileRoute('/posts')({ loader: fetchPosts, component: PostsComponent, }) + +function PostsComponent() { + const posts = Route.useLoaderData() + + return ( +
+
    + {[ + ...posts.value, + { id: 'i-do-not-exist', title: 'Non-existent Post' }, + ].map((post) => { + return ( +
  • + +
    {post.title.substring(0, 20)}
    + +
  • + ) + })} +
+
+ +
+ ) +} diff --git a/e2e/vue-router/rspack-basic-file-based/tests/app.spec.ts b/e2e/vue-router/rspack-basic-file-based/tests/app.spec.ts index d230263bfe..10beff655f 100644 --- a/e2e/vue-router/rspack-basic-file-based/tests/app.spec.ts +++ b/e2e/vue-router/rspack-basic-file-based/tests/app.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/vue-router/rspack-basic-file-based/tests/setup/global.setup.ts b/e2e/vue-router/rspack-basic-file-based/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/vue-router/rspack-basic-file-based/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/vue-router/rspack-basic-file-based/tests/setup/global.teardown.ts b/e2e/vue-router/rspack-basic-file-based/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/vue-router/rspack-basic-file-based/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} 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 536435a09e..944210cd10 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 @@ -7,7 +7,7 @@ "build": "rsbuild build && tsc --noEmit", "preview": "rsbuild preview", "start": "rsbuild preview", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/vue-router": "workspace:^", @@ -17,7 +17,7 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.3.1", + "@rsbuild/core": "^2.1.0", "@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/playwright.config.ts b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/playwright.config.ts index 1c1d021f2f..bf3adc082c 100644 --- a/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/playwright.config.ts +++ b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/playwright.config.ts @@ -1,7 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -12,15 +17,18 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `pnpm build && pnpm start --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + command: `PUBLIC_NODE_ENV="test" PUBLIC_EXTERNAL_PORT=${EXTERNAL_PORT} PUBLIC_SERVER_PORT=${PORT} pnpm build && PUBLIC_SERVER_PORT=${PORT} pnpm start --port ${PORT}`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/rsbuild.config.ts b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/rsbuild.config.ts index e5c7e8b77e..b09f6ccda8 100644 --- a/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/rsbuild.config.ts +++ b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/rsbuild.config.ts @@ -12,6 +12,19 @@ export default defineConfig({ pluginVue(), pluginVueJsx(), ], + source: { + define: { + // Rsbuild only defines `import.meta.env.PUBLIC_*` when the env var exists. + // When it doesn't, rspack can transform `import.meta.env` to `void 0`, which + // makes `import.meta.env.PUBLIC_*` crash at runtime. + 'import.meta.env.PUBLIC_NODE_ENV': JSON.stringify( + process.env.PUBLIC_NODE_ENV ?? '', + ), + 'import.meta.env.PUBLIC_EXTERNAL_PORT': JSON.stringify( + process.env.PUBLIC_EXTERNAL_PORT ?? '', + ), + }, + }, tools: { rspack: { plugins: [ diff --git a/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/src/posts.tsx b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/src/posts.tsx index 5f5463a668..0b557a0f65 100644 --- a/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/src/posts.tsx +++ b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/src/posts.tsx @@ -7,7 +7,11 @@ export type PostType = { body: string } -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.PUBLIC_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.PUBLIC_EXTERNAL_PORT}` +} export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx index 5e3fe4d130..cb1924e993 100644 --- a/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx +++ b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts-detail.tsx @@ -1,4 +1,3 @@ -import { defineComponent } from 'vue' import { ErrorComponent, createFileRoute } from '@tanstack/vue-router' import { fetchPost } from '../../posts' import type { ErrorComponentProps } from '@tanstack/vue-router' @@ -7,19 +6,6 @@ export function PostErrorComponent({ error }: ErrorComponentProps) { return } -const PostComponent = defineComponent({ - setup() { - const post = Route.useLoaderData() - - return () => ( -
-

{post.value.title}

-
{post.value.body}
-
- ) - }, -}) - export const Route = createFileRoute('/posts/$postId')({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent as any, @@ -28,3 +14,14 @@ export const Route = createFileRoute('/posts/$postId')({ }, component: PostComponent, }) + +function PostComponent() { + const post = Route.useLoaderData() + + return ( +
+

{post.value.title}

+
{post.value.body}
+
+ ) +} diff --git a/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx index 2a4e8deddd..265faaf650 100644 --- a/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx +++ b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/src/routes/posts/posts.tsx @@ -1,42 +1,39 @@ -import { defineComponent } from 'vue' import { Link, Outlet, createFileRoute } from '@tanstack/vue-router' import { fetchPosts } from '../../posts' -const PostsComponent = defineComponent({ - setup() { - const posts = Route.useLoaderData() - - return () => ( -
-
    - {[ - ...posts.value, - { id: 'i-do-not-exist', title: 'Non-existent Post' }, - ].map((post) => { - return ( -
  • - -
    {post.title.substring(0, 20)}
    - -
  • - ) - })} -
-
- -
- ) - }, -}) - export const Route = createFileRoute('/posts')({ loader: fetchPosts, component: PostsComponent, }) + +function PostsComponent() { + const posts = Route.useLoaderData() + + return ( +
+
    + {[ + ...posts.value, + { id: 'i-do-not-exist', title: 'Non-existent Post' }, + ].map((post) => { + return ( +
  • + +
    {post.title.substring(0, 20)}
    + +
  • + ) + })} +
+
+ +
+ ) +} diff --git a/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/tests/app.spec.ts b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/tests/app.spec.ts index d230263bfe..10beff655f 100644 --- a/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/tests/app.spec.ts +++ b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/tests/app.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/tests/setup/global.setup.ts b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/tests/setup/global.teardown.ts b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/vue-router/scroll-restoration-sandbox-vite/package.json b/e2e/vue-router/scroll-restoration-sandbox-vite/package.json index d071ee546a..f735fce364 100644 --- a/e2e/vue-router/scroll-restoration-sandbox-vite/package.json +++ b/e2e/vue-router/scroll-restoration-sandbox-vite/package.json @@ -11,7 +11,7 @@ "start": "vite", "test:e2e:browser": "VITE_APP_HISTORY=browser playwright test --config=playwright.browser.config.ts --project=chromium", "test:e2e:hash": "VITE_APP_HISTORY=hash playwright test --config=playwright.hash.config.ts --project=chromium", - "test:e2e": "pnpm run test:e2e:browser && pnpm run test:e2e:hash" + "test:e2e": "rm -rf port*.txt; pnpm run test:e2e:browser && pnpm run test:e2e:hash" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", @@ -31,15 +31,5 @@ "typescript": "~5.8.3", "vite": "^8.0.14", "vue-tsc": "^3.3.8" - }, - "nx": { - "targets": { - "test:e2e": { - "outputs": [ - "...", - "{projectRoot}/dist-hash" - ] - } - } } } diff --git a/e2e/vue-router/scroll-restoration-sandbox-vite/playwright.browser.config.ts b/e2e/vue-router/scroll-restoration-sandbox-vite/playwright.browser.config.ts index e2681daea5..9d7691f0fd 100644 --- a/e2e/vue-router/scroll-restoration-sandbox-vite/playwright.browser.config.ts +++ b/e2e/vue-router/scroll-restoration-sandbox-vite/playwright.browser.config.ts @@ -1,7 +1,15 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, + resolveRuntimeSuffix, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort( + packageJson.name + `-${resolveRuntimeSuffix('browser')}`, +) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -12,15 +20,18 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_APP_HISTORY=browser pnpm build && VITE_APP_HISTORY=browser pnpm preview --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=browser pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=browser pnpm preview --port ${PORT}`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/vue-router/scroll-restoration-sandbox-vite/playwright.hash.config.ts b/e2e/vue-router/scroll-restoration-sandbox-vite/playwright.hash.config.ts index 445616b9bd..80a340cef4 100644 --- a/e2e/vue-router/scroll-restoration-sandbox-vite/playwright.hash.config.ts +++ b/e2e/vue-router/scroll-restoration-sandbox-vite/playwright.hash.config.ts @@ -1,7 +1,15 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, + resolveRuntimeSuffix, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort( + packageJson.name + `-${resolveRuntimeSuffix('hash')}`, +) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -12,15 +20,18 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `VITE_APP_HISTORY=hash vite build --outDir dist-hash && VITE_APP_HISTORY=hash pnpm preview --port ${PORT} --outDir dist-hash`, - wait: appServerReady, - reuseExistingServer: false, + command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=hash vite build --outDir dist-hash && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} VITE_APP_HISTORY=hash pnpm preview --port ${PORT} --outDir dist-hash`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/vue-router/scroll-restoration-sandbox-vite/src/posts.tsx b/e2e/vue-router/scroll-restoration-sandbox-vite/src/posts.tsx index bc56dff904..c6cba486ab 100644 --- a/e2e/vue-router/scroll-restoration-sandbox-vite/src/posts.tsx +++ b/e2e/vue-router/scroll-restoration-sandbox-vite/src/posts.tsx @@ -12,7 +12,11 @@ export type PostType = { export class PostNotFoundError extends Error {} -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/vue-router/scroll-restoration-sandbox-vite/tests/app.spec.ts b/e2e/vue-router/scroll-restoration-sandbox-vite/tests/app.spec.ts index 067f0341c4..5f226c6db3 100644 --- a/e2e/vue-router/scroll-restoration-sandbox-vite/tests/app.spec.ts +++ b/e2e/vue-router/scroll-restoration-sandbox-vite/tests/app.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' import { toRuntimePath } from '@tanstack/router-e2e-utils' test('Smoke - Renders home', async ({ page }) => { diff --git a/e2e/vue-router/scroll-restoration-sandbox-vite/tests/setup/global.setup.ts b/e2e/vue-router/scroll-restoration-sandbox-vite/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/vue-router/scroll-restoration-sandbox-vite/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/vue-router/scroll-restoration-sandbox-vite/tests/setup/global.teardown.ts b/e2e/vue-router/scroll-restoration-sandbox-vite/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/vue-router/scroll-restoration-sandbox-vite/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/vue-router/scroll-restoration-sandbox-vite/tsconfig.json b/e2e/vue-router/scroll-restoration-sandbox-vite/tsconfig.json index b47cca9589..3e5b04987f 100644 --- a/e2e/vue-router/scroll-restoration-sandbox-vite/tsconfig.json +++ b/e2e/vue-router/scroll-restoration-sandbox-vite/tsconfig.json @@ -12,5 +12,5 @@ "allowJs": true, "types": ["vite/client", "node"] }, - "exclude": ["node_modules", "dist", "dist-hash"] + "exclude": ["node_modules", "dist"] } diff --git a/e2e/vue-router/sentry-integration/package.json b/e2e/vue-router/sentry-integration/package.json index 045ddd99be..344a338a27 100644 --- a/e2e/vue-router/sentry-integration/package.json +++ b/e2e/vue-router/sentry-integration/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@sentry/vue": "^10.32.0", diff --git a/e2e/vue-router/sentry-integration/playwright.config.ts b/e2e/vue-router/sentry-integration/playwright.config.ts index 6a684ac89e..0c5cee43e4 100644 --- a/e2e/vue-router/sentry-integration/playwright.config.ts +++ b/e2e/vue-router/sentry-integration/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,8 +20,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && VITE_SERVER_PORT=${PORT} pnpm preview --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/vue-router/view-transitions/package.json b/e2e/vue-router/view-transitions/package.json index 21a0f1d8a0..5466ded0ed 100644 --- a/e2e/vue-router/view-transitions/package.json +++ b/e2e/vue-router/view-transitions/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "vite", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/vue-router/view-transitions/playwright.config.ts b/e2e/vue-router/view-transitions/playwright.config.ts index 4eead86444..c5de6b5611 100644 --- a/e2e/vue-router/view-transitions/playwright.config.ts +++ b/e2e/vue-router/view-transitions/playwright.config.ts @@ -1,7 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -17,10 +22,13 @@ export default defineConfig({ baseURL, }, + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + webServer: { - command: `pnpm build && pnpm preview --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + command: `VITE_NODE_ENV="test" VITE_SERVER_PORT=${PORT} VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && pnpm preview --port ${PORT}`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/vue-router/view-transitions/src/routes/posts.$postId.tsx b/e2e/vue-router/view-transitions/src/routes/posts.$postId.tsx index a86ea0762f..e271c139f5 100644 --- a/e2e/vue-router/view-transitions/src/routes/posts.$postId.tsx +++ b/e2e/vue-router/view-transitions/src/routes/posts.$postId.tsx @@ -1,4 +1,3 @@ -import { defineComponent } from 'vue' import { ErrorComponent, createFileRoute } from '@tanstack/vue-router' import { fetchPost } from '../posts' import type { ErrorComponentProps } from '@tanstack/vue-router' @@ -7,19 +6,6 @@ export function PostErrorComponent({ error }: ErrorComponentProps) { return } -const PostComponent = defineComponent({ - setup() { - const post = Route.useLoaderData() - - return () => ( -
-

{post.value.title}

-
{post.value.body}
-
- ) - }, -}) - export const Route = createFileRoute('/posts/$postId')({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent, @@ -28,3 +14,14 @@ export const Route = createFileRoute('/posts/$postId')({ }, component: PostComponent, }) + +function PostComponent() { + const post = Route.useLoaderData() + + return ( +
+

{post.value.title}

+
{post.value.body}
+
+ ) +} diff --git a/e2e/vue-router/view-transitions/src/routes/posts.route.tsx b/e2e/vue-router/view-transitions/src/routes/posts.route.tsx index 6802b073f6..01d90b7ad6 100644 --- a/e2e/vue-router/view-transitions/src/routes/posts.route.tsx +++ b/e2e/vue-router/view-transitions/src/routes/posts.route.tsx @@ -1,46 +1,43 @@ -import { defineComponent } from 'vue' import { Link, Outlet, createFileRoute } from '@tanstack/vue-router' import { fetchPosts } from '../posts' -const PostsLayoutComponent = defineComponent({ - setup() { - const posts = Route.useLoaderData() - - return () => ( -
-
    - {[ - ...posts.value, - { id: 'i-do-not-exist', title: 'Non-existent Post' }, - ].map((post) => { - return ( -
  • - -
    {post.title.substring(0, 20)}
    - -
  • - ) - })} -
-
-
- -
-
- ) - }, -}) - export const Route = createFileRoute('/posts')({ loader: fetchPosts, component: PostsLayoutComponent, }) + +function PostsLayoutComponent() { + const posts = Route.useLoaderData() + + return ( +
+
    + {[ + ...posts.value, + { id: 'i-do-not-exist', title: 'Non-existent Post' }, + ].map((post) => { + return ( +
  • + +
    {post.title.substring(0, 20)}
    + +
  • + ) + })} +
+
+
+ +
+
+ ) +} diff --git a/e2e/vue-router/view-transitions/tests/app.spec.ts b/e2e/vue-router/view-transitions/tests/app.spec.ts index 6c1ccf1a6e..472bd6ed0b 100644 --- a/e2e/vue-router/view-transitions/tests/app.spec.ts +++ b/e2e/vue-router/view-transitions/tests/app.spec.ts @@ -1,4 +1,4 @@ -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { test } from '@playwright/test' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/vue-router/view-transitions/tests/setup/global.setup.ts b/e2e/vue-router/view-transitions/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/vue-router/view-transitions/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/vue-router/view-transitions/tests/setup/global.teardown.ts b/e2e/vue-router/view-transitions/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/vue-router/view-transitions/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/vue-router/view-transitions/tests/view-transitions.spec.ts b/e2e/vue-router/view-transitions/tests/view-transitions.spec.ts index e62662a1d2..31d8b12b04 100644 --- a/e2e/vue-router/view-transitions/tests/view-transitions.spec.ts +++ b/e2e/vue-router/view-transitions/tests/view-transitions.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' test.beforeEach(async ({ page }) => { await page.addInitScript(() => { diff --git a/e2e/vue-start/basic-auth/package.json b/e2e/vue-start/basic-auth/package.json index 7f6fb798da..0c22edfc4c 100644 --- a/e2e/vue-start/basic-auth/package.json +++ b/e2e/vue-start/basic-auth/package.json @@ -10,7 +10,7 @@ "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", "prisma-generate": "prisma generate", - "test:e2e": "mkdir -p .tmp; rm -f .tmp/dev.db .tmp/dev.db-journal .tmp/dev.db-wal .tmp/dev.db-shm; export DATABASE_URL=file:./.tmp/dev.db; pnpm run prisma-generate && pnpm exec prisma migrate deploy && playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; mkdir -p .tmp; rm -f .tmp/dev.db .tmp/dev.db-journal .tmp/dev.db-wal .tmp/dev.db-shm; export DATABASE_URL=file:./.tmp/dev.db; pnpm run prisma-generate && pnpm exec prisma migrate deploy && playwright test --project=chromium" }, "dependencies": { "@libsql/client": "^0.15.15", @@ -19,7 +19,6 @@ "@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" @@ -33,21 +32,10 @@ "@vitejs/plugin-vue-jsx": "^5.1.5", "dotenv": "^17.2.3", "prisma": "^7.0.0", - "srvx": "^1.0.0", + "srvx": "^0.11.9", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" - }, - "nx": { - "targets": { - "test:e2e": { - "outputs": [ - "...", - "{projectRoot}/.tmp", - "{projectRoot}/src/prisma-generated" - ] - } - } } } diff --git a/e2e/vue-start/basic-auth/playwright.config.ts b/e2e/vue-start/basic-auth/playwright.config.ts index 82678ac00b..18b8905468 100644 --- a/e2e/vue-start/basic-auth/playwright.config.ts +++ b/e2e/vue-start/basic-auth/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,8 +20,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/vue-start/basic-auth/src/components/DefaultCatchBoundary.tsx b/e2e/vue-start/basic-auth/src/components/DefaultCatchBoundary.tsx index 0687372ae0..02caf56456 100644 --- a/e2e/vue-start/basic-auth/src/components/DefaultCatchBoundary.tsx +++ b/e2e/vue-start/basic-auth/src/components/DefaultCatchBoundary.tsx @@ -1,5 +1,3 @@ -import { defineComponent } from 'vue' -import type { PropType } from 'vue' import { ErrorComponent, Link, @@ -8,54 +6,46 @@ import { } from '@tanstack/vue-router' import type { ErrorComponentProps } from '@tanstack/vue-router' -export const DefaultCatchBoundary = defineComponent({ - props: { - error: { - type: Object as PropType, - required: true, - }, - }, - setup(props) { - const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', - }) - return () => { - console.error(props.error) - return ( -
- -
- - {isRoot.value ? ( - - Home - - ) : ( - { - e.preventDefault() - window.history.back() - }} - > - Go Back - - )} -
-
- ) - } - }, -}) +export function DefaultCatchBoundary({ error }: ErrorComponentProps) { + const router = useRouter() + const isRoot = useLocation({ + select: (location) => location.pathname === '/', + }) + + console.error(error) + + return ( +
+ +
+ + {isRoot.value ? ( + + Home + + ) : ( + { + e.preventDefault() + window.history.back() + }} + > + Go Back + + )} +
+
+ ) +} diff --git a/e2e/vue-start/basic-auth/src/routes/__root.tsx b/e2e/vue-start/basic-auth/src/routes/__root.tsx index e5b6f6778f..89802cfd2f 100644 --- a/e2e/vue-start/basic-auth/src/routes/__root.tsx +++ b/e2e/vue-start/basic-auth/src/routes/__root.tsx @@ -1,5 +1,4 @@ /// -import { defineComponent } from 'vue' import { Body, HeadContent, @@ -16,69 +15,21 @@ 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 { getAppSession } from '~/utils/session.js' +import { useAppSession } 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 getAppSession() + const session = await useAppSession() - if (!session.userEmail) { + if (!session.data.userEmail) { return null } return { - email: session.userEmail, + email: session.data.userEmail, } }) -const RootShell = defineComponent({ - setup(_, { slots }) { - const routeContext = Route.useRouteContext() - return () => ( - - - - - -
- - Home - {' '} - - Posts - -
- {routeContext.value.user ? ( - <> - {routeContext.value.user.email} - Logout - - ) : ( - Login - )} -
-
-
- {slots.default?.()} - - - - - ) - }, -}) - export const Route = createRootRoute({ beforeLoad: async () => { const user = await fetchUser() @@ -130,3 +81,50 @@ export const Route = createRootRoute({ notFoundComponent: () => , component: () => , }) + +function RootShell(_: unknown, { slots }: { slots: any }) { + const routeContext = Route.useRouteContext() + + return ( + + + + + +
+ + Home + {' '} + + Posts + +
+ {routeContext.value.user ? ( + <> + {routeContext.value.user.email} + Logout + + ) : ( + Login + )} +
+
+
+ {slots.default?.()} + + + + + ) +} diff --git a/e2e/vue-start/basic-auth/src/routes/_authed.tsx b/e2e/vue-start/basic-auth/src/routes/_authed.tsx index 606de3e487..ba88e3beac 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 { getAppSession } from '~/utils/session' +import { useAppSession } from '~/utils/session' export const loginFn = createServerFn({ method: 'POST', @@ -37,11 +37,12 @@ export const loginFn = createServerFn({ } // Create a session - const session = await getAppSession() + const session = await useAppSession() // Store the user's email in the session - session.userEmail = user.email - await session.save() + await session.update({ + userEmail: user.email, + }) }) export const Route = createFileRoute('/_authed')({ diff --git a/e2e/vue-start/basic-auth/src/routes/_authed/posts.$postId.tsx b/e2e/vue-start/basic-auth/src/routes/_authed/posts.$postId.tsx index 45d6bbab0d..da0c26f27f 100644 --- a/e2e/vue-start/basic-auth/src/routes/_authed/posts.$postId.tsx +++ b/e2e/vue-start/basic-auth/src/routes/_authed/posts.$postId.tsx @@ -1,4 +1,3 @@ -import { defineComponent } from 'vue' import { ErrorComponent, createFileRoute } from '@tanstack/vue-router' import type { ErrorComponentProps } from '@tanstack/vue-router' @@ -9,18 +8,6 @@ export function PostErrorComponent({ error }: ErrorComponentProps) { return } -const PostComponent = defineComponent({ - setup() { - const post = Route.useLoaderData() - return () => ( -
-

{post.value.title}

-
{post.value.body}
-
- ) - }, -}) - export const Route = createFileRoute('/_authed/posts/$postId')({ loader: ({ params: { postId } }) => fetchPost({ data: postId }), errorComponent: PostErrorComponent, @@ -29,3 +16,14 @@ export const Route = createFileRoute('/_authed/posts/$postId')({ return Post not found }, }) + +function PostComponent() { + const post = Route.useLoaderData() + + return ( +
+

{post.value.title}

+
{post.value.body}
+
+ ) +} diff --git a/e2e/vue-start/basic-auth/src/routes/_authed/posts.tsx b/e2e/vue-start/basic-auth/src/routes/_authed/posts.tsx index 6b8b54c666..cfac133b51 100644 --- a/e2e/vue-start/basic-auth/src/routes/_authed/posts.tsx +++ b/e2e/vue-start/basic-auth/src/routes/_authed/posts.tsx @@ -1,38 +1,36 @@ -import { defineComponent } from 'vue' import { Link, Outlet, createFileRoute } from '@tanstack/vue-router' import { fetchPosts } from '~/utils/posts.js' -const PostsComponent = defineComponent({ - setup() { - const posts = Route.useLoaderData() - return () => ( -
-
    - {[ - ...posts.value, - { id: 'i-do-not-exist', title: 'Non-existent Post' }, - ].map((post) => ( -
  • - -
    {post.title.substring(0, 20)}
    - -
  • - ))} -
-
- -
- ) - }, -}) +function PostsComponent() { + const posts = Route.useLoaderData() + + return ( +
+
    + {[ + ...posts.value, + { id: 'i-do-not-exist', title: 'Non-existent Post' }, + ].map((post) => ( +
  • + +
    {post.title.substring(0, 20)}
    + +
  • + ))} +
+
+ +
+ ) +} export const Route = createFileRoute('/_authed/posts')({ loader: () => fetchPosts(), diff --git a/e2e/vue-start/basic-auth/src/routes/logout.tsx b/e2e/vue-start/basic-auth/src/routes/logout.tsx index 8372b33608..f1d7b58e29 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 { getAppSession } from '~/utils/session' +import { useAppSession } from '~/utils/session' const logoutFn = createServerFn({ method: 'POST' }).handler(async () => { - const session = await getAppSession() + const session = await useAppSession() - session.destroy() + session.clear() 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 5f37f109c7..eade8363e6 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 { getAppSession } from '~/utils/session' +import { useAppSession } 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 getAppSession() + const session = await useAppSession() if (found) { if (found.password !== password) { @@ -37,8 +37,9 @@ export const signupFn = createServerFn({ } // Store the user's email in the session - session.userEmail = found.email - await session.save() + await session.update({ + userEmail: found.email, + }) // Redirect to the prev page stored in the "redirect" search param throw redirect({ @@ -55,8 +56,9 @@ export const signupFn = createServerFn({ }) // Store the user's email in the session - session.userEmail = user.email - await session.save() + await session.update({ + userEmail: user.email, + }) // 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 7d078225a0..7cf2a41792 100644 --- a/e2e/vue-start/basic-auth/src/utils/session.ts +++ b/e2e/vue-start/basic-auth/src/utils/session.ts @@ -1,25 +1,13 @@ -import { getIronSession } from 'iron-session' -import { getCookie, setCookie } from '@tanstack/vue-start/server' +// src/services/session.server.ts +import { useSession } from '@tanstack/vue-start/server' import type { User } from '~/prisma-generated/client' type SessionUser = { userEmail: User['email'] } -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: '/', - }, - }, - ) +export function useAppSession() { + return useSession({ + password: 'ChangeThisBeforeShippingToProdOrYouWillBeFired', + }) } diff --git a/e2e/vue-start/basic-cloudflare/package.json b/e2e/vue-start/basic-cloudflare/package.json index 5ab77db8fc..612a6b8d19 100644 --- a/e2e/vue-start/basic-cloudflare/package.json +++ b/e2e/vue-start/basic-cloudflare/package.json @@ -10,7 +10,7 @@ "preview": "vite preview", "cf-typegen": "wrangler types", "postinstall": "WRANGLER_LOG=warn npm run --silent cf-typegen", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/vue-router": "workspace:^", @@ -31,15 +31,5 @@ "@vitejs/plugin-vue": "^6.0.5", "@vitejs/plugin-vue-jsx": "^5.1.5", "wrangler": "^4.74.0" - }, - "nx": { - "targets": { - "test:e2e": { - "outputs": [ - "...", - "{projectRoot}/.wrangler/deploy" - ] - } - } } } diff --git a/e2e/vue-start/basic-cloudflare/playwright.config.ts b/e2e/vue-start/basic-cloudflare/playwright.config.ts index 0925936d55..a545dff891 100644 --- a/e2e/vue-start/basic-cloudflare/playwright.config.ts +++ b/e2e/vue-start/basic-cloudflare/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -13,6 +14,9 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, @@ -20,8 +24,8 @@ export default defineConfig({ webServer: { command: `pnpm build && pnpm preview --port ${PORT}`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/vue-start/basic-cloudflare/src/components/DefaultCatchBoundary.tsx b/e2e/vue-start/basic-cloudflare/src/components/DefaultCatchBoundary.tsx index 0687372ae0..02caf56456 100644 --- a/e2e/vue-start/basic-cloudflare/src/components/DefaultCatchBoundary.tsx +++ b/e2e/vue-start/basic-cloudflare/src/components/DefaultCatchBoundary.tsx @@ -1,5 +1,3 @@ -import { defineComponent } from 'vue' -import type { PropType } from 'vue' import { ErrorComponent, Link, @@ -8,54 +6,46 @@ import { } from '@tanstack/vue-router' import type { ErrorComponentProps } from '@tanstack/vue-router' -export const DefaultCatchBoundary = defineComponent({ - props: { - error: { - type: Object as PropType, - required: true, - }, - }, - setup(props) { - const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', - }) - return () => { - console.error(props.error) - return ( -
- -
- - {isRoot.value ? ( - - Home - - ) : ( - { - e.preventDefault() - window.history.back() - }} - > - Go Back - - )} -
-
- ) - } - }, -}) +export function DefaultCatchBoundary({ error }: ErrorComponentProps) { + const router = useRouter() + const isRoot = useLocation({ + select: (location) => location.pathname === '/', + }) + + console.error(error) + + return ( +
+ +
+ + {isRoot.value ? ( + + Home + + ) : ( + { + e.preventDefault() + window.history.back() + }} + > + Go Back + + )} +
+
+ ) +} diff --git a/e2e/vue-start/basic-cloudflare/src/routes/index.tsx b/e2e/vue-start/basic-cloudflare/src/routes/index.tsx index d3a020c7ad..1c708a7ec6 100644 --- a/e2e/vue-start/basic-cloudflare/src/routes/index.tsx +++ b/e2e/vue-start/basic-cloudflare/src/routes/index.tsx @@ -1,21 +1,7 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' import { createServerFn } from '@tanstack/vue-start' import { env } from 'cloudflare:workers' -const Home = defineComponent({ - setup() { - const data = Route.useLoaderData() - return () => ( -
-

Welcome Home!!!

-

{data.value.message}

-

{data.value.myVar}

-
- ) - }, -}) - export const Route = createFileRoute('/')({ loader: () => getData(), component: Home, @@ -27,3 +13,15 @@ const getData = createServerFn().handler(() => { myVar: env.MY_VAR, } }) + +function Home() { + const data = Route.useLoaderData() + + return ( +
+

Welcome Home!!!

+

{data.value.message}

+

{data.value.myVar}

+
+ ) +} diff --git a/e2e/vue-start/basic-cloudflare/src/routes/static.tsx b/e2e/vue-start/basic-cloudflare/src/routes/static.tsx index 14d0c06294..7b0f9fd232 100644 --- a/e2e/vue-start/basic-cloudflare/src/routes/static.tsx +++ b/e2e/vue-start/basic-cloudflare/src/routes/static.tsx @@ -1,20 +1,7 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' import { createServerFn } from '@tanstack/vue-start' import { env } from 'cloudflare:workers' -const StaticPage = defineComponent({ - setup() { - const data = Route.useLoaderData() - return () => ( -
-

Static Page

-

The value is {data.value.myVar}

-
- ) - }, -}) - export const Route = createFileRoute('/static')({ loader: () => getData(), component: StaticPage, @@ -25,3 +12,14 @@ const getData = createServerFn().handler(() => { myVar: env.MY_VAR, } }) + +function StaticPage() { + const data = Route.useLoaderData() + + return ( +
+

Static Page

+

The value is {data.value.myVar}

+
+ ) +} diff --git a/e2e/vue-start/basic-cloudflare/tests/setup/global.setup.ts b/e2e/vue-start/basic-cloudflare/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/vue-start/basic-cloudflare/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/vue-start/basic-cloudflare/tests/setup/global.teardown.ts b/e2e/vue-start/basic-cloudflare/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/vue-start/basic-cloudflare/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/vue-start/basic-tsr-config/package.json b/e2e/vue-start/basic-tsr-config/package.json index 828dce5b2a..9884efa343 100644 --- a/e2e/vue-start/basic-tsr-config/package.json +++ b/e2e/vue-start/basic-tsr-config/package.json @@ -8,7 +8,7 @@ "dev:e2e": "vite dev", "build": "rimraf ./count.txt && vite build && tsc --noEmit", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/vue-router": "workspace:^", @@ -19,7 +19,7 @@ "devDependencies": { "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", - "srvx": "^1.0.0", + "srvx": "^0.11.9", "@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-tsr-config/playwright.config.ts b/e2e/vue-start/basic-tsr-config/playwright.config.ts index e6b92ce385..f6dd61ba6c 100644 --- a/e2e/vue-start/basic-tsr-config/playwright.config.ts +++ b/e2e/vue-start/basic-tsr-config/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -20,8 +21,8 @@ export default defineConfig({ webServer: { command: `pnpm build && VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/vue-start/basic-tsr-config/src/app/routes/index.tsx b/e2e/vue-start/basic-tsr-config/src/app/routes/index.tsx index b4b520e8af..3f4de50817 100644 --- a/e2e/vue-start/basic-tsr-config/src/app/routes/index.tsx +++ b/e2e/vue-start/basic-tsr-config/src/app/routes/index.tsx @@ -1,4 +1,3 @@ -import { defineComponent } from 'vue' import * as fs from 'node:fs' import { createFileRoute, useRouter } from '@tanstack/vue-router' import { createServerFn } from '@tanstack/vue-start' @@ -18,26 +17,25 @@ const updateCount = createServerFn({ method: 'POST' }) const count = await getCount() await fs.promises.writeFile(filePath, `${count + data}`) }) -const Home = defineComponent({ - setup() { - const router = useRouter() - const state = Route.useLoaderData() - return () => ( - - ) - }, -}) - export const Route = createFileRoute('/')({ component: Home, loader: async () => await getCount(), }) + +function Home() { + const router = useRouter() + const state = Route.useLoaderData() + + return ( + + ) +} diff --git a/e2e/vue-start/basic-vue-query/package.json b/e2e/vue-start/basic-vue-query/package.json index ab9589376d..1003bd2e27 100644 --- a/e2e/vue-start/basic-vue-query/package.json +++ b/e2e/vue-start/basic-vue-query/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/vue-query": "^5.92.1", @@ -30,7 +30,7 @@ "@types/node": "^22.10.2", "@vitejs/plugin-vue": "^6.0.5", "@vitejs/plugin-vue-jsx": "^5.1.5", - "srvx": "^1.0.0", + "srvx": "^0.11.9", "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-vue-query/playwright.config.ts b/e2e/vue-start/basic-vue-query/playwright.config.ts index 0618b7272a..84636ab0f9 100644 --- a/e2e/vue-start/basic-vue-query/playwright.config.ts +++ b/e2e/vue-start/basic-vue-query/playwright.config.ts @@ -1,7 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` @@ -11,18 +16,18 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { baseURL, }, webServer: { - command: `pnpm build && PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', - env: { - NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, - }, }, projects: [ diff --git a/e2e/vue-start/basic-vue-query/src/routes/api.users.ts b/e2e/vue-start/basic-vue-query/src/routes/api.users.ts index f9330a87db..cab4cafc3f 100644 --- a/e2e/vue-start/basic-vue-query/src/routes/api.users.ts +++ b/e2e/vue-start/basic-vue-query/src/routes/api.users.ts @@ -2,7 +2,11 @@ import { createFileRoute } from '@tanstack/vue-router' import axios from 'redaxios' import type { User } from '../utils/users' -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export const Route = createFileRoute('/api/users')({ server: { diff --git a/e2e/vue-start/basic-vue-query/src/routes/api/users.$id.ts b/e2e/vue-start/basic-vue-query/src/routes/api/users.$id.ts index d138746730..4cc4b33a0b 100644 --- a/e2e/vue-start/basic-vue-query/src/routes/api/users.$id.ts +++ b/e2e/vue-start/basic-vue-query/src/routes/api/users.$id.ts @@ -2,7 +2,11 @@ import { createFileRoute } from '@tanstack/vue-router' import axios from 'redaxios' import type { User } from '../../utils/users' -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export const Route = createFileRoute('/api/users/$id')({ server: { diff --git a/e2e/vue-start/basic-vue-query/src/routes/posts.$postId.tsx b/e2e/vue-start/basic-vue-query/src/routes/posts.$postId.tsx index fd8deaf291..27baf4bd5f 100644 --- a/e2e/vue-start/basic-vue-query/src/routes/posts.$postId.tsx +++ b/e2e/vue-start/basic-vue-query/src/routes/posts.$postId.tsx @@ -1,4 +1,3 @@ -import { defineComponent } from 'vue' import { useQuery } from '@tanstack/vue-query' import { ErrorComponent, @@ -12,30 +11,27 @@ export function PostErrorComponent(props: ErrorComponentProps) { return } -const PostComponent = defineComponent({ - setup() { - const params = Route.useParams() - const postQuery = useQuery(() => postQueryOptions(params.value.postId)) - return () => ( -
-

- {postQuery.data.value?.title} -

-
{postQuery.data.value?.body}
- - Deep View - -
- ) - }, -}) +function PostComponent() { + const params = Route.useParams() + const postQuery = useQuery(() => postQueryOptions(params.value.postId)) + + return ( +
+

{postQuery.data.value?.title}

+
{postQuery.data.value?.body}
+ + Deep View + +
+ ) +} export const Route = createFileRoute('/posts/$postId')({ loader: async ({ context, params }) => { diff --git a/e2e/vue-start/basic-vue-query/src/routes/posts_.$postId.deep.tsx b/e2e/vue-start/basic-vue-query/src/routes/posts_.$postId.deep.tsx index 211b3ca4b1..38e7429f6e 100644 --- a/e2e/vue-start/basic-vue-query/src/routes/posts_.$postId.deep.tsx +++ b/e2e/vue-start/basic-vue-query/src/routes/posts_.$postId.deep.tsx @@ -1,26 +1,22 @@ -import { defineComponent } from 'vue' import { Link, createFileRoute } from '@tanstack/vue-router' import { useQuery } from '@tanstack/vue-query' import { postQueryOptions } from '../utils/posts' import { PostErrorComponent } from './posts.$postId' -const PostDeepComponent = defineComponent({ - setup() { - const params = Route.useParams() - const postQuery = useQuery(() => postQueryOptions(params.value.postId)) - return () => ( -
- - ← All Posts - -

- {postQuery.data.value?.title} -

-
{postQuery.data.value?.body}
-
- ) - }, -}) +function PostDeepComponent() { + const params = Route.useParams() + const postQuery = useQuery(() => postQueryOptions(params.value.postId)) + + return ( +
+ + ← All Posts + +

{postQuery.data.value?.title}

+
{postQuery.data.value?.body}
+
+ ) +} export const Route = createFileRoute('/posts_/$postId/deep')({ loader: async ({ params: { postId }, context }) => { diff --git a/e2e/vue-start/basic-vue-query/src/routes/suspense-transition.tsx b/e2e/vue-start/basic-vue-query/src/routes/suspense-transition.tsx index f5004aa21d..6d12790dc9 100644 --- a/e2e/vue-start/basic-vue-query/src/routes/suspense-transition.tsx +++ b/e2e/vue-start/basic-vue-query/src/routes/suspense-transition.tsx @@ -1,6 +1,6 @@ import { queryOptions, useQuery } from '@tanstack/vue-query' import { Link, createFileRoute } from '@tanstack/vue-router' -import { defineComponent, ref, watchEffect } from 'vue' +import { ref, watchEffect } from 'vue' const doubleQueryOptions = (n: number) => queryOptions({ @@ -19,37 +19,6 @@ export const Route = createFileRoute('/suspense-transition')({ ssr: false, // Disable SSR to avoid suspense issues during initial load }) -const Result = defineComponent({ - setup() { - const search = Route.useSearch() - const doubleQuery = useQuery(() => doubleQueryOptions(search.value.n)) - const displayedN = ref(search.value.n) - const displayedDouble = ref(undefined) - watchEffect(() => { - if (doubleQuery.data.value !== undefined) { - displayedN.value = search.value.n - displayedDouble.value = doubleQuery.data.value - } - }) - return () => ( -
-
- Loading... -
-
-
- n: {displayedN.value} -
-
- double:{' '} - {displayedDouble.value} -
-
-
- ) - }, -}) - function SuspenseTransitionComponent() { return (
@@ -70,3 +39,34 @@ function SuspenseTransitionComponent() {
) } + +function Result() { + const search = Route.useSearch() + const doubleQuery = useQuery(() => doubleQueryOptions(search.value.n)) + const displayedN = ref(search.value.n) + const displayedDouble = ref(undefined) + + watchEffect(() => { + if (doubleQuery.data.value !== undefined) { + displayedN.value = search.value.n + displayedDouble.value = doubleQuery.data.value + } + }) + + return ( +
+
+ Loading... +
+
+
+ n: {displayedN.value} +
+
+ double:{' '} + {displayedDouble.value} +
+
+
+ ) +} diff --git a/e2e/vue-start/basic-vue-query/src/routes/transition/count/query.tsx b/e2e/vue-start/basic-vue-query/src/routes/transition/count/query.tsx index 32b1943c71..2ab0562203 100644 --- a/e2e/vue-start/basic-vue-query/src/routes/transition/count/query.tsx +++ b/e2e/vue-start/basic-vue-query/src/routes/transition/count/query.tsx @@ -1,4 +1,3 @@ -import { defineComponent } from 'vue' import { Link, createFileRoute } from '@tanstack/vue-router' import { queryOptions, useQuery } from '@tanstack/vue-query' import { z } from 'zod' @@ -17,32 +16,6 @@ const doubleQueryOptions = (n: number) => placeholderData: (oldData) => oldData, }) -const TransitionPage = defineComponent({ - setup() { - const search = Route.useSearch() - const doubleQuery = useQuery(() => doubleQueryOptions(search.value.n)) - return () => ( -
- ({ n: s.n + 1 })} - > - Increase - - -
-
n: {doubleQuery.data.value?.n}
-
- double: {doubleQuery.data.value?.double} -
-
-
- ) - }, -}) - export const Route = createFileRoute('/transition/count/query')({ validateSearch: searchSchema, loader: ({ context: { queryClient }, location }) => { @@ -51,3 +24,28 @@ export const Route = createFileRoute('/transition/count/query')({ }, component: TransitionPage, }) + +function TransitionPage() { + const search = Route.useSearch() + const doubleQuery = useQuery(() => doubleQueryOptions(search.value.n)) + + return ( +
+ ({ n: s.n + 1 })} + > + Increase + + +
+
n: {doubleQuery.data.value?.n}
+
+ double: {doubleQuery.data.value?.double} +
+
+
+ ) +} diff --git a/e2e/vue-start/basic-vue-query/src/routes/users.$userId.tsx b/e2e/vue-start/basic-vue-query/src/routes/users.$userId.tsx index bf1b75861e..91376b9498 100644 --- a/e2e/vue-start/basic-vue-query/src/routes/users.$userId.tsx +++ b/e2e/vue-start/basic-vue-query/src/routes/users.$userId.tsx @@ -1,4 +1,3 @@ -import { defineComponent } from 'vue' import { useQuery } from '@tanstack/vue-query' import { ErrorComponent, createFileRoute } from '@tanstack/vue-router' import type { ErrorComponentProps } from '@tanstack/vue-router' @@ -6,20 +5,19 @@ import type { ErrorComponentProps } from '@tanstack/vue-router' import { NotFound } from '~/components/NotFound' import { userQueryOptions } from '~/utils/users' -const UserComponent = defineComponent({ - setup() { - const params = Route.useParams() - const userQuery = useQuery(() => userQueryOptions(params.value.userId)) - return () => ( -
-

- {userQuery.data.value?.name ?? 'loading...'} -

-
{userQuery.data.value?.email ?? ''}
-
- ) - }, -}) +function UserComponent() { + const params = Route.useParams() + const userQuery = useQuery(() => userQueryOptions(params.value.userId)) + + return ( +
+

+ {userQuery.data.value?.name ?? 'loading...'} +

+
{userQuery.data.value?.email ?? ''}
+
+ ) +} export const Route = createFileRoute('/users/$userId')({ loader: async ({ context, params: { userId } }) => { diff --git a/e2e/vue-start/basic-vue-query/src/utils/posts.tsx b/e2e/vue-start/basic-vue-query/src/utils/posts.tsx index c6b5e70a0b..b0a0b8f60d 100644 --- a/e2e/vue-start/basic-vue-query/src/utils/posts.tsx +++ b/e2e/vue-start/basic-vue-query/src/utils/posts.tsx @@ -7,7 +7,11 @@ export type PostType = { body: string } -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export const postsQueryOptions = () => queryOptions({ diff --git a/e2e/vue-start/basic-vue-query/src/utils/users.tsx b/e2e/vue-start/basic-vue-query/src/utils/users.tsx index fe7a902fa2..29bf08c315 100644 --- a/e2e/vue-start/basic-vue-query/src/utils/users.tsx +++ b/e2e/vue-start/basic-vue-query/src/utils/users.tsx @@ -1,6 +1,4 @@ import { queryOptions } from '@tanstack/vue-query' -import { createIsomorphicFn } from '@tanstack/vue-start' -import { getRequestUrl } from '@tanstack/vue-start/server' import axios from 'redaxios' export type User = { @@ -9,16 +7,17 @@ export type User = { email: string } -const getOrigin = createIsomorphicFn() - .server(() => getRequestUrl().origin) - .client(() => window.location.origin) +const PORT = + import.meta.env.VITE_SERVER_PORT || process.env.VITE_SERVER_PORT || 3000 + +export const DEPLOY_URL = `http://localhost:${PORT}` export const usersQueryOptions = () => queryOptions({ queryKey: ['users'], queryFn: () => axios - .get>(getOrigin() + '/api/users') + .get>(DEPLOY_URL + '/api/users') .then((r) => r.data) .catch(() => { throw new Error('Failed to fetch users') @@ -30,7 +29,7 @@ export const userQueryOptions = (id: string) => queryKey: ['users', id], queryFn: () => axios - .get(getOrigin() + '/api/users/' + id) + .get(DEPLOY_URL + '/api/users/' + id) .then((r) => r.data) .catch(() => { throw new Error('Failed to fetch user') diff --git a/e2e/vue-start/basic-vue-query/tests/app.spec.ts b/e2e/vue-start/basic-vue-query/tests/app.spec.ts index 4ce5c20ef7..ab2469f68d 100644 --- a/e2e/vue-start/basic-vue-query/tests/app.spec.ts +++ b/e2e/vue-start/basic-vue-query/tests/app.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' test('Navigating to post', async ({ page }) => { await page.goto('/') diff --git a/e2e/vue-start/basic-vue-query/tests/setup/global.setup.ts b/e2e/vue-start/basic-vue-query/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/vue-start/basic-vue-query/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/vue-start/basic-vue-query/tests/setup/global.teardown.ts b/e2e/vue-start/basic-vue-query/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/vue-start/basic-vue-query/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/vue-start/basic-vue-query/tests/transition.spec.ts b/e2e/vue-start/basic-vue-query/tests/transition.spec.ts index a0f3bf0964..2c28fc72a2 100644 --- a/e2e/vue-start/basic-vue-query/tests/transition.spec.ts +++ b/e2e/vue-start/basic-vue-query/tests/transition.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' test('transitions/count/query should keep old values visible during navigation', async ({ page, diff --git a/e2e/vue-start/basic/package.json b/e2e/vue-start/basic/package.json index 2ff8329543..6d456525b5 100644 --- a/e2e/vue-start/basic/package.json +++ b/e2e/vue-start/basic/package.json @@ -6,12 +6,12 @@ "scripts": { "dev": "vite dev --port 3000", "dev:e2e": "vite dev", - "build": "pnpm build:vite", + "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "node server.js", - "test:e2e:local": "playwright test --project=chromium", - "build:vite": "vite build && tsc --noEmit", - "build:rsbuild": "rsbuild build && tsc --noEmit" + "test:e2e:startDummyServer": "node -e 'import(\"./tests/setup/global.setup.ts\").then(m => m.default())' & node -e 'import(\"./tests/setup/waitForDummyServer.ts\").then(m => m.default())'", + "test:e2e:stopDummyServer": "node -e 'import(\"./tests/setup/global.teardown.ts\").then(m => m.default())'", + "test:e2e:local": "playwright test --project=chromium" }, "dependencies": { "@tanstack/vue-router": "workspace:^", @@ -27,7 +27,7 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.3.1", + "@rsbuild/core": "^2.1.0", "@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": "^1.0.0", + "srvx": "^0.11.9", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", @@ -59,10 +59,7 @@ }, { "toolchain": "vite", - "mode": "prerender", - "env": { - "NODE_OPTIONS": "--import=@tanstack/router-e2e-utils/mock-api" - } + "mode": "prerender" }, { "toolchain": "vite", diff --git a/e2e/vue-start/basic/playwright.config.ts b/e2e/vue-start/basic/playwright.config.ts index 9322874f3a..6924134cd1 100644 --- a/e2e/vue-start/basic/playwright.config.ts +++ b/e2e/vue-start/basic/playwright.config.ts @@ -1,37 +1,59 @@ +import fs from 'node:fs' import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } const mode = process.env.MODE ?? 'ssr' - +const e2ePortKey = process.env.E2E_PORT_KEY ?? packageJson.name const distDir = process.env.E2E_DIST_DIR ?? 'dist' -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +if (process.env.TEST_WORKER_INDEX === undefined) { + for (const portFile of [ + `port-${e2ePortKey}.txt`, + `port-${e2ePortKey}_start.txt`, + `port-${e2ePortKey}-external.txt`, + ]) { + fs.rmSync(portFile, { force: true }) + } +} + +const PORT = await getTestServerPort(e2ePortKey) +const START_PORT = await getTestServerPort(`${e2ePortKey}_start`) +const EXTERNAL_PORT = await getDummyServerPort(e2ePortKey) const baseURL = `http://localhost:${PORT}` const commandByMode = mode === 'preview' - ? `pnpm preview --host 0.0.0.0 --outDir ${distDir} --port ${PORT}` - : `pnpm start` + ? `pnpm run test:e2e:startDummyServer && pnpm preview --outDir ${distDir} --port ${PORT}` + : `pnpm run test:e2e:startDummyServer && pnpm start` export default defineConfig({ testDir: './tests', workers: 1, reporter: [['line']], + globalTeardown: './tests/setup/global.teardown.ts', + use: { baseURL, }, webServer: { command: commandByMode, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', env: { - NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, MODE: mode, - START_PORT: '0', + VITE_NODE_ENV: 'test', + VITE_EXTERNAL_PORT: String(EXTERNAL_PORT), + VITE_SERVER_PORT: String(PORT), + START_PORT: String(START_PORT), PORT: String(PORT), E2E_DIST_DIR: distDir, + E2E_PORT_KEY: e2ePortKey, }, }, diff --git a/e2e/vue-start/basic/server.js b/e2e/vue-start/basic/server.js index 3e1ddab400..69c1e4ca91 100644 --- a/e2e/vue-start/basic/server.js +++ b/e2e/vue-start/basic/server.js @@ -1,12 +1,12 @@ +import { toNodeHandler } from 'srvx/node' import fs from 'node:fs' import path from 'node:path' -import { toNodeHandler } from 'srvx/node' import express from 'express' import { createProxyMiddleware } from 'http-proxy-middleware' -const port = Number(process.env.PORT ?? 3000) +const port = process.env.PORT || 3000 -const startPort = Number(process.env.START_PORT ?? 0) +const startPort = process.env.START_PORT || 3001 const isSpaMode = process.env.MODE === 'spa' const isPrerender = process.env.MODE === 'prerender' @@ -49,13 +49,13 @@ export async function createStartServer() { return { app } } -export async function createSpaServer(backendPort) { +export async function createSpaServer() { const app = express() app.use( '/api', createProxyMiddleware({ - target: `http://localhost:${backendPort}/api`, // Replace with your target server's URL + target: `http://localhost:${startPort}/api`, // Replace with your target server's URL changeOrigin: false, // Needed for virtual hosted sites, }), ) @@ -63,7 +63,7 @@ export async function createSpaServer(backendPort) { app.use( '/_serverFn', createProxyMiddleware({ - target: `http://localhost:${backendPort}/_serverFn`, // Replace with your target server's URL + target: `http://localhost:${startPort}/_serverFn`, // Replace with your target server's URL changeOrigin: false, // Needed for virtual hosted sites, }), ) @@ -71,28 +71,31 @@ export async function createSpaServer(backendPort) { app.use(express.static(distClientDir)) app.get('/{*splat}', (req, res) => { - res.sendFile('index.html', { root: distClientDir }) + res.sendFile(path.resolve(distClientDir, 'index.html')) }) return { app } } -// Bind the backend first so the SPA proxy receives the port actually held by it. -const { app: startApp } = await createStartServer() -const backend = startApp.listen(isSpaMode ? startPort : port, async (error) => { - if (error) { - throw error - } - const backendPort = backend.address().port - if (isSpaMode) { - const { app } = await createSpaServer(backendPort) - const frontend = app.listen(port, (frontendError) => { - if (frontendError) { - throw frontendError - } - console.info(`E2E app: http://localhost:${frontend.address().port}`) - }) - } else { - console.info(`E2E app: http://localhost:${backendPort}`) - } -}) +if (isSpaMode) { + createSpaServer().then(async ({ app }) => + app.listen(port, (error) => { + if (error) throw error + console.info(`Client Server: http://localhost:${port}`) + }), + ) + + createStartServer().then(async ({ app }) => + app.listen(startPort, (error) => { + if (error) throw error + console.info(`Start Server: http://localhost:${startPort}`) + }), + ) +} else { + createStartServer().then(async ({ app }) => + app.listen(port, (error) => { + if (error) throw error + console.info(`Start Server: http://localhost:${port}`) + }), + ) +} diff --git a/e2e/vue-start/basic/src/routes/__root.tsx b/e2e/vue-start/basic/src/routes/__root.tsx index 9da2c581fe..4a4bd08afe 100644 --- a/e2e/vue-start/basic/src/routes/__root.tsx +++ b/e2e/vue-start/basic/src/routes/__root.tsx @@ -1,5 +1,4 @@ /// -import { defineComponent } from 'vue' import { Body, ClientOnly, @@ -17,119 +16,6 @@ import { NotFound } from '~/components/NotFound' import '~/styles/app.css' import { seo } from '~/utils/seo' -const RootComponent = defineComponent({ - setup() { - const routerState = useRouterState({ - select: (state) => ({ isLoading: state.isLoading, status: state.status }), - }) - return () => ( - - - - - -
- - Home - {' '} - - Posts - {' '} - - Users - {' '} - - Layout - {' '} - - Scripts - {' '} - - Inline Scripts - {' '} - - Deferred - {' '} - - redirect - {' '} - - Raw Stream - {' '} - - This Route Does Not Exist - -
- - - - -
This is an inline styled div
- - - - - ) - }, -}) - export const Route = createRootRoute({ head: () => ({ meta: [ @@ -184,3 +70,115 @@ export const Route = createRootRoute({ notFoundComponent: () => , component: RootComponent, }) + +function RootComponent() { + const routerState = useRouterState({ + select: (state) => ({ isLoading: state.isLoading, status: state.status }), + }) + + return ( + + + + + +
+ + Home + {' '} + + Posts + {' '} + + Users + {' '} + + Layout + {' '} + + Scripts + {' '} + + Inline Scripts + {' '} + + Deferred + {' '} + + redirect + {' '} + + Raw Stream + {' '} + + This Route Does Not Exist + +
+ + + + +
This is an inline styled div
+ + + + + ) +} diff --git a/e2e/vue-start/basic/src/routes/api/users.$userId.ts b/e2e/vue-start/basic/src/routes/api/users.$userId.ts index 24938d51c2..50b9ca995a 100644 --- a/e2e/vue-start/basic/src/routes/api/users.$userId.ts +++ b/e2e/vue-start/basic/src/routes/api/users.$userId.ts @@ -1,15 +1,19 @@ import { createFileRoute } from '@tanstack/vue-router' import type { User } from '~/utils/users' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} + export const Route = createFileRoute('/api/users/$userId')({ server: { handlers: { GET: async ({ params, request }) => { console.info(`Fetching users by id=${params.userId}... @`, request.url) try { - const res = await fetch( - `https://jsonplaceholder.typicode.com/users/${params.userId}`, - ) + const res = await fetch(`${queryURL}/users/${params.userId}`) if (!res.ok) { throw new Error('Failed to fetch user') } diff --git a/e2e/vue-start/basic/src/routes/api/users.ts b/e2e/vue-start/basic/src/routes/api/users.ts index c6045977b8..97989b93ca 100644 --- a/e2e/vue-start/basic/src/routes/api/users.ts +++ b/e2e/vue-start/basic/src/routes/api/users.ts @@ -38,13 +38,19 @@ const testMiddleware = createMiddleware() return result }) +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} + export const Route = createFileRoute('/api/users')({ server: { middleware: [testMiddleware, userLoggerMiddleware, testParentMiddleware], handlers: { GET: async ({ request }) => { console.info('Fetching users... @', request.url) - const res = await fetch('https://jsonplaceholder.typicode.com/users') + const res = await fetch(`${queryURL}/users`) if (!res.ok) { throw new Error('Failed to fetch users') } diff --git a/e2e/vue-start/basic/src/routes/not-found/index.tsx b/e2e/vue-start/basic/src/routes/not-found/index.tsx index ecd12d1dad..9f7e3b4b33 100644 --- a/e2e/vue-start/basic/src/routes/not-found/index.tsx +++ b/e2e/vue-start/basic/src/routes/not-found/index.tsx @@ -1,10 +1,9 @@ -import { defineComponent } from 'vue' import { Link, createFileRoute } from '@tanstack/vue-router' -const RouteComponent = defineComponent({ - setup() { +export const Route = createFileRoute('/not-found/')({ + component: () => { const preload = Route.useSearch({ select: (s) => s.preload }) - return () => ( + return (
( -
-
- {loaderData.value.parentLoaderData} -
-
- ) - }, -}) - export const Route = createFileRoute('/not-found/parent-boundary')({ loader: () => ({ parentLoaderData: 'ready', @@ -29,3 +15,15 @@ function RouteComponent() {
) } + +function ParentBoundaryNotFoundComponent() { + const loaderData = Route.useLoaderData() + + return ( +
+
+ {loaderData.value.parentLoaderData} +
+
+ ) +} diff --git a/e2e/vue-start/basic/src/routes/posts.$postId.tsx b/e2e/vue-start/basic/src/routes/posts.$postId.tsx index edda7f0017..4d71080d64 100644 --- a/e2e/vue-start/basic/src/routes/posts.$postId.tsx +++ b/e2e/vue-start/basic/src/routes/posts.$postId.tsx @@ -1,32 +1,9 @@ -import { defineComponent } from 'vue' import { Link, createFileRoute } from '@tanstack/vue-router' import { fetchPost } from '~/utils/posts' import { NotFound } from '~/components/NotFound' import { PostErrorComponent } from '~/components/PostErrorComponent' -const PostComponent = defineComponent({ - setup() { - const post = Route.useLoaderData() - return () => ( -
-

{post.value.title}

-
{post.value.body}
- - Deep View - -
- ) - }, -}) - export const Route = createFileRoute('/posts/$postId')({ loader: async ({ params: { postId } }) => fetchPost({ data: postId }), errorComponent: PostErrorComponent, @@ -35,3 +12,24 @@ export const Route = createFileRoute('/posts/$postId')({ return Post not found }, }) + +function PostComponent() { + const post = Route.useLoaderData() + + return ( +
+

{post.value.title}

+
{post.value.body}
+ + Deep View + +
+ ) +} diff --git a/e2e/vue-start/basic/src/routes/posts.tsx b/e2e/vue-start/basic/src/routes/posts.tsx index 64d4754f2f..1a9d58a31d 100644 --- a/e2e/vue-start/basic/src/routes/posts.tsx +++ b/e2e/vue-start/basic/src/routes/posts.tsx @@ -1,36 +1,7 @@ -import { defineComponent } from 'vue' import { Link, Outlet, createFileRoute } from '@tanstack/vue-router' import { fetchPosts } from '~/utils/posts' -const PostsComponent = defineComponent({ - setup() { - const posts = Route.useLoaderData() - return () => ( -
-
    - {posts.value.map((post) => ( -
  • - -
    {post.title.substring(0, 20)}
    - -
  • - ))} -
-
- -
- ) - }, -}) - export const Route = createFileRoute('/posts')({ head: () => ({ meta: [ @@ -42,3 +13,30 @@ export const Route = createFileRoute('/posts')({ loader: async () => fetchPosts(), component: PostsComponent, }) + +function PostsComponent() { + const posts = Route.useLoaderData() + + return ( +
+
    + {posts.value.map((post) => ( +
  • + +
    {post.title.substring(0, 20)}
    + +
  • + ))} +
+
+ +
+ ) +} diff --git a/e2e/vue-start/basic/src/routes/posts_.$postId.deep.tsx b/e2e/vue-start/basic/src/routes/posts_.$postId.deep.tsx index f77ae7d3ab..a52c6f32f7 100644 --- a/e2e/vue-start/basic/src/routes/posts_.$postId.deep.tsx +++ b/e2e/vue-start/basic/src/routes/posts_.$postId.deep.tsx @@ -1,26 +1,24 @@ -import { defineComponent } from 'vue' import { Link, createFileRoute } from '@tanstack/vue-router' import { PostErrorComponent } from '~/components/PostErrorComponent' import { fetchPost } from '~/utils/posts' -const PostDeepComponent = defineComponent({ - setup() { - const post = Route.useLoaderData() - return () => ( -
- - ← All Posts - -

{post.value.title}

-
{post.value.body}
-
- ) - }, -}) - export const Route = createFileRoute('/posts_/$postId/deep')({ loader: async ({ params: { postId } }) => fetchPost({ data: postId }), errorComponent: PostErrorComponent, component: PostDeepComponent, }) + +function PostDeepComponent() { + const post = Route.useLoaderData() + + return ( +
+ + ← All Posts + +

{post.value.title}

+
{post.value.body}
+
+ ) +} diff --git a/e2e/vue-start/basic/src/routes/redirect/$target/index.tsx b/e2e/vue-start/basic/src/routes/redirect/$target/index.tsx index e39bda5bcf..a8c3c75b1f 100644 --- a/e2e/vue-start/basic/src/routes/redirect/$target/index.tsx +++ b/e2e/vue-start/basic/src/routes/redirect/$target/index.tsx @@ -1,10 +1,9 @@ -import { defineComponent } from 'vue' import { Link, createFileRoute } from '@tanstack/vue-router' -const RouteComponent = defineComponent({ - setup() { +export const Route = createFileRoute('/redirect/$target/')({ + component: () => { const preload = Route.useSearch({ select: (s) => s.preload }) - return () => ( + return (
{ const params = Route.useParams() - return () => ( + return (

redirect test with server functions (target {params.value.target}) @@ -88,7 +87,3 @@ const RouteComponent = defineComponent({ ) }, }) - -export const Route = createFileRoute('/redirect/$target/serverFn/')({ - component: RouteComponent, -}) diff --git a/e2e/vue-start/basic/src/routes/redirect/$target/serverFn/via-useServerFn.tsx b/e2e/vue-start/basic/src/routes/redirect/$target/serverFn/via-useServerFn.tsx index 093a591636..399e8ac995 100644 --- a/e2e/vue-start/basic/src/routes/redirect/$target/serverFn/via-useServerFn.tsx +++ b/e2e/vue-start/basic/src/routes/redirect/$target/serverFn/via-useServerFn.tsx @@ -1,12 +1,13 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' import { RedirectOnClick } from '~/components/RedirectOnClick' -const RouteComponent = defineComponent({ - setup() { +export const Route = createFileRoute( + '/redirect/$target/serverFn/via-useServerFn', +)({ + component: () => { const params = Route.useParams() const search = Route.useSearch() - return () => ( + return ( ( - <> -
{search.value.default}
-
{context.value.hello}
- - ) - }, -}) - export const Route = createFileRoute('/search-params/default')({ validateSearch: z.object({ default: z.string().default('d1'), @@ -29,5 +15,14 @@ export const Route = createFileRoute('/search-params/default')({ throw new Error('Context hello is not "world"') } }, - component: RouteComponent, + component: () => { + const search = Route.useSearch() + const context = Route.useRouteContext() + return ( + <> +
{search.value.default}
+
{context.value.hello}
+ + ) + }, }) diff --git a/e2e/vue-start/basic/src/routes/search-params/loader-throws-redirect.tsx b/e2e/vue-start/basic/src/routes/search-params/loader-throws-redirect.tsx index ccd1276387..14b137abc6 100644 --- a/e2e/vue-start/basic/src/routes/search-params/loader-throws-redirect.tsx +++ b/e2e/vue-start/basic/src/routes/search-params/loader-throws-redirect.tsx @@ -1,19 +1,6 @@ -import { defineComponent } from 'vue' import { redirect, createFileRoute } from '@tanstack/vue-router' import { z } from 'zod' -const RouteComponent = defineComponent({ - setup() { - const search = Route.useSearch() - return () => ( -
-

SearchParams

-
{search.value.step}
-
- ) - }, -}) - export const Route = createFileRoute('/search-params/loader-throws-redirect')({ validateSearch: z.object({ step: z.enum(['a', 'b', 'c']).optional(), @@ -27,5 +14,13 @@ export const Route = createFileRoute('/search-params/loader-throws-redirect')({ }) } }, - component: RouteComponent, + component: () => { + const search = Route.useSearch() + return ( +
+

SearchParams

+
{search.value.step}
+
+ ) + }, }) diff --git a/e2e/vue-start/basic/src/routes/specialChars/$param.tsx b/e2e/vue-start/basic/src/routes/specialChars/$param.tsx index ec315ede1f..de3cba0a97 100644 --- a/e2e/vue-start/basic/src/routes/specialChars/$param.tsx +++ b/e2e/vue-start/basic/src/routes/specialChars/$param.tsx @@ -1,18 +1,15 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' -const RouteComponent = defineComponent({ - setup() { - const params = Route.useParams() - return () => ( -
- Hello "/specialChars/$param":{' '} - {params.value.param} -
- ) - }, -}) - export const Route = createFileRoute('/specialChars/$param')({ component: RouteComponent, }) + +function RouteComponent() { + const params = Route.useParams() + return ( +
+ Hello "/specialChars/$param":{' '} + {params.value.param} +
+ ) +} diff --git a/e2e/vue-start/basic/src/routes/specialChars/malformed/$param.tsx b/e2e/vue-start/basic/src/routes/specialChars/malformed/$param.tsx index 2b19e7e36e..7160964549 100644 --- a/e2e/vue-start/basic/src/routes/specialChars/malformed/$param.tsx +++ b/e2e/vue-start/basic/src/routes/specialChars/malformed/$param.tsx @@ -1,20 +1,15 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' -const RouteComponent = defineComponent({ - setup() { - const params = Route.useParams() - return () => ( -
- Hello "/specialChars/malformed/$param":{' '} - - {params.value.param} - -
- ) - }, -}) - export const Route = createFileRoute('/specialChars/malformed/$param')({ component: RouteComponent, }) + +function RouteComponent() { + const params = Route.useParams() + return ( +
+ Hello "/specialChars/malformed/$param":{' '} + {params.value.param} +
+ ) +} diff --git a/e2e/vue-start/basic/src/routes/specialChars/malformed/search.tsx b/e2e/vue-start/basic/src/routes/specialChars/malformed/search.tsx index 8d6ad5b1dd..2438604954 100644 --- a/e2e/vue-start/basic/src/routes/specialChars/malformed/search.tsx +++ b/e2e/vue-start/basic/src/routes/specialChars/malformed/search.tsx @@ -1,24 +1,22 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' import z from 'zod' -const RouteComponent = defineComponent({ - setup() { - const search = Route.useSearch() - return () => ( -
- Hello "/specialChars/malformed/search"! - - {search.value.searchParam} - -
- ) - }, -}) - export const Route = createFileRoute('/specialChars/malformed/search')({ validateSearch: z.object({ searchParam: z.string(), }), component: RouteComponent, }) + +function RouteComponent() { + const search = Route.useSearch() + + return ( +
+ Hello "/specialChars/malformed/search"! + + {search.value.searchParam} + +
+ ) +} diff --git a/e2e/vue-start/basic/src/routes/specialChars/search.tsx b/e2e/vue-start/basic/src/routes/specialChars/search.tsx index b4e022639d..5ba858e747 100644 --- a/e2e/vue-start/basic/src/routes/specialChars/search.tsx +++ b/e2e/vue-start/basic/src/routes/specialChars/search.tsx @@ -1,24 +1,22 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' import z from 'zod' -const RouteComponent = defineComponent({ - setup() { - const search = Route.useSearch() - return () => ( -
- Hello "/specialChars/search"! - - {search.value.searchParam} - -
- ) - }, -}) - export const Route = createFileRoute('/specialChars/search')({ validateSearch: z.object({ searchParam: z.string(), }), component: RouteComponent, }) + +function RouteComponent() { + const search = Route.useSearch() + + return ( +
+ Hello "/specialChars/search"! + + {search.value.searchParam} + +
+ ) +} diff --git a/e2e/vue-start/basic/src/routes/users.$userId.tsx b/e2e/vue-start/basic/src/routes/users.$userId.tsx index 76340cf9fb..420b7e4a50 100644 --- a/e2e/vue-start/basic/src/routes/users.$userId.tsx +++ b/e2e/vue-start/basic/src/routes/users.$userId.tsx @@ -1,4 +1,3 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' import axios from 'redaxios' @@ -7,18 +6,6 @@ import type { User } from '~/utils/users' import { NotFound } from '~/components/NotFound' import { UserErrorComponent } from '~/components/UserErrorComponent' -const UserComponent = defineComponent({ - setup() { - const user = Route.useLoaderData() - return () => ( -
-

{user.value.name}

-
{user.value.email}
-
- ) - }, -}) - export const Route = createFileRoute('/users/$userId')({ loader: async ({ params: { userId } }) => { const router = await getRouterInstance() @@ -35,3 +22,14 @@ export const Route = createFileRoute('/users/$userId')({ return User not found }, }) + +function UserComponent() { + const user = Route.useLoaderData() + + return ( +
+

{user.value.name}

+
{user.value.email}
+
+ ) +} diff --git a/e2e/vue-start/basic/src/routes/users.tsx b/e2e/vue-start/basic/src/routes/users.tsx index 3d8ef31598..1e0b297dd2 100644 --- a/e2e/vue-start/basic/src/routes/users.tsx +++ b/e2e/vue-start/basic/src/routes/users.tsx @@ -1,41 +1,9 @@ -import { defineComponent } from 'vue' import { Link, Outlet, createFileRoute } from '@tanstack/vue-router' import { getRouterInstance } from '@tanstack/vue-start' import axios from 'redaxios' import type { User } from '~/utils/users' -const UsersComponent = defineComponent({ - setup() { - const users = Route.useLoaderData() - return () => ( -
-
    - {[ - ...users.value, - { id: 'i-do-not-exist', name: 'Non-existent User', email: '' }, - ].map((user) => ( -
  • - -
    {user.name}
    - -
  • - ))} -
-
- -
- ) - }, -}) - export const Route = createFileRoute('/users')({ loader: async () => { const router = await getRouterInstance() @@ -48,3 +16,33 @@ export const Route = createFileRoute('/users')({ }, component: UsersComponent, }) + +function UsersComponent() { + const users = Route.useLoaderData() + + return ( +
+
    + {[ + ...users.value, + { id: 'i-do-not-exist', name: 'Non-existent User', email: '' }, + ].map((user) => ( +
  • + +
    {user.name}
    + +
  • + ))} +
+
+ +
+ ) +} diff --git a/e2e/vue-start/basic/src/utils/posts.tsx b/e2e/vue-start/basic/src/utils/posts.tsx index d8e2dc7450..66cb298f83 100644 --- a/e2e/vue-start/basic/src/utils/posts.tsx +++ b/e2e/vue-start/basic/src/utils/posts.tsx @@ -8,12 +8,18 @@ export type PostType = { body: string } +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} + export const fetchPost = createServerFn({ method: 'GET' }) .validator((postId: string) => postId) .handler(async ({ data: postId }) => { console.info(`Fetching post with id ${postId}...`) const post = await axios - .get(`https://jsonplaceholder.typicode.com/posts/${postId}`) + .get(`${queryURL}/posts/${postId}`) .then((r) => r.data) .catch((err) => { console.error(err) @@ -30,7 +36,7 @@ export const fetchPosts = createServerFn({ method: 'GET' }).handler( async () => { console.info('Fetching posts...') return axios - .get>('https://jsonplaceholder.typicode.com/posts') + .get>(`${queryURL}/posts`) .then((r) => r.data.slice(0, 10)) }, ) diff --git a/e2e/vue-start/basic/src/utils/users.tsx b/e2e/vue-start/basic/src/utils/users.tsx index 7ba645b383..46be4b1580 100644 --- a/e2e/vue-start/basic/src/utils/users.tsx +++ b/e2e/vue-start/basic/src/utils/users.tsx @@ -3,3 +3,7 @@ export type User = { name: string email: string } + +const PORT = process.env.VITE_SERVER_PORT || 3000 + +export const DEPLOY_URL = `http://localhost:${PORT}` diff --git a/e2e/vue-start/basic/src/vite-env.d.ts b/e2e/vue-start/basic/src/vite-env.d.ts index 4da6234c8a..e8259b1e33 100644 --- a/e2e/vue-start/basic/src/vite-env.d.ts +++ b/e2e/vue-start/basic/src/vite-env.d.ts @@ -2,6 +2,7 @@ interface ImportMetaEnv { readonly VITE_NODE_ENV: string + readonly VITE_EXTERNAL_PORT: string readonly VITE_SERVER_PORT: string } diff --git a/e2e/vue-start/basic/tests/fixture-api.spec.ts b/e2e/vue-start/basic/tests/fixture-api.spec.ts deleted file mode 100644 index 6c9b26dc4c..0000000000 --- a/e2e/vue-start/basic/tests/fixture-api.spec.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { expect, test } from '@playwright/test' - -test('server API receives canned users without a fixture listener', async ({ - request, -}) => { - const response = await request.get('/api/users') - expect(response.ok()).toBe(true) - const users = await response.json() - expect(users).toHaveLength(10) - expect(users[0]).toMatchObject({ id: 1, name: 'Leanne Graham' }) -}) diff --git a/e2e/vue-start/basic/tests/redirect.spec.ts b/e2e/vue-start/basic/tests/redirect.spec.ts index 8e6ceba5b9..2f6354aa81 100644 --- a/e2e/vue-start/basic/tests/redirect.spec.ts +++ b/e2e/vue-start/basic/tests/redirect.spec.ts @@ -1,14 +1,19 @@ import queryString from 'node:querystring' -import { expect } from '@playwright/test' -import { test } from '@tanstack/router-e2e-utils' +import { expect, type Page } from '@playwright/test' import combinateImport from 'combinate' -import type { Page } from '@playwright/test' +import { + getDummyServerPort, + getTestServerPort, + test, +} from '@tanstack/router-e2e-utils' +import { getE2EPortKey } from './utils/getE2EPortKey.ts' // somehow playwright does not correctly import default exports const combinate = (combinateImport as any).default as typeof combinateImport -const PORT = Number(process.env.E2E_APP_PORT ?? 0) -const EXTERNAL_ORIGIN = `http://127.0.0.1:${PORT}` +const e2ePortKey = getE2EPortKey() +const PORT = await getTestServerPort(e2ePortKey) +const EXTERNAL_HOST_PORT = await getDummyServerPort(e2ePortKey) const POSTS_URL = `http://localhost:${PORT}/posts` async function waitForRouterIdle(page: Page) { @@ -101,7 +106,7 @@ test.describe('redirects', () => { page, }) => { const q = queryString.stringify({ - externalHost: `${EXTERNAL_ORIGIN}/`, + externalHost: `http://localhost:${EXTERNAL_HOST_PORT}/`, }) if (scenario === 'navigate') { @@ -114,7 +119,7 @@ test.describe('redirects', () => { await page.goto(`/redirect/external/via-${thrower}?${q}`) } - const url = `${EXTERNAL_ORIGIN}/` + const url = `http://localhost:${EXTERNAL_HOST_PORT}/` await page.waitForURL(url) expect(page.url()).toBe(url) @@ -135,7 +140,7 @@ test.describe('redirects', () => { }) => { let fullPageLoad = false const q = queryString.stringify({ - externalHost: `${EXTERNAL_ORIGIN}/`, + externalHost: `http://localhost:${EXTERNAL_HOST_PORT}/`, reloadDocument, }) @@ -154,7 +159,10 @@ test.describe('redirects', () => { await page.goto(`/redirect/${target}/serverFn/via-${thrower}?${q}`) } - const url = target === 'internal' ? POSTS_URL : `${EXTERNAL_ORIGIN}/` + const url = + target === 'internal' + ? POSTS_URL + : `http://localhost:${EXTERNAL_HOST_PORT}/` await page.waitForURL(url) expect(page.url()).toBe(url) if (target === 'internal' && scenario === 'navigate') { @@ -176,7 +184,7 @@ test.describe('redirects', () => { page, }) => { const q = queryString.stringify({ - externalHost: `${EXTERNAL_ORIGIN}/`, + externalHost: `http://localhost:${EXTERNAL_HOST_PORT}/`, reloadDocument, }) @@ -193,7 +201,10 @@ test.describe('redirects', () => { await button.click() - const url = target === 'internal' ? POSTS_URL : `${EXTERNAL_ORIGIN}/` + const url = + target === 'internal' + ? POSTS_URL + : `http://localhost:${EXTERNAL_HOST_PORT}/` await page.waitForURL(url) expect(page.url()).toBe(url) if (target === 'internal') { diff --git a/e2e/vue-start/basic/tests/setup/global.setup.ts b/e2e/vue-start/basic/tests/setup/global.setup.ts new file mode 100644 index 0000000000..cd38c35885 --- /dev/null +++ b/e2e/vue-start/basic/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import { getE2EPortKey } from '../utils/getE2EPortKey.ts' + +export default async function setup() { + await e2eStartDummyServer(getE2EPortKey()) +} diff --git a/e2e/vue-start/basic/tests/setup/global.teardown.ts b/e2e/vue-start/basic/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..36e5c92858 --- /dev/null +++ b/e2e/vue-start/basic/tests/setup/global.teardown.ts @@ -0,0 +1,8 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import { getE2EPortKey } from '../utils/getE2EPortKey.ts' + +export default async function teardown() { + try { + await e2eStopDummyServer(getE2EPortKey()) + } catch {} +} diff --git a/e2e/vue-start/basic/tests/setup/waitForDummyServer.ts b/e2e/vue-start/basic/tests/setup/waitForDummyServer.ts new file mode 100644 index 0000000000..88c18fd79e --- /dev/null +++ b/e2e/vue-start/basic/tests/setup/waitForDummyServer.ts @@ -0,0 +1,24 @@ +import { getDummyServerPort } from '@tanstack/router-e2e-utils' +import { getE2EPortKey } from '../utils/getE2EPortKey.ts' + +const timeoutMs = 10_000 +const retryIntervalMs = 100 + +export default async function waitForDummyServer() { + const port = await getDummyServerPort(getE2EPortKey()) + const deadline = Date.now() + timeoutMs + + while (Date.now() < deadline) { + try { + const response = await fetch(`http://localhost:${port}/`) + + if (response.ok) { + return + } + } catch {} + + await new Promise((resolve) => setTimeout(resolve, retryIntervalMs)) + } + + throw new Error(`Timed out waiting for dummy server on port ${port}`) +} diff --git a/e2e/vue-start/basic/tests/utils/getE2EPortKey.ts b/e2e/vue-start/basic/tests/utils/getE2EPortKey.ts new file mode 100644 index 0000000000..48be6a9027 --- /dev/null +++ b/e2e/vue-start/basic/tests/utils/getE2EPortKey.ts @@ -0,0 +1,5 @@ +import { getPackageName } from './getPackageName.ts' + +export function getE2EPortKey() { + return process.env.E2E_PORT_KEY ?? getPackageName() +} diff --git a/e2e/vue-start/css-modules/package.json b/e2e/vue-start/css-modules/package.json index 3671774644..c739f09ea0 100644 --- a/e2e/vue-start/css-modules/package.json +++ b/e2e/vue-start/css-modules/package.json @@ -11,7 +11,7 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js", "test:e2e:dev": "MODE=dev playwright test --project=chromium", "test:e2e:prod": "playwright test --project=chromium", - "test:e2e": "pnpm run test:e2e:dev" + "test:e2e": "rm -rf port*.txt; pnpm run test:e2e:dev" }, "dependencies": { "@tanstack/vue-router": "workspace:*", @@ -24,7 +24,7 @@ "@types/node": "^22.10.2", "@vitejs/plugin-vue-jsx": "^5.1.5", "sass": "^1.97.2", - "srvx": "^1.0.0", + "srvx": "^0.11.9", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" diff --git a/e2e/vue-start/css-modules/playwright.config.ts b/e2e/vue-start/css-modules/playwright.config.ts index a50ac5ae63..0b810d5372 100644 --- a/e2e/vue-start/css-modules/playwright.config.ts +++ b/e2e/vue-start/css-modules/playwright.config.ts @@ -1,9 +1,10 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } const mode = process.env.MODE ?? 'prod' const isDev = mode === 'dev' -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -12,17 +13,16 @@ export default defineConfig({ reporter: [['line']], globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', use: { baseURL, }, webServer: { - command: isDev - ? `pnpm dev:e2e --port 0` - : `pnpm build && PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + command: isDev ? `pnpm dev:e2e` : `pnpm build && PORT=${PORT} pnpm start`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', env: { VITE_NODE_ENV: 'test', diff --git a/e2e/vue-start/css-modules/tests/setup/global.setup.ts b/e2e/vue-start/css-modules/tests/setup/global.setup.ts index 17be637f77..2d3a1db946 100644 --- a/e2e/vue-start/css-modules/tests/setup/global.setup.ts +++ b/e2e/vue-start/css-modules/tests/setup/global.setup.ts @@ -1,9 +1,17 @@ -import { preOptimizeDevServer, waitForServer } from '@tanstack/router-e2e-utils' +import { + e2eStartDummyServer, + getTestServerPort, + preOptimizeDevServer, + waitForServer, +} from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } export default async function setup() { + await e2eStartDummyServer(packageJson.name) + if (process.env.MODE !== 'dev') return - const port = Number(process.env.E2E_APP_PORT ?? 0) + const port = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${port}` await waitForServer(baseURL) diff --git a/e2e/vue-start/css-modules/tests/setup/global.teardown.ts b/e2e/vue-start/css-modules/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/vue-start/css-modules/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/vue-start/custom-basepath/express-server.ts b/e2e/vue-start/custom-basepath/express-server.ts index b9bf393466..1884c5eb5a 100644 --- a/e2e/vue-start/custom-basepath/express-server.ts +++ b/e2e/vue-start/custom-basepath/express-server.ts @@ -1,6 +1,5 @@ import express from 'express' import { toNodeHandler } from 'srvx/node' -import type { AddressInfo } from 'node:net' import type { NodeHttp1Handler } from 'srvx' const DEVELOPMENT = process.env.NODE_ENV === 'development' @@ -41,11 +40,7 @@ if (DEVELOPMENT) { }) } -const httpServer = app.listen(PORT, (error) => { - if (error) { - throw error - } - console.log( - `E2E app: http://localhost:${(httpServer.address() as AddressInfo).port}`, - ) +app.listen(PORT, (error) => { + if (error) throw error + console.log(`Server is running on http://localhost:${PORT}`) }) diff --git a/e2e/vue-start/custom-basepath/package.json b/e2e/vue-start/custom-basepath/package.json index c1032ea88b..afc7d13c25 100644 --- a/e2e/vue-start/custom-basepath/package.json +++ b/e2e/vue-start/custom-basepath/package.json @@ -8,7 +8,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "tsx express-server.ts", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/vue-router": "workspace:^", @@ -25,7 +25,7 @@ "@types/express": "^5.0.6", "@types/node": "^22.10.2", "cross-env": "^10.0.0", - "srvx": "^1.0.0", + "srvx": "^0.11.9", "tailwindcss": "^4.2.2", "tsx": "^4.20.3", "@typescript/native": "npm:typescript@^7.0.2", diff --git a/e2e/vue-start/custom-basepath/playwright.config.ts b/e2e/vue-start/custom-basepath/playwright.config.ts index e113ce64ad..5095425f47 100644 --- a/e2e/vue-start/custom-basepath/playwright.config.ts +++ b/e2e/vue-start/custom-basepath/playwright.config.ts @@ -1,7 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}/custom/basepath` /** @@ -13,19 +18,19 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `pnpm build && PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', - env: { - NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, - }, }, projects: [ diff --git a/e2e/vue-start/custom-basepath/src/components/DefaultCatchBoundary.tsx b/e2e/vue-start/custom-basepath/src/components/DefaultCatchBoundary.tsx index 77c03c5afa..d06f4a948b 100644 --- a/e2e/vue-start/custom-basepath/src/components/DefaultCatchBoundary.tsx +++ b/e2e/vue-start/custom-basepath/src/components/DefaultCatchBoundary.tsx @@ -1,5 +1,3 @@ -import { defineComponent } from 'vue' -import type { PropType } from 'vue' import { ErrorComponent, Link, @@ -8,54 +6,46 @@ import { } from '@tanstack/vue-router' import type { ErrorComponentProps } from '@tanstack/vue-router' -export const DefaultCatchBoundary = defineComponent({ - props: { - error: { - type: Object as PropType, - required: true, - }, - }, - setup(props) { - const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', - }) - return () => { - console.error(props.error) - return ( -
- -
- - {isRoot.value ? ( - - Home - - ) : ( - { - e.preventDefault() - window.history.back() - }} - > - Go Back - - )} -
-
- ) - } - }, -}) +export function DefaultCatchBoundary({ error }: ErrorComponentProps) { + const router = useRouter() + const isRoot = useLocation({ + select: (location) => location.pathname === '/', + }) + + console.error(error) + + return ( +
+ +
+ + {isRoot.value ? ( + + Home + + ) : ( + { + e.preventDefault() + window.history.back() + }} + > + Go Back + + )} +
+
+ ) +} diff --git a/e2e/vue-start/custom-basepath/src/routes/api/users.$userId.ts b/e2e/vue-start/custom-basepath/src/routes/api/users.$userId.ts index 7e3f528d68..50b9ca995a 100644 --- a/e2e/vue-start/custom-basepath/src/routes/api/users.$userId.ts +++ b/e2e/vue-start/custom-basepath/src/routes/api/users.$userId.ts @@ -1,7 +1,11 @@ import { createFileRoute } from '@tanstack/vue-router' import type { User } from '~/utils/users' -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export const Route = createFileRoute('/api/users/$userId')({ server: { diff --git a/e2e/vue-start/custom-basepath/src/routes/api/users.ts b/e2e/vue-start/custom-basepath/src/routes/api/users.ts index dfdb5cd844..97989b93ca 100644 --- a/e2e/vue-start/custom-basepath/src/routes/api/users.ts +++ b/e2e/vue-start/custom-basepath/src/routes/api/users.ts @@ -38,7 +38,11 @@ const testMiddleware = createMiddleware() return result }) -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export const Route = createFileRoute('/api/users')({ server: { diff --git a/e2e/vue-start/custom-basepath/src/routes/posts.$postId.tsx b/e2e/vue-start/custom-basepath/src/routes/posts.$postId.tsx index 599e0f046e..b4e5a8a6a2 100644 --- a/e2e/vue-start/custom-basepath/src/routes/posts.$postId.tsx +++ b/e2e/vue-start/custom-basepath/src/routes/posts.$postId.tsx @@ -1,32 +1,9 @@ -import { defineComponent } from 'vue' import { Link, createFileRoute } from '@tanstack/vue-router' import { fetchPost } from '~/utils/posts' import { NotFound } from '~/components/NotFound' import { PostErrorComponent } from '~/components/PostErrorComponent' -const PostComponent = defineComponent({ - setup() { - const post = Route.useLoaderData() - return () => ( -
-

{post.value.title}

-
{post.value.body}
- - Deep View - -
- ) - }, -}) - export const Route = createFileRoute('/posts/$postId')({ loader: async ({ params: { postId } }) => fetchPost({ data: postId }), errorComponent: PostErrorComponent, @@ -35,3 +12,24 @@ export const Route = createFileRoute('/posts/$postId')({ return Post not found }, }) + +function PostComponent() { + const post = Route.useLoaderData() + + return ( +
+

{post.value.title}

+
{post.value.body}
+ + Deep View + +
+ ) +} diff --git a/e2e/vue-start/custom-basepath/src/routes/posts.tsx b/e2e/vue-start/custom-basepath/src/routes/posts.tsx index 64d4754f2f..1a9d58a31d 100644 --- a/e2e/vue-start/custom-basepath/src/routes/posts.tsx +++ b/e2e/vue-start/custom-basepath/src/routes/posts.tsx @@ -1,36 +1,7 @@ -import { defineComponent } from 'vue' import { Link, Outlet, createFileRoute } from '@tanstack/vue-router' import { fetchPosts } from '~/utils/posts' -const PostsComponent = defineComponent({ - setup() { - const posts = Route.useLoaderData() - return () => ( -
-
    - {posts.value.map((post) => ( -
  • - -
    {post.title.substring(0, 20)}
    - -
  • - ))} -
-
- -
- ) - }, -}) - export const Route = createFileRoute('/posts')({ head: () => ({ meta: [ @@ -42,3 +13,30 @@ export const Route = createFileRoute('/posts')({ loader: async () => fetchPosts(), component: PostsComponent, }) + +function PostsComponent() { + const posts = Route.useLoaderData() + + return ( +
+
    + {posts.value.map((post) => ( +
  • + +
    {post.title.substring(0, 20)}
    + +
  • + ))} +
+
+ +
+ ) +} diff --git a/e2e/vue-start/custom-basepath/src/routes/posts_.$postId.deep.tsx b/e2e/vue-start/custom-basepath/src/routes/posts_.$postId.deep.tsx index f77ae7d3ab..a52c6f32f7 100644 --- a/e2e/vue-start/custom-basepath/src/routes/posts_.$postId.deep.tsx +++ b/e2e/vue-start/custom-basepath/src/routes/posts_.$postId.deep.tsx @@ -1,26 +1,24 @@ -import { defineComponent } from 'vue' import { Link, createFileRoute } from '@tanstack/vue-router' import { PostErrorComponent } from '~/components/PostErrorComponent' import { fetchPost } from '~/utils/posts' -const PostDeepComponent = defineComponent({ - setup() { - const post = Route.useLoaderData() - return () => ( -
- - ← All Posts - -

{post.value.title}

-
{post.value.body}
-
- ) - }, -}) - export const Route = createFileRoute('/posts_/$postId/deep')({ loader: async ({ params: { postId } }) => fetchPost({ data: postId }), errorComponent: PostErrorComponent, component: PostDeepComponent, }) + +function PostDeepComponent() { + const post = Route.useLoaderData() + + return ( +
+ + ← All Posts + +

{post.value.title}

+
{post.value.body}
+
+ ) +} diff --git a/e2e/vue-start/custom-basepath/src/routes/users.$userId.tsx b/e2e/vue-start/custom-basepath/src/routes/users.$userId.tsx index 4effec0d5b..fb7fce5f4c 100644 --- a/e2e/vue-start/custom-basepath/src/routes/users.$userId.tsx +++ b/e2e/vue-start/custom-basepath/src/routes/users.$userId.tsx @@ -1,4 +1,3 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' import axios from 'redaxios' @@ -7,18 +6,6 @@ import { NotFound } from '~/components/NotFound' import { UserErrorComponent } from '~/components/UserErrorComponent' import { basepath } from '~/utils/basepath' -const UserComponent = defineComponent({ - setup() { - const user = Route.useLoaderData() - return () => ( -
-

{user.value.name}

-
{user.value.email}
-
- ) - }, -}) - export const Route = createFileRoute('/users/$userId')({ loader: async ({ params: { userId } }) => { return await axios @@ -34,3 +21,14 @@ export const Route = createFileRoute('/users/$userId')({ return User not found }, }) + +function UserComponent() { + const user = Route.useLoaderData() + + return ( +
+

{user.value.name}

+
{user.value.email}
+
+ ) +} diff --git a/e2e/vue-start/custom-basepath/src/routes/users.tsx b/e2e/vue-start/custom-basepath/src/routes/users.tsx index fe926d0a44..1432e50451 100644 --- a/e2e/vue-start/custom-basepath/src/routes/users.tsx +++ b/e2e/vue-start/custom-basepath/src/routes/users.tsx @@ -1,40 +1,8 @@ -import { defineComponent } from 'vue' import { Link, Outlet, createFileRoute } from '@tanstack/vue-router' import axios from 'redaxios' import type { User } from '~/utils/users' import { basepath } from '~/utils/basepath' -const UsersComponent = defineComponent({ - setup() { - const users = Route.useLoaderData() - return () => ( -
-
    - {[ - ...users.value, - { id: 'i-do-not-exist', name: 'Non-existent User', email: '' }, - ].map((user) => ( -
  • - -
    {user.name}
    - -
  • - ))} -
-
- -
- ) - }, -}) - export const Route = createFileRoute('/users')({ loader: async () => { return await axios @@ -46,3 +14,33 @@ export const Route = createFileRoute('/users')({ }, component: UsersComponent, }) + +function UsersComponent() { + const users = Route.useLoaderData() + + return ( +
+
    + {[ + ...users.value, + { id: 'i-do-not-exist', name: 'Non-existent User', email: '' }, + ].map((user) => ( +
  • + +
    {user.name}
    + +
  • + ))} +
+
+ +
+ ) +} diff --git a/e2e/vue-start/custom-basepath/src/utils/posts.tsx b/e2e/vue-start/custom-basepath/src/utils/posts.tsx index 11d80d08b5..66cb298f83 100644 --- a/e2e/vue-start/custom-basepath/src/utils/posts.tsx +++ b/e2e/vue-start/custom-basepath/src/utils/posts.tsx @@ -8,7 +8,11 @@ export type PostType = { body: string } -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export const fetchPost = createServerFn({ method: 'GET' }) .validator((postId: string) => postId) diff --git a/e2e/vue-start/custom-basepath/src/utils/users.tsx b/e2e/vue-start/custom-basepath/src/utils/users.tsx index 7ba645b383..46be4b1580 100644 --- a/e2e/vue-start/custom-basepath/src/utils/users.tsx +++ b/e2e/vue-start/custom-basepath/src/utils/users.tsx @@ -3,3 +3,7 @@ export type User = { name: string email: string } + +const PORT = process.env.VITE_SERVER_PORT || 3000 + +export const DEPLOY_URL = `http://localhost:${PORT}` diff --git a/e2e/vue-start/custom-basepath/tests/setup/global.setup.ts b/e2e/vue-start/custom-basepath/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/vue-start/custom-basepath/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/vue-start/custom-basepath/tests/setup/global.teardown.ts b/e2e/vue-start/custom-basepath/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/vue-start/custom-basepath/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/vue-start/dev-ssr-styles/.gitignore b/e2e/vue-start/dev-ssr-styles/.gitignore deleted file mode 100644 index 950326609c..0000000000 --- a/e2e/vue-start/dev-ssr-styles/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 0033a0a5cc..0000000000 --- a/e2e/vue-start/dev-ssr-styles/package.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "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 deleted file mode 100644 index 723cd32789..0000000000 --- a/e2e/vue-start/dev-ssr-styles/playwright.config.ts +++ /dev/null @@ -1,28 +0,0 @@ -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 deleted file mode 100644 index bd92215136..0000000000 --- a/e2e/vue-start/dev-ssr-styles/src/components/SfcStyledBox.vue +++ /dev/null @@ -1,14 +0,0 @@ - - - diff --git a/e2e/vue-start/dev-ssr-styles/src/router.tsx b/e2e/vue-start/dev-ssr-styles/src/router.tsx deleted file mode 100644 index c0d7f2b200..0000000000 --- a/e2e/vue-start/dev-ssr-styles/src/router.tsx +++ /dev/null @@ -1,10 +0,0 @@ -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 deleted file mode 100644 index 0dec479a07..0000000000 --- a/e2e/vue-start/dev-ssr-styles/src/routes/__root.tsx +++ /dev/null @@ -1,27 +0,0 @@ -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 deleted file mode 100644 index 733bc1d559..0000000000 --- a/e2e/vue-start/dev-ssr-styles/src/routes/index.tsx +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 9a67f9b153..0000000000 --- a/e2e/vue-start/dev-ssr-styles/src/styles/app.css +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index fe00a856b2..0000000000 --- a/e2e/vue-start/dev-ssr-styles/src/vue-shim.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -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 deleted file mode 100644 index 0e052441b7..0000000000 --- a/e2e/vue-start/dev-ssr-styles/tests/app.spec.ts +++ /dev/null @@ -1,61 +0,0 @@ -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 deleted file mode 100644 index b03b6485c8..0000000000 --- a/e2e/vue-start/dev-ssr-styles/tests/setup/global.setup.ts +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 898ea214b1..0000000000 --- a/e2e/vue-start/dev-ssr-styles/tsconfig.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "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 deleted file mode 100644 index f8b7293af9..0000000000 --- a/e2e/vue-start/dev-ssr-styles/vite.config.ts +++ /dev/null @@ -1,14 +0,0 @@ -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/query-integration/package.json b/e2e/vue-start/query-integration/package.json index 617ce4f430..a3b775e0eb 100644 --- a/e2e/vue-start/query-integration/package.json +++ b/e2e/vue-start/query-integration/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/vue-query": "^5.90.0", diff --git a/e2e/vue-start/query-integration/playwright.config.ts b/e2e/vue-start/query-integration/playwright.config.ts index 82678ac00b..4d86a1dbe7 100644 --- a/e2e/vue-start/query-integration/playwright.config.ts +++ b/e2e/vue-start/query-integration/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { derivePort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await derivePort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,8 +20,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/vue-start/query-integration/src/routes/loader-fetchQuery/$type.tsx b/e2e/vue-start/query-integration/src/routes/loader-fetchQuery/$type.tsx index 38f1e209dc..9e928feafe 100644 --- a/e2e/vue-start/query-integration/src/routes/loader-fetchQuery/$type.tsx +++ b/e2e/vue-start/query-integration/src/routes/loader-fetchQuery/$type.tsx @@ -1,29 +1,8 @@ -import { defineComponent } from 'vue' import { useQuery } from '@tanstack/vue-query' import { createFileRoute } from '@tanstack/vue-router' import z from 'zod' import { makeQueryOptions } from '~/queryOptions' -const RouteComponent = defineComponent({ - setup() { - const loaderData = Route.useLoaderData() - const context = Route.useRouteContext() - const query = useQuery(() => context.value.queryOptions) - return () => ( -
-
- loader data:{' '} -
{loaderData.value ?? 'undefined'}
-
-
- query data:{' '} -
{query.data.value ?? 'loading...'}
-
-
- ) - }, -}) - export const Route = createFileRoute('/loader-fetchQuery/$type')({ component: RouteComponent, params: { @@ -45,3 +24,21 @@ export const Route = createFileRoute('/loader-fetchQuery/$type')({ }, ssr: 'data-only', }) + +function RouteComponent() { + const loaderData = Route.useLoaderData() + const context = Route.useRouteContext() + const query = useQuery(context.value.queryOptions) + return ( +
+
+ loader data:{' '} +
{loaderData.value ?? 'undefined'}
+
+
+ query data:{' '} +
{query.data.value ?? 'loading...'}
+
+
+ ) +} diff --git a/e2e/vue-start/scroll-restoration/package.json b/e2e/vue-start/scroll-restoration/package.json index 025b0225be..21a4fbff8d 100644 --- a/e2e/vue-start/scroll-restoration/package.json +++ b/e2e/vue-start/scroll-restoration/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/vue-router": "workspace:^", @@ -28,7 +28,7 @@ "@vitejs/plugin-vue": "^6.0.5", "@vitejs/plugin-vue-jsx": "^5.1.5", "combinate": "^1.1.11", - "srvx": "^1.0.0", + "srvx": "^0.11.9", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/vue-start/scroll-restoration/playwright.config.ts b/e2e/vue-start/scroll-restoration/playwright.config.ts index 1862174905..b0c365f8bd 100644 --- a/e2e/vue-start/scroll-restoration/playwright.config.ts +++ b/e2e/vue-start/scroll-restoration/playwright.config.ts @@ -1,7 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -13,19 +18,19 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `pnpm build && PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', - env: { - NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, - }, }, projects: [ diff --git a/e2e/vue-start/scroll-restoration/src/components/DefaultCatchBoundary.tsx b/e2e/vue-start/scroll-restoration/src/components/DefaultCatchBoundary.tsx index 77c03c5afa..d06f4a948b 100644 --- a/e2e/vue-start/scroll-restoration/src/components/DefaultCatchBoundary.tsx +++ b/e2e/vue-start/scroll-restoration/src/components/DefaultCatchBoundary.tsx @@ -1,5 +1,3 @@ -import { defineComponent } from 'vue' -import type { PropType } from 'vue' import { ErrorComponent, Link, @@ -8,54 +6,46 @@ import { } from '@tanstack/vue-router' import type { ErrorComponentProps } from '@tanstack/vue-router' -export const DefaultCatchBoundary = defineComponent({ - props: { - error: { - type: Object as PropType, - required: true, - }, - }, - setup(props) { - const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', - }) - return () => { - console.error(props.error) - return ( -
- -
- - {isRoot.value ? ( - - Home - - ) : ( - { - e.preventDefault() - window.history.back() - }} - > - Go Back - - )} -
-
- ) - } - }, -}) +export function DefaultCatchBoundary({ error }: ErrorComponentProps) { + const router = useRouter() + const isRoot = useLocation({ + select: (location) => location.pathname === '/', + }) + + console.error(error) + + return ( +
+ +
+ + {isRoot.value ? ( + + Home + + ) : ( + { + e.preventDefault() + window.history.back() + }} + > + Go Back + + )} +
+
+ ) +} diff --git a/e2e/vue-start/scroll-restoration/src/utils/posts.tsx b/e2e/vue-start/scroll-restoration/src/utils/posts.tsx index c4a2d0dcca..e45ef52969 100644 --- a/e2e/vue-start/scroll-restoration/src/utils/posts.tsx +++ b/e2e/vue-start/scroll-restoration/src/utils/posts.tsx @@ -10,7 +10,11 @@ export type PostType = { body: string } -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export class PostNotFoundError extends Error {} diff --git a/e2e/vue-start/scroll-restoration/src/utils/users.tsx b/e2e/vue-start/scroll-restoration/src/utils/users.tsx index 7ba645b383..46be4b1580 100644 --- a/e2e/vue-start/scroll-restoration/src/utils/users.tsx +++ b/e2e/vue-start/scroll-restoration/src/utils/users.tsx @@ -3,3 +3,7 @@ export type User = { name: string email: string } + +const PORT = process.env.VITE_SERVER_PORT || 3000 + +export const DEPLOY_URL = `http://localhost:${PORT}` diff --git a/e2e/vue-start/scroll-restoration/tests/scroll-restoration-lifecycle.spec.ts b/e2e/vue-start/scroll-restoration/tests/scroll-restoration-lifecycle.spec.ts deleted file mode 100644 index df75cba73c..0000000000 --- a/e2e/vue-start/scroll-restoration/tests/scroll-restoration-lifecycle.spec.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { test } from '@tanstack/router-e2e-utils' -import { scrollRestorationLifecycleTests } from '../../../scroll-restoration-lifecycle' - -scrollRestorationLifecycleTests(test) diff --git a/e2e/vue-start/scroll-restoration/tests/setup/global.setup.ts b/e2e/vue-start/scroll-restoration/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/vue-start/scroll-restoration/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/vue-start/scroll-restoration/tests/setup/global.teardown.ts b/e2e/vue-start/scroll-restoration/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/vue-start/scroll-restoration/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/vue-start/selective-ssr/package.json b/e2e/vue-start/selective-ssr/package.json index b555a01c26..7ffcaae743 100644 --- a/e2e/vue-start/selective-ssr/package.json +++ b/e2e/vue-start/selective-ssr/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/vue-router": "workspace:^", @@ -22,7 +22,7 @@ "@tanstack/router-e2e-utils": "workspace:^", "@vitejs/plugin-vue": "^6.0.5", "@vitejs/plugin-vue-jsx": "^5.1.5", - "srvx": "^1.0.0", + "srvx": "^0.11.9", "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/playwright.config.ts b/e2e/vue-start/selective-ssr/playwright.config.ts index 630989e41f..badd6db0eb 100644 --- a/e2e/vue-start/selective-ssr/playwright.config.ts +++ b/e2e/vue-start/selective-ssr/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,8 +20,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && NODE_ENV=production PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/vue-start/selective-ssr/src/routes/__root.tsx b/e2e/vue-start/selective-ssr/src/routes/__root.tsx index 9319a0982a..a952abd4e0 100644 --- a/e2e/vue-start/selective-ssr/src/routes/__root.tsx +++ b/e2e/vue-start/selective-ssr/src/routes/__root.tsx @@ -1,5 +1,4 @@ /// -import { defineComponent } from 'vue' import { Body, ClientOnly, @@ -15,93 +14,6 @@ import { z } from 'zod' import { ssrSchema } from '~/search' import appCss from '~/styles/app.css?url' -const RootDocument = defineComponent({ - setup(_, { slots }) { - const routerState = useRouterState({ - select: (state) => ({ - isLoading: state.isLoading, - status: state.status, - }), - }) - return () => ( - - - - - -
-

Selective SSR E2E Test

- - Home - -
-
- -
- router isLoading:{' '} - - {routerState.value.isLoading ? 'true' : 'false'} - -
-
- router status:{' '} - {routerState.value.status} -
-
-
- {slots.default?.()} - - - - ) - }, -}) - -const RouteComponent = defineComponent({ - setup() { - const search = Route.useSearch() - const loaderData = Route.useLoaderData() - const context = Route.useRouteContext() - return () => { - if ( - typeof window === 'undefined' && - search.value.root?.expected?.render === 'client-only' - ) { - const error = `Expected component for ${Route.id} to be executed on the client, but it is running on the server` - console.error(error) - throw new Error(error) - } - return ( -
-

root

-
- ssr: {JSON.stringify(search.value.root?.ssr ?? 'undefined')} -
-
- expected data location execution:{' '} - - {search.value.root?.expected?.data} - -
-
- loader: {loaderData.value.root} -
-
- context: {context.value.root} -
-
- -
- ) - } - }, -}) - export const Route = createRootRoute({ head: () => ({ meta: [ @@ -162,5 +74,84 @@ export const Route = createRootRoute({ return { root: typeof window === 'undefined' ? 'server' : 'client' } }, shellComponent: RootDocument, - component: RouteComponent, + component: () => { + const search = Route.useSearch() + if ( + typeof window === 'undefined' && + search.value.root?.expected?.render === 'client-only' + ) { + const error = `Expected component for ${Route.id} to be executed on the client, but it is running on the server` + console.error(error) + throw new Error(error) + } + const loaderData = Route.useLoaderData() + const context = Route.useRouteContext() + return ( +
+

root

+
+ ssr: {JSON.stringify(search.value.root?.ssr ?? 'undefined')} +
+
+ expected data location execution:{' '} + + {search.value.root?.expected?.data} + +
+
+ loader: {loaderData.value.root} +
+
+ context: {context.value.root} +
+
+ +
+ ) + }, }) + +function RootDocument(_: unknown, { slots }: { slots: any }) { + const routerState = useRouterState({ + select: (state) => ({ + isLoading: state.isLoading, + status: state.status, + }), + }) + return ( + + + + + +
+

Selective SSR E2E Test

+ + Home + +
+
+ +
+ router isLoading:{' '} + + {routerState.value.isLoading ? 'true' : 'false'} + +
+
+ router status:{' '} + {routerState.value.status} +
+
+
+ {slots.default?.()} + + + + ) +} diff --git a/e2e/vue-start/selective-ssr/src/routes/posts.$postId.tsx b/e2e/vue-start/selective-ssr/src/routes/posts.$postId.tsx index 522b5e9b8e..4e7065cc48 100644 --- a/e2e/vue-start/selective-ssr/src/routes/posts.$postId.tsx +++ b/e2e/vue-start/selective-ssr/src/routes/posts.$postId.tsx @@ -1,47 +1,7 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' import z from 'zod' import { ssrSchema } from '~/search' -const RouteComponent = defineComponent({ - setup() { - const search = Route.useSearch() - const loaderData = Route.useLoaderData() - const context = Route.useRouteContext() - return () => { - if ( - typeof window === 'undefined' && - search.value.postId?.expected?.render === 'client-only' - ) { - const error = `Expected component for ${Route.id} to be executed on the client, but it is running on the server` - console.error(error) - throw new Error(error) - } - return ( -
-

postId

-
- ssr:{' '} - {JSON.stringify(search.value.postId?.ssr ?? 'undefined')} -
-
- expected data location execution:{' '} - - {search.value.postId?.expected?.data} - -
-
- loader: {loaderData.value.postId} -
-
- context: {context.value.postId} -
-
- ) - } - }, -}) - export const Route = createFileRoute('/posts/$postId')({ validateSearch: z.object({ postId: ssrSchema }), ssr: ({ search }) => { @@ -86,5 +46,37 @@ export const Route = createFileRoute('/posts/$postId')({ } return { postId: typeof window === 'undefined' ? 'server' : 'client' } }, - component: RouteComponent, + component: () => { + const search = Route.useSearch() + const loaderData = Route.useLoaderData() + const context = Route.useRouteContext() + if ( + typeof window === 'undefined' && + search.value.postId?.expected?.render === 'client-only' + ) { + const error = `Expected component for ${Route.id} to be executed on the client, but it is running on the server` + console.error(error) + throw new Error(error) + } + return ( +
+

postId

+
+ ssr: {JSON.stringify(search.value.postId?.ssr ?? 'undefined')} +
+
+ expected data location execution:{' '} + + {search.value.postId?.expected?.data} + +
+
+ loader: {loaderData.value.postId} +
+
+ context: {context.value.postId} +
+
+ ) + }, }) diff --git a/e2e/vue-start/selective-ssr/src/routes/posts.tsx b/e2e/vue-start/selective-ssr/src/routes/posts.tsx index 514628b229..6c4e490dde 100644 --- a/e2e/vue-start/selective-ssr/src/routes/posts.tsx +++ b/e2e/vue-start/selective-ssr/src/routes/posts.tsx @@ -1,48 +1,7 @@ -import { defineComponent } from 'vue' import { Outlet, createFileRoute } from '@tanstack/vue-router' import z from 'zod' import { ssrSchema } from '~/search' -const RouteComponent = defineComponent({ - setup() { - const search = Route.useSearch() - const loaderData = Route.useLoaderData() - const context = Route.useRouteContext() - return () => { - if ( - typeof window === 'undefined' && - search.value.posts?.expected?.render === 'client-only' - ) { - const error = `Expected component for ${Route.id} to be executed on the client, but it is running on the server` - console.error(error) - throw new Error(error) - } - return ( -
-

posts

-
- ssr: {JSON.stringify(search.value.posts?.ssr ?? 'undefined')} -
-
- expected data location execution:{' '} - - {search.value.posts?.expected?.data} - -
-
- loader: {loaderData.value.posts} -
-
- context: {context.value.posts} -
-
- -
- ) - } - }, -}) - export const Route = createFileRoute('/posts')({ validateSearch: z.object({ posts: ssrSchema }), ssr: ({ search }) => { @@ -87,5 +46,39 @@ export const Route = createFileRoute('/posts')({ } return { posts: typeof window === 'undefined' ? 'server' : 'client' } }, - component: RouteComponent, + component: () => { + const search = Route.useSearch() + const loaderData = Route.useLoaderData() + const context = Route.useRouteContext() + if ( + typeof window === 'undefined' && + search.value.posts?.expected?.render === 'client-only' + ) { + const error = `Expected component for ${Route.id} to be executed on the client, but it is running on the server` + console.error(error) + throw new Error(error) + } + return ( +
+

posts

+
+ ssr: {JSON.stringify(search.value.posts?.ssr ?? 'undefined')} +
+
+ expected data location execution:{' '} + + {search.value.posts?.expected?.data} + +
+
+ loader: {loaderData.value.posts} +
+
+ context: {context.value.posts} +
+
+ +
+ ) + }, }) diff --git a/e2e/vue-start/serialization-adapters/package.json b/e2e/vue-start/serialization-adapters/package.json index a056e21da3..c5b80bdced 100644 --- a/e2e/vue-start/serialization-adapters/package.json +++ b/e2e/vue-start/serialization-adapters/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/vue-router": "workspace:^", @@ -23,7 +23,7 @@ "@tanstack/router-e2e-utils": "workspace:^", "@vitejs/plugin-vue": "^6.0.5", "@vitejs/plugin-vue-jsx": "^5.1.5", - "srvx": "^1.0.0", + "srvx": "^0.11.9", "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/playwright.config.ts b/e2e/vue-start/serialization-adapters/playwright.config.ts index 630989e41f..badd6db0eb 100644 --- a/e2e/vue-start/serialization-adapters/playwright.config.ts +++ b/e2e/vue-start/serialization-adapters/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,8 +20,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && NODE_ENV=production PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/vue-start/serialization-adapters/src/routes/__root.tsx b/e2e/vue-start/serialization-adapters/src/routes/__root.tsx index 3ea36c7d46..96911d2500 100644 --- a/e2e/vue-start/serialization-adapters/src/routes/__root.tsx +++ b/e2e/vue-start/serialization-adapters/src/routes/__root.tsx @@ -1,5 +1,4 @@ /// -import { defineComponent } from 'vue' import { Body, ClientOnly, @@ -13,51 +12,6 @@ import { import { TanStackRouterDevtoolsInProd } from '@tanstack/vue-router-devtools' import appCss from '~/styles/app.css?url' -const RootDocument = defineComponent({ - setup(_, { slots }) { - const routerState = useRouterState({ - select: (state) => ({ isLoading: state.isLoading, status: state.status }), - }) - return () => ( - - - - - -
-

Serialization Adapters E2E Test

- - Home - -
-
- -
- router isLoading:{' '} - - {routerState.value.isLoading ? 'true' : 'false'} - -
-
- router status:{' '} - {routerState.value.status} -
-
-
- {slots.default?.()} - - - - - ) - }, -}) - export const Route = createRootRoute({ head: () => ({ meta: [ @@ -77,3 +31,46 @@ export const Route = createRootRoute({ shellComponent: RootDocument, notFoundComponent: (e) =>
404 - Not Found {JSON.stringify(e.data)}
, }) + +function RootDocument(_: unknown, { slots }: { slots: any }) { + const routerState = useRouterState({ + select: (state) => ({ isLoading: state.isLoading, status: state.status }), + }) + return ( + + + + + +
+

Serialization Adapters E2E Test

+ + Home + +
+
+ +
+ router isLoading:{' '} + + {routerState.value.isLoading ? 'true' : 'false'} + +
+
+ router status:{' '} + {routerState.value.status} +
+
+
+ {slots.default?.()} + + + + + ) +} diff --git a/e2e/vue-start/serialization-adapters/src/routes/ssr/data-only.tsx b/e2e/vue-start/serialization-adapters/src/routes/ssr/data-only.tsx index e71906f03e..ecb35d0a55 100644 --- a/e2e/vue-start/serialization-adapters/src/routes/ssr/data-only.tsx +++ b/e2e/vue-start/serialization-adapters/src/routes/ssr/data-only.tsx @@ -1,47 +1,6 @@ -import { defineComponent } from 'vue' import { Outlet, createFileRoute } from '@tanstack/vue-router' import { RenderData, makeData } from '~/data' -const RouteComponent = defineComponent({ - setup() { - const context = Route.useRouteContext() - const loaderData = Route.useLoaderData() - return () => { - const localData = makeData() - const expectedHonkState = localData.car.singleInstance.honk() - const honkState = loaderData.value.car.singleInstance.honk() - return ( -
-

data-only

-
- context: -
-
- loader: -
-
-

honk

-
- expected:{' '} -
- {JSON.stringify(expectedHonkState)} -
-
-
- actual:{' '} -
- {JSON.stringify(honkState)} -
-
-
-
- -
- ) - } - }, -}) - export const Route = createFileRoute('/ssr/data-only')({ ssr: 'data-only', beforeLoad: () => { @@ -50,6 +9,43 @@ export const Route = createFileRoute('/ssr/data-only')({ loader: ({ context }) => { return context }, - component: RouteComponent, + component: () => { + const context = Route.useRouteContext() + const loaderData = Route.useLoaderData() + + const localData = makeData() + const expectedHonkState = localData.car.singleInstance.honk() + + const honkState = loaderData.value.car.singleInstance.honk() + + return ( +
+

data-only

+
+ context: +
+
+ loader: +
+
+

honk

+
+ expected:{' '} +
+ {JSON.stringify(expectedHonkState)} +
+
+
+ actual:{' '} +
+ {JSON.stringify(honkState)} +
+
+
+
+ +
+ ) + }, pendingComponent: () =>
posts Loading...
, }) diff --git a/e2e/vue-start/serialization-adapters/src/routes/ssr/nested.tsx b/e2e/vue-start/serialization-adapters/src/routes/ssr/nested.tsx index b4f7fd8f23..bbc240b96d 100644 --- a/e2e/vue-start/serialization-adapters/src/routes/ssr/nested.tsx +++ b/e2e/vue-start/serialization-adapters/src/routes/ssr/nested.tsx @@ -1,14 +1,6 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' import { RenderNestedData, makeNested } from '~/data' -const RouteComponent = defineComponent({ - setup() { - const loaderData = Route.useLoaderData() - return () => - }, -}) - export const Route = createFileRoute('/ssr/nested')({ beforeLoad: () => { return { nested: makeNested() } @@ -16,5 +8,8 @@ export const Route = createFileRoute('/ssr/nested')({ loader: ({ context }) => { return context }, - component: RouteComponent, + component: () => { + const loaderData = Route.useLoaderData() + return + }, }) diff --git a/e2e/vue-start/serialization-adapters/src/routes/ssr/stream.tsx b/e2e/vue-start/serialization-adapters/src/routes/ssr/stream.tsx index f6056699af..ea1e770e5b 100644 --- a/e2e/vue-start/serialization-adapters/src/routes/ssr/stream.tsx +++ b/e2e/vue-start/serialization-adapters/src/routes/ssr/stream.tsx @@ -1,32 +1,7 @@ import { Await, createFileRoute } from '@tanstack/vue-router' -import { defineComponent, Suspense } from 'vue' +import { Suspense } from 'vue' import { RenderData, makeData } from '~/data' -const RouteComponent = defineComponent({ - setup() { - const loaderData = Route.useLoaderData() - return () => ( -
-

Stream

-
{loaderData.value.someString}
- - {{ - default: () => ( - ) => ( - - )} - /> - ), - fallback: () =>
Loading...
, - }} -
-
- ) - }, -}) - export const Route = createFileRoute('/ssr/stream')({ loader: () => { const dataPromise = new Promise>((r) => @@ -43,3 +18,26 @@ export const Route = createFileRoute('/ssr/stream')({ ), component: RouteComponent, }) + +function RouteComponent() { + const loaderData = Route.useLoaderData() + return ( +
+

Stream

+
{loaderData.value.someString}
+ + {{ + default: () => ( + ) => ( + + )} + /> + ), + fallback: () =>
Loading...
, + }} +
+
+ ) +} diff --git a/e2e/vue-start/server-functions/package.json b/e2e/vue-start/server-functions/package.json index dd1a7a9c6b..3bf9ba33a8 100644 --- a/e2e/vue-start/server-functions/package.json +++ b/e2e/vue-start/server-functions/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/vue-query": "^5.90.9", @@ -32,7 +32,7 @@ "@vitejs/plugin-vue": "^6.0.5", "@vitejs/plugin-vue-jsx": "^5.1.5", "combinate": "^1.1.11", - "srvx": "^1.0.0", + "srvx": "^0.11.9", "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/playwright.config.ts b/e2e/vue-start/server-functions/playwright.config.ts index 48e14683f4..cb1da03b94 100644 --- a/e2e/vue-start/server-functions/playwright.config.ts +++ b/e2e/vue-start/server-functions/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -export const PORT = Number(process.env.E2E_APP_PORT ?? 0) +export const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -20,8 +21,8 @@ export default defineConfig({ webServer: { command: `pnpm build && VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/vue-start/server-functions/src/components/DefaultCatchBoundary.tsx b/e2e/vue-start/server-functions/src/components/DefaultCatchBoundary.tsx index 77c03c5afa..d06f4a948b 100644 --- a/e2e/vue-start/server-functions/src/components/DefaultCatchBoundary.tsx +++ b/e2e/vue-start/server-functions/src/components/DefaultCatchBoundary.tsx @@ -1,5 +1,3 @@ -import { defineComponent } from 'vue' -import type { PropType } from 'vue' import { ErrorComponent, Link, @@ -8,54 +6,46 @@ import { } from '@tanstack/vue-router' import type { ErrorComponentProps } from '@tanstack/vue-router' -export const DefaultCatchBoundary = defineComponent({ - props: { - error: { - type: Object as PropType, - required: true, - }, - }, - setup(props) { - const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', - }) - return () => { - console.error(props.error) - return ( -
- -
- - {isRoot.value ? ( - - Home - - ) : ( - { - e.preventDefault() - window.history.back() - }} - > - Go Back - - )} -
-
- ) - } - }, -}) +export function DefaultCatchBoundary({ error }: ErrorComponentProps) { + const router = useRouter() + const isRoot = useLocation({ + select: (location) => location.pathname === '/', + }) + + console.error(error) + + return ( +
+ +
+ + {isRoot.value ? ( + + Home + + ) : ( + { + e.preventDefault() + window.history.back() + }} + > + Go Back + + )} +
+
+ ) +} diff --git a/e2e/vue-start/server-functions/src/routes/cookies/index.tsx b/e2e/vue-start/server-functions/src/routes/cookies/index.tsx index 90dddad0af..d7fef10223 100644 --- a/e2e/vue-start/server-functions/src/routes/cookies/index.tsx +++ b/e2e/vue-start/server-functions/src/routes/cookies/index.tsx @@ -1,4 +1,3 @@ -import { defineComponent } from 'vue' import { Link, createFileRoute } from '@tanstack/vue-router' import { z } from 'zod' @@ -6,23 +5,21 @@ const cookieSchema = z .object({ value: z.string().default(() => `CLIENT-${Date.now()}`) }) .prefault({}) .catch(() => ({ value: `CLIENT-${Date.now()}` })) -const RouteComponent = defineComponent({ - setup() { - const search = Route.useSearch() - return () => ( - - got to route that sets the cookies with {JSON.stringify(search.value)} - - ) - }, -}) - export const Route = createFileRoute('/cookies/')({ validateSearch: cookieSchema, component: RouteComponent, }) + +function RouteComponent() { + const search = Route.useSearch() + return ( + + got to route that sets the cookies with {JSON.stringify(search.value)} + + ) +} diff --git a/e2e/vue-start/server-functions/src/routes/formdata-redirect/index.tsx b/e2e/vue-start/server-functions/src/routes/formdata-redirect/index.tsx index 8bfcc55ca3..8b0c623b8c 100644 --- a/e2e/vue-start/server-functions/src/routes/formdata-redirect/index.tsx +++ b/e2e/vue-start/server-functions/src/routes/formdata-redirect/index.tsx @@ -1,51 +1,7 @@ -import { defineComponent } from 'vue' import { createFileRoute, redirect } from '@tanstack/vue-router' import { createServerFn, useServerFn } from '@tanstack/vue-start' import { z } from 'zod' -const SubmitPostFormDataFn = defineComponent({ - setup() { - const mode = Route.useSearch({ select: (search) => search.mode }) - const greetUserFn = useServerFn(greetUser) - return () => ( -
-

Submit POST FormData Fn Call

-
- It should return redirect to /formdata-redirect/target/ - {testValues.name} and greet the user with their name: - -
-              {testValues.name}
-            
-
-
-
{ - if (mode.value === 'js') { - evt.preventDefault() - const data = new FormData(evt.currentTarget as HTMLFormElement) - await greetUserFn({ data }) - } - }} - > - - -
-
- ) - }, -}) - export const Route = createFileRoute('/formdata-redirect/')({ component: SubmitPostFormDataFn, validateSearch: z.object({ @@ -75,3 +31,44 @@ export const greetUser = createServerFn({ method: 'POST' }) .handler(({ data: { name } }) => { throw redirect({ to: '/formdata-redirect/target/$name', params: { name } }) }) + +function SubmitPostFormDataFn() { + const mode = Route.useSearch({ select: (search) => search.mode }) + const greetUserFn = useServerFn(greetUser) + return ( +
+

Submit POST FormData Fn Call

+
+ It should return redirect to /formdata-redirect/target/{testValues.name}{' '} + and greet the user with their name: + +
+            {testValues.name}
+          
+
+
+
{ + if (mode.value === 'js') { + evt.preventDefault() + const data = new FormData(evt.currentTarget as HTMLFormElement) + await greetUserFn({ data }) + } + }} + > + + +
+
+ ) +} diff --git a/e2e/vue-start/server-functions/src/routes/formdata-redirect/target.$name.tsx b/e2e/vue-start/server-functions/src/routes/formdata-redirect/target.$name.tsx index 099a8665bf..958aeaf617 100644 --- a/e2e/vue-start/server-functions/src/routes/formdata-redirect/target.$name.tsx +++ b/e2e/vue-start/server-functions/src/routes/formdata-redirect/target.$name.tsx @@ -1,21 +1,18 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' -const RouteComponent = defineComponent({ - setup() { - const params = Route.useParams() - return () => ( -
- Hello{' '} - - {params.value.name} - - ! -
- ) - }, -}) - export const Route = createFileRoute('/formdata-redirect/target/$name')({ component: RouteComponent, }) + +function RouteComponent() { + const params = Route.useParams() + return ( +
+ Hello{' '} + + {params.value.name} + + ! +
+ ) +} diff --git a/e2e/vue-start/server-routes/package.json b/e2e/vue-start/server-routes/package.json index 6a8e1babed..40d285d1d9 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": "^1.0.0", + "srvx": "^0.11.9", "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/playwright.config.ts b/e2e/vue-start/server-routes/playwright.config.ts index 48e14683f4..cb1da03b94 100644 --- a/e2e/vue-start/server-routes/playwright.config.ts +++ b/e2e/vue-start/server-routes/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -export const PORT = Number(process.env.E2E_APP_PORT ?? 0) +export const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -20,8 +21,8 @@ export default defineConfig({ webServer: { command: `pnpm build && VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/vue-start/server-routes/src/components/DefaultCatchBoundary.tsx b/e2e/vue-start/server-routes/src/components/DefaultCatchBoundary.tsx index 77c03c5afa..d06f4a948b 100644 --- a/e2e/vue-start/server-routes/src/components/DefaultCatchBoundary.tsx +++ b/e2e/vue-start/server-routes/src/components/DefaultCatchBoundary.tsx @@ -1,5 +1,3 @@ -import { defineComponent } from 'vue' -import type { PropType } from 'vue' import { ErrorComponent, Link, @@ -8,54 +6,46 @@ import { } from '@tanstack/vue-router' import type { ErrorComponentProps } from '@tanstack/vue-router' -export const DefaultCatchBoundary = defineComponent({ - props: { - error: { - type: Object as PropType, - required: true, - }, - }, - setup(props) { - const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', - }) - return () => { - console.error(props.error) - return ( -
- -
- - {isRoot.value ? ( - - Home - - ) : ( - { - e.preventDefault() - window.history.back() - }} - > - Go Back - - )} -
-
- ) - } - }, -}) +export function DefaultCatchBoundary({ error }: ErrorComponentProps) { + const router = useRouter() + const isRoot = useLocation({ + select: (location) => location.pathname === '/', + }) + + console.error(error) + + return ( +
+ +
+ + {isRoot.value ? ( + + Home + + ) : ( + { + e.preventDefault() + window.history.back() + }} + > + Go Back + + )} +
+
+ ) +} diff --git a/e2e/vue-start/spa-mode/package.json b/e2e/vue-start/spa-mode/package.json index c4270cfccd..b33ed9c859 100644 --- a/e2e/vue-start/spa-mode/package.json +++ b/e2e/vue-start/spa-mode/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "npx serve dist/client", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/vue-router": "workspace:^", diff --git a/e2e/vue-start/spa-mode/playwright.config.ts b/e2e/vue-start/spa-mode/playwright.config.ts index 630989e41f..badd6db0eb 100644 --- a/e2e/vue-start/spa-mode/playwright.config.ts +++ b/e2e/vue-start/spa-mode/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** * See https://playwright.dev/docs/test-configuration. @@ -19,8 +20,8 @@ export default defineConfig({ webServer: { command: `VITE_SERVER_PORT=${PORT} pnpm build && NODE_ENV=production PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/vue-start/spa-mode/src/routes/__root.tsx b/e2e/vue-start/spa-mode/src/routes/__root.tsx index 45aee73c06..1e38664739 100644 --- a/e2e/vue-start/spa-mode/src/routes/__root.tsx +++ b/e2e/vue-start/spa-mode/src/routes/__root.tsx @@ -1,5 +1,4 @@ /// -import { defineComponent } from 'vue' import { Body, ClientOnly, @@ -14,71 +13,6 @@ import { import { TanStackRouterDevtools } from '@tanstack/vue-router-devtools' import appCss from '~/styles/app.css?url' -const RootDocument = defineComponent({ - setup(_, { slots }) { - const routerState = useRouterState({ - select: (state) => ({ isLoading: state.isLoading, status: state.status }), - }) - return () => ( - - - - - -
-

SPA Mode E2E Test

- - Home - -
-
- -
- router isLoading:{' '} - - {routerState.value.isLoading ? 'true' : 'false'} - -
-
- router status:{' '} - {routerState.value.status} -
-
-
- {slots.default?.()} - - - - - ) - }, -}) - -const RouteComponent = defineComponent({ - setup() { - const loaderData = Route.useLoaderData() - const context = Route.useRouteContext() - return () => ( -
-

root

-
- loader: {loaderData.value.root} -
-
- context: {context.value.root} -
-
- -
- ) - }, -}) - export const Route = createRootRoute({ head: () => ({ meta: [ @@ -110,6 +44,65 @@ export const Route = createRootRoute({ return { root: typeof window === 'undefined' ? 'server' : 'client' } }, shellComponent: RootDocument, - component: RouteComponent, + component: () => { + const loaderData = Route.useLoaderData() + const context = Route.useRouteContext() + return ( +
+

root

+
+ loader: {loaderData.value.root} +
+
+ context: {context.value.root} +
+
+ +
+ ) + }, pendingComponent: () =>
__root Loading...
, }) + +function RootDocument(_: unknown, { slots }: { slots: any }) { + const routerState = useRouterState({ + select: (state) => ({ isLoading: state.isLoading, status: state.status }), + }) + return ( + + + + + +
+

SPA Mode E2E Test

+ + Home + +
+
+ +
+ router isLoading:{' '} + + {routerState.value.isLoading ? 'true' : 'false'} + +
+
+ router status:{' '} + {routerState.value.status} +
+
+
+ {slots.default?.()} + + + + + ) +} diff --git a/e2e/vue-start/spa-mode/src/routes/posts.$postId.tsx b/e2e/vue-start/spa-mode/src/routes/posts.$postId.tsx index 9c25cbad25..6733ef7436 100644 --- a/e2e/vue-start/spa-mode/src/routes/posts.$postId.tsx +++ b/e2e/vue-start/spa-mode/src/routes/posts.$postId.tsx @@ -1,24 +1,5 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' -const RouteComponent = defineComponent({ - setup() { - const loaderData = Route.useLoaderData() - const context = Route.useRouteContext() - return () => ( -
-

postId

-
- loader: {loaderData.value.postId} -
-
- context: {context.value.postId} -
-
- ) - }, -}) - export const Route = createFileRoute('/posts/$postId')({ beforeLoad: () => { console.log( @@ -34,6 +15,20 @@ export const Route = createFileRoute('/posts/$postId')({ ) return { postId: typeof window === 'undefined' ? 'server' : 'client' } }, - component: RouteComponent, + component: () => { + const loaderData = Route.useLoaderData() + const context = Route.useRouteContext() + return ( +
+

postId

+
+ loader: {loaderData.value.postId} +
+
+ context: {context.value.postId} +
+
+ ) + }, pendingComponent: () =>
$postId Loading...
, }) diff --git a/e2e/vue-start/spa-mode/src/routes/posts.tsx b/e2e/vue-start/spa-mode/src/routes/posts.tsx index 44c536adc4..e69ae1ea86 100644 --- a/e2e/vue-start/spa-mode/src/routes/posts.tsx +++ b/e2e/vue-start/spa-mode/src/routes/posts.tsx @@ -1,26 +1,5 @@ -import { defineComponent } from 'vue' import { Outlet, createFileRoute } from '@tanstack/vue-router' -const RouteComponent = defineComponent({ - setup() { - const loaderData = Route.useLoaderData() - const context = Route.useRouteContext() - return () => ( -
-

posts

-
- loader: {loaderData.value.posts} -
-
- context: {context.value.posts} -
-
- -
- ) - }, -}) - export const Route = createFileRoute('/posts')({ beforeLoad: () => { console.log( @@ -37,6 +16,22 @@ export const Route = createFileRoute('/posts')({ return { posts: typeof window === 'undefined' ? 'server' : 'client' } }, - component: RouteComponent, + component: () => { + const loaderData = Route.useLoaderData() + const context = Route.useRouteContext() + return ( +
+

posts

+
+ loader: {loaderData.value.posts} +
+
+ context: {context.value.posts} +
+
+ +
+ ) + }, pendingComponent: () =>
posts Loading...
, }) diff --git a/e2e/vue-start/start-manifest/package.json b/e2e/vue-start/start-manifest/package.json index ae682f7a9d..dbf889db71 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": "^1.0.0", + "srvx": "^0.11.9", "@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/playwright.config.ts b/e2e/vue-start/start-manifest/playwright.config.ts index 653e08253f..b9f835c16a 100644 --- a/e2e/vue-start/start-manifest/playwright.config.ts +++ b/e2e/vue-start/start-manifest/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` export default defineConfig({ @@ -15,8 +16,8 @@ export default defineConfig({ webServer: { command: `pnpm build && PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, 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 4d5bea0a33..6c0f0d15ab 100644 --- a/e2e/vue-start/start-manifest/tests/start-manifest.spec.ts +++ b/e2e/vue-start/start-manifest/tests/start-manifest.spec.ts @@ -372,19 +372,24 @@ test('shared widget CSS stays applied when navigating from static to lazy route' const widget = page.getByTestId('shared-widget') await expect(widget).toBeVisible() - await expect(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) - await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) + expect(await getBackgroundColor('shared-widget', page)).toBe(SHARED_WIDGET_BG) + expect( + await widget.evaluate( + (element) => getComputedStyle(element).borderTopColor, + ), + ).toBe(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(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) - await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) + await expect + .poll(() => getBackgroundColor('shared-widget', page), { + timeout: 5_000, + }) + .toBe(SHARED_WIDGET_BG) }) test('shared widget CSS stays applied when navigating from lazy to static route', async ({ @@ -394,19 +399,27 @@ 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() - 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 expect + .poll(() => getBackgroundColor('shared-widget', page), { + timeout: 5_000, + }) + .toBe(SHARED_WIDGET_BG) 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(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) - await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) + 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) }) test('shared widget CSS is applied on direct navigation to lazy route', async ({ @@ -418,8 +431,17 @@ 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(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) - await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) + + 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) }) test('shared widget CSS persists after navigating away from lazy and back', async ({ @@ -429,21 +451,19 @@ 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('lazy-css-lazy-heading')).toBeVisible() - await expect(widget).toBeVisible() + await expect(page.getByTestId('shared-widget')).toBeVisible() await page.getByTestId('nav-home').click() - await page.waitForURL((url) => url.pathname === '/') - await expect(page.getByTestId('home-copy')).toBeVisible() + await page.waitForURL(/\/([^/]*)(\/)?($|\?)/) 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(widget).toHaveCSS('background-color', SHARED_WIDGET_BG) - await expect(widget).toHaveCSS('border-top-color', SHARED_WIDGET_BORDER) + await expect + .poll(() => getBackgroundColor('shared-widget', page), { + timeout: 5_000, + }) + .toBe(SHARED_WIDGET_BG) }) diff --git a/e2e/vue-start/streaming-ssr/package.json b/e2e/vue-start/streaming-ssr/package.json deleted file mode 100644 index 382120860a..0000000000 --- a/e2e/vue-start/streaming-ssr/package.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "name": "tanstack-vue-start-e2e-streaming-ssr", - "private": true, - "sideEffects": false, - "type": "module", - "scripts": { - "dev": "vite dev --port 3000", - "dev:e2e": "vite dev", - "build": "vite build && tsc --noEmit", - "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "preview": "vite preview", - "test:e2e": "playwright test --project=chromium", - "test:e2e:preview": "MODE=preview playwright test preview-streaming.spec.ts --project=chromium" - }, - "dependencies": { - "@tanstack/vue-query": "^5.90.0", - "@tanstack/vue-router": "workspace:^", - "@tanstack/vue-router-ssr-query": "workspace:^", - "@tanstack/vue-start": "workspace:^", - "vue": "^3.5.16" - }, - "devDependencies": { - "@playwright/test": "^1.61.0", - "@tanstack/router-e2e-utils": "workspace:^", - "@types/node": "^22.10.2", - "@vitejs/plugin-vue-jsx": "^5.1.5", - "srvx": "^1.0.0", - "@typescript/native": "npm:typescript@^7.0.2", - "typescript": "npm:@typescript/typescript6@^6.0.2", - "vite": "^8.0.14" - }, - "nx": { - "targets": { - "build": { - "inputs": [ - "buildProduction", - "^buildProduction", - "dependentTaskOutputs", - "streamingSsrTests" - ] - }, - "test:e2e": { - "inputs": [ - "default", - "^production", - "dependentTaskOutputs", - "streamingSsrTests" - ] - }, - "test:e2e:preview": { - "inputs": [ - "default", - "^production", - "streamingSsrTests" - ] - } - } - } -} diff --git a/e2e/vue-start/streaming-ssr/playwright.config.ts b/e2e/vue-start/streaming-ssr/playwright.config.ts deleted file mode 100644 index c2f3b67a0c..0000000000 --- a/e2e/vue-start/streaming-ssr/playwright.config.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' - -const isPreview = process.env.MODE === 'preview' - -const PORT = Number(process.env.E2E_APP_PORT ?? 0) -const baseURL = `http://localhost:${PORT}` - -const ssrCommand = `VITE_SERVER_PORT=${PORT} pnpm build && PORT=${PORT} VITE_SERVER_PORT=${PORT} pnpm start` -const previewCommand = `VITE_SERVER_PORT=${PORT} pnpm build && pnpm preview --port ${PORT}` - -/** - * See https://playwright.dev/docs/test-configuration. - */ -export default defineConfig({ - testDir: './tests', - workers: 1, - - reporter: [['line']], - - use: { - /* Base URL to use in actions like `await page.goto('/')`. */ - baseURL, - }, - - webServer: { - command: isPreview ? previewCommand : ssrCommand, - wait: appServerReady, - reuseExistingServer: false, - stdout: 'pipe', - }, - - projects: [ - { - name: 'chromium', - use: { ...devices['Desktop Chrome'] }, - }, - ], -}) diff --git a/e2e/vue-start/streaming-ssr/src/routeTree.gen.ts b/e2e/vue-start/streaming-ssr/src/routeTree.gen.ts deleted file mode 100644 index ac4c9ab156..0000000000 --- a/e2e/vue-start/streaming-ssr/src/routeTree.gen.ts +++ /dev/null @@ -1,282 +0,0 @@ -/* 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 ConcurrentRouteImport } from './routes/concurrent' -import { Route as DeferredRouteImport } from './routes/deferred' -import { Route as DeferredRejectionRouteImport } from './routes/deferred-rejection' -import { Route as FastSerialRouteImport } from './routes/fast-serial' -import { Route as ManyPromisesRouteImport } from './routes/many-promises' -import { Route as NestedDeferredRouteImport } from './routes/nested-deferred' -import { Route as QueryHeavyRouteImport } from './routes/query-heavy' -import { Route as SlowRenderRouteImport } from './routes/slow-render' -import { Route as StreamRouteImport } from './routes/stream' -import { Route as SyncOnlyRouteImport } from './routes/sync-only' - -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => rootRouteImport, -} as any) -const ConcurrentRoute = ConcurrentRouteImport.update({ - id: '/concurrent', - path: '/concurrent', - getParentRoute: () => rootRouteImport, -} as any) -const DeferredRoute = DeferredRouteImport.update({ - id: '/deferred', - path: '/deferred', - getParentRoute: () => rootRouteImport, -} as any) -const DeferredRejectionRoute = DeferredRejectionRouteImport.update({ - id: '/deferred-rejection', - path: '/deferred-rejection', - getParentRoute: () => rootRouteImport, -} as any) -const FastSerialRoute = FastSerialRouteImport.update({ - id: '/fast-serial', - path: '/fast-serial', - getParentRoute: () => rootRouteImport, -} as any) -const ManyPromisesRoute = ManyPromisesRouteImport.update({ - id: '/many-promises', - path: '/many-promises', - getParentRoute: () => rootRouteImport, -} as any) -const NestedDeferredRoute = NestedDeferredRouteImport.update({ - id: '/nested-deferred', - path: '/nested-deferred', - getParentRoute: () => rootRouteImport, -} as any) -const QueryHeavyRoute = QueryHeavyRouteImport.update({ - id: '/query-heavy', - path: '/query-heavy', - getParentRoute: () => rootRouteImport, -} as any) -const SlowRenderRoute = SlowRenderRouteImport.update({ - id: '/slow-render', - path: '/slow-render', - getParentRoute: () => rootRouteImport, -} as any) -const StreamRoute = StreamRouteImport.update({ - id: '/stream', - path: '/stream', - getParentRoute: () => rootRouteImport, -} as any) -const SyncOnlyRoute = SyncOnlyRouteImport.update({ - id: '/sync-only', - path: '/sync-only', - getParentRoute: () => rootRouteImport, -} as any) - -export interface FileRoutesByFullPath { - '/': typeof IndexRoute - '/concurrent': typeof ConcurrentRoute - '/deferred': typeof DeferredRoute - '/deferred-rejection': typeof DeferredRejectionRoute - '/fast-serial': typeof FastSerialRoute - '/many-promises': typeof ManyPromisesRoute - '/nested-deferred': typeof NestedDeferredRoute - '/query-heavy': typeof QueryHeavyRoute - '/slow-render': typeof SlowRenderRoute - '/stream': typeof StreamRoute - '/sync-only': typeof SyncOnlyRoute -} -export interface FileRoutesByTo { - '/': typeof IndexRoute - '/concurrent': typeof ConcurrentRoute - '/deferred': typeof DeferredRoute - '/deferred-rejection': typeof DeferredRejectionRoute - '/fast-serial': typeof FastSerialRoute - '/many-promises': typeof ManyPromisesRoute - '/nested-deferred': typeof NestedDeferredRoute - '/query-heavy': typeof QueryHeavyRoute - '/slow-render': typeof SlowRenderRoute - '/stream': typeof StreamRoute - '/sync-only': typeof SyncOnlyRoute -} -export interface FileRoutesById { - __root__: typeof rootRouteImport - '/': typeof IndexRoute - '/concurrent': typeof ConcurrentRoute - '/deferred': typeof DeferredRoute - '/deferred-rejection': typeof DeferredRejectionRoute - '/fast-serial': typeof FastSerialRoute - '/many-promises': typeof ManyPromisesRoute - '/nested-deferred': typeof NestedDeferredRoute - '/query-heavy': typeof QueryHeavyRoute - '/slow-render': typeof SlowRenderRoute - '/stream': typeof StreamRoute - '/sync-only': typeof SyncOnlyRoute -} -export interface FileRouteTypes { - fileRoutesByFullPath: FileRoutesByFullPath - fullPaths: - | '/' - | '/concurrent' - | '/deferred' - | '/deferred-rejection' - | '/fast-serial' - | '/many-promises' - | '/nested-deferred' - | '/query-heavy' - | '/slow-render' - | '/stream' - | '/sync-only' - fileRoutesByTo: FileRoutesByTo - to: - | '/' - | '/concurrent' - | '/deferred' - | '/deferred-rejection' - | '/fast-serial' - | '/many-promises' - | '/nested-deferred' - | '/query-heavy' - | '/slow-render' - | '/stream' - | '/sync-only' - id: - | '__root__' - | '/' - | '/concurrent' - | '/deferred' - | '/deferred-rejection' - | '/fast-serial' - | '/many-promises' - | '/nested-deferred' - | '/query-heavy' - | '/slow-render' - | '/stream' - | '/sync-only' - fileRoutesById: FileRoutesById -} -export interface RootRouteChildren { - IndexRoute: typeof IndexRoute - ConcurrentRoute: typeof ConcurrentRoute - DeferredRoute: typeof DeferredRoute - DeferredRejectionRoute: typeof DeferredRejectionRoute - FastSerialRoute: typeof FastSerialRoute - ManyPromisesRoute: typeof ManyPromisesRoute - NestedDeferredRoute: typeof NestedDeferredRoute - QueryHeavyRoute: typeof QueryHeavyRoute - SlowRenderRoute: typeof SlowRenderRoute - StreamRoute: typeof StreamRoute - SyncOnlyRoute: typeof SyncOnlyRoute -} - -declare module '@tanstack/vue-router' { - interface FileRoutesByPath { - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport - parentRoute: typeof rootRouteImport - } - '/concurrent': { - id: '/concurrent' - path: '/concurrent' - fullPath: '/concurrent' - preLoaderRoute: typeof ConcurrentRouteImport - parentRoute: typeof rootRouteImport - } - '/deferred': { - id: '/deferred' - path: '/deferred' - fullPath: '/deferred' - preLoaderRoute: typeof DeferredRouteImport - parentRoute: typeof rootRouteImport - } - '/deferred-rejection': { - id: '/deferred-rejection' - path: '/deferred-rejection' - fullPath: '/deferred-rejection' - preLoaderRoute: typeof DeferredRejectionRouteImport - parentRoute: typeof rootRouteImport - } - '/fast-serial': { - id: '/fast-serial' - path: '/fast-serial' - fullPath: '/fast-serial' - preLoaderRoute: typeof FastSerialRouteImport - parentRoute: typeof rootRouteImport - } - '/many-promises': { - id: '/many-promises' - path: '/many-promises' - fullPath: '/many-promises' - preLoaderRoute: typeof ManyPromisesRouteImport - parentRoute: typeof rootRouteImport - } - '/nested-deferred': { - id: '/nested-deferred' - path: '/nested-deferred' - fullPath: '/nested-deferred' - preLoaderRoute: typeof NestedDeferredRouteImport - parentRoute: typeof rootRouteImport - } - '/query-heavy': { - id: '/query-heavy' - path: '/query-heavy' - fullPath: '/query-heavy' - preLoaderRoute: typeof QueryHeavyRouteImport - parentRoute: typeof rootRouteImport - } - '/slow-render': { - id: '/slow-render' - path: '/slow-render' - fullPath: '/slow-render' - preLoaderRoute: typeof SlowRenderRouteImport - parentRoute: typeof rootRouteImport - } - '/stream': { - id: '/stream' - path: '/stream' - fullPath: '/stream' - preLoaderRoute: typeof StreamRouteImport - parentRoute: typeof rootRouteImport - } - '/sync-only': { - id: '/sync-only' - path: '/sync-only' - fullPath: '/sync-only' - preLoaderRoute: typeof SyncOnlyRouteImport - parentRoute: typeof rootRouteImport - } - } -} - -const rootRouteChildren: RootRouteChildren = { - IndexRoute: IndexRoute, - ConcurrentRoute: ConcurrentRoute, - DeferredRoute: DeferredRoute, - DeferredRejectionRoute: DeferredRejectionRoute, - FastSerialRoute: FastSerialRoute, - ManyPromisesRoute: ManyPromisesRoute, - NestedDeferredRoute: NestedDeferredRoute, - QueryHeavyRoute: QueryHeavyRoute, - SlowRenderRoute: SlowRenderRoute, - StreamRoute: StreamRoute, - SyncOnlyRoute: SyncOnlyRoute, -} -export const routeTree = rootRouteImport - ._addFileChildren(rootRouteChildren) - ._addFileTypes() - -import type { getRouter } from './router.tsx' -import type { createStart } from '@tanstack/vue-start' -declare module '@tanstack/vue-start' { - interface Register { - ssr: true - router: Awaited> - } -} diff --git a/e2e/vue-start/streaming-ssr/src/router.tsx b/e2e/vue-start/streaming-ssr/src/router.tsx deleted file mode 100644 index 257eb8dac9..0000000000 --- a/e2e/vue-start/streaming-ssr/src/router.tsx +++ /dev/null @@ -1,18 +0,0 @@ -import { QueryClient } from '@tanstack/vue-query' -import { createRouter } from '@tanstack/vue-router' -import { setupRouterSsrQueryIntegration } from '@tanstack/vue-router-ssr-query' -import { routeTree } from './routeTree.gen' - -export function getRouter() { - const queryClient = new QueryClient() - const router = createRouter({ - routeTree, - context: { queryClient }, - scrollRestoration: true, - }) - setupRouterSsrQueryIntegration({ - router, - queryClient, - }) - return router -} diff --git a/e2e/vue-start/streaming-ssr/src/routes/__root.tsx b/e2e/vue-start/streaming-ssr/src/routes/__root.tsx deleted file mode 100644 index d3b3339720..0000000000 --- a/e2e/vue-start/streaming-ssr/src/routes/__root.tsx +++ /dev/null @@ -1,103 +0,0 @@ -import { - Body, - HeadContent, - Html, - Link, - Outlet, - Scripts, - createRootRouteWithContext, -} from '@tanstack/vue-router' -import { defineComponent, ref } from 'vue' -import type { QueryClient } from '@tanstack/vue-query' - -export const Route = createRootRouteWithContext<{ - queryClient: QueryClient -}>()({ - head: () => ({ - meta: [ - { charSet: 'utf-8' }, - { name: 'viewport', content: 'width=device-width, initial-scale=1' }, - { title: 'Streaming SSR Tests' }, - ], - }), - component: RootComponent, -}) - -function RootComponent() { - return ( - - - - - - - - - - - - ) -} - -const HydrationCheck = defineComponent({ - setup() { - const status = ref<'pending' | 'hydrated'>('pending') - - return () => ( -
- - - {status.value} - -
- ) - }, -}) diff --git a/e2e/vue-start/streaming-ssr/src/routes/concurrent.tsx b/e2e/vue-start/streaming-ssr/src/routes/concurrent.tsx deleted file mode 100644 index 5fed8ab517..0000000000 --- a/e2e/vue-start/streaming-ssr/src/routes/concurrent.tsx +++ /dev/null @@ -1,54 +0,0 @@ -import { Await, createFileRoute } from '@tanstack/vue-router' -import { Suspense } from 'vue' -import { createConcurrentLoaderData } from '../../../../streaming-ssr-fixtures' - -export const Route = createFileRoute('/concurrent')({ - loader: async () => createConcurrentLoaderData(), - component: Concurrent, -}) - -function PromiseItem(props: { promise: Promise; testId: string }) { - return ( - - {{ - default: () => ( - ( -
{value}
- )} - /> - ), - fallback: () => ( -
Loading...
- ), - }} -
- ) -} - -function Concurrent() { - const data = Route.useLoaderData() - - return ( -
-

Concurrent Resolution Test (15 promises in 3 batches)

-

Tests multiple promises resolving at the exact same instant.

- - - - - - - - - - - - - - - -
- ) -} diff --git a/e2e/vue-start/streaming-ssr/src/routes/deferred-rejection.tsx b/e2e/vue-start/streaming-ssr/src/routes/deferred-rejection.tsx deleted file mode 100644 index 5018f9e07c..0000000000 --- a/e2e/vue-start/streaming-ssr/src/routes/deferred-rejection.tsx +++ /dev/null @@ -1,49 +0,0 @@ -import { Await, createFileRoute } from '@tanstack/vue-router' -import { Suspense } from 'vue' -import { - deferredDataDelay, - deferredErrorMessage, -} from '../../../../streaming-ssr-fixtures' - -export const Route = createFileRoute('/deferred-rejection')({ - loader: async () => { - return { - deferredData: new Promise((_resolve, reject) => { - setTimeout(() => { - reject(new Error(deferredErrorMessage)) - }, deferredDataDelay) - }), - } - }, - errorComponent: ({ error }) => ( -
- {error instanceof Error ? error.message : String(error)} -
- ), - component: DeferredRejection, -}) - -function DeferredRejection() { - const data = Route.useLoaderData() - - return ( -
-

Deferred Rejection Test

- - {{ - default: () => ( - ( -
{value}
- )} - /> - ), - fallback: () => ( -
Loading deferred...
- ), - }} -
-
- ) -} diff --git a/e2e/vue-start/streaming-ssr/src/routes/deferred.tsx b/e2e/vue-start/streaming-ssr/src/routes/deferred.tsx deleted file mode 100644 index 6a8affe1b4..0000000000 --- a/e2e/vue-start/streaming-ssr/src/routes/deferred.tsx +++ /dev/null @@ -1,100 +0,0 @@ -import { Await, createFileRoute } from '@tanstack/vue-router' -import { createServerFn } from '@tanstack/vue-start' -import { Suspense } from 'vue' -import { - deferredDataDelay, - deferredDataMessage, - deferredImmediateName, - deferredServerDelay, - deferredSlowName, - delay, - makeDeferredMessage, - makeServerData, - sourceMarker, -} from '../../../../streaming-ssr-fixtures' - -const getImmediateData = createServerFn({ method: 'GET' }) - .validator((data: { name: string }) => data) - .handler(({ data }) => makeServerData(data.name)) - -const getSlowData = createServerFn({ method: 'GET' }) - .validator((data: { name: string; delay: number }) => data) - .handler(async ({ data }) => { - await delay(data.delay) - return makeServerData(data.name) - }) - -export const Route = createFileRoute('/deferred')({ - loader: async () => { - return { - deferredData: makeDeferredMessage(deferredDataMessage, deferredDataDelay), - deferredServerData: getSlowData({ - data: { name: deferredSlowName, delay: deferredServerDelay }, - }), - immediateData: await getImmediateData({ - data: { name: deferredImmediateName }, - }), - loaderSource: sourceMarker(), - } - }, - component: Deferred, -}) - -function Deferred() { - const data = Route.useLoaderData() - - return ( -
-

Deferred Data Test

-
- Immediate: {data.value.immediateData.name} @{' '} - {data.value.immediateData.timestamp} -
-
- Immediate source: {data.value.immediateData.source} -
-
- Loader source: {data.value.loaderSource} -
- - {{ - default: () => ( - ( -
- {value.message} (source: {value.source}) -
- )} - /> - ), - fallback: () => ( -
Loading deferred...
- ), - }} -
- - {{ - default: () => ( - ( -
- Server: {value.name} @ {value.timestamp} (source:{' '} - {value.source}) -
- )} - /> - ), - fallback: () => ( -
Loading server data...
- ), - }} -
-
- ) -} diff --git a/e2e/vue-start/streaming-ssr/src/routes/fast-serial.tsx b/e2e/vue-start/streaming-ssr/src/routes/fast-serial.tsx deleted file mode 100644 index ac004b041c..0000000000 --- a/e2e/vue-start/streaming-ssr/src/routes/fast-serial.tsx +++ /dev/null @@ -1,49 +0,0 @@ -import { createFileRoute } from '@tanstack/vue-router' -import { createServerFn } from '@tanstack/vue-start' -import { - fastSerialStaticData, - makeFastSerialSmallData, - sourceMarker, -} from '../../../../streaming-ssr-fixtures' - -const getSmallData = createServerFn({ method: 'GET' }).handler(() => - makeFastSerialSmallData(), -) - -export const Route = createFileRoute('/fast-serial')({ - loader: async () => { - const data = await getSmallData() - return { - serverData: data, - staticData: fastSerialStaticData, - timestamp: Date.now(), - loaderSource: sourceMarker(), - } - }, - component: FastSerial, -}) - -function FastSerial() { - const data = Route.useLoaderData() - - return ( -
-

Fast Serialization Test

-

This route tests when serialization completes before render.

-
- Server: {data.value.serverData.value} @{' '} - {data.value.serverData.timestamp} -
-
- Server function source: {data.value.serverData.source} -
-
- Loader source: {data.value.loaderSource} -
-
Static: {data.value.staticData}
-
- Loader timestamp: {data.value.timestamp} -
-
- ) -} diff --git a/e2e/vue-start/streaming-ssr/src/routes/index.tsx b/e2e/vue-start/streaming-ssr/src/routes/index.tsx deleted file mode 100644 index 0350eb5d4a..0000000000 --- a/e2e/vue-start/streaming-ssr/src/routes/index.tsx +++ /dev/null @@ -1,58 +0,0 @@ -import { Link, createFileRoute } from '@tanstack/vue-router' - -export const Route = createFileRoute('/')({ - component: Index, -}) - -function Index() { - return ( -
-

Streaming SSR Test Scenarios

-

This e2e project tests various SSR streaming scenarios:

-
    -
  • - - Sync Only - {' '} - - Tests synchronous serialization with no deferred/streaming data -
  • -
  • - - Deferred Data - {' '} - - Tests deferred promises resolving after initial render -
  • -
  • - - Deferred Rejection - {' '} - - Tests deferred promise rejections render through the error boundary -
  • -
  • - - ReadableStream - {' '} - - Tests streaming data via ReadableStream -
  • -
  • - - Fast Serialization - {' '} - - Tests when serialization completes before render finishes -
  • -
  • - - Slow Render - {' '} - - Tests when render takes longer than serialization -
  • -
  • - - Nested Deferred - {' '} - - Tests nested components with deferred data -
  • -
-
- ) -} diff --git a/e2e/vue-start/streaming-ssr/src/routes/many-promises.tsx b/e2e/vue-start/streaming-ssr/src/routes/many-promises.tsx deleted file mode 100644 index 4361696107..0000000000 --- a/e2e/vue-start/streaming-ssr/src/routes/many-promises.tsx +++ /dev/null @@ -1,94 +0,0 @@ -import { Await, createFileRoute } from '@tanstack/vue-router' -import { Suspense } from 'vue' -import { createManyPromises } from '../../../../streaming-ssr-fixtures' - -export const Route = createFileRoute('/many-promises')({ - loader: async () => createManyPromises(), - component: ManyPromises, -}) - -function PromiseItem(props: { - promise: Promise - testId: string - label: string -}) { - return ( - - {{ - default: () => ( - ( -
- {props.label}: {value} -
- )} - /> - ), - fallback: () => ( -
- Loading {props.label}... -
- ), - }} -
- ) -} - -function ManyPromises() { - const data = Route.useLoaderData() - - return ( -
-

Many Promises Test (15 deferred)

-

Tests streaming with many concurrent deferred promises.

- - - - - - - - - - - - - - - -
- ) -} diff --git a/e2e/vue-start/streaming-ssr/src/routes/nested-deferred.tsx b/e2e/vue-start/streaming-ssr/src/routes/nested-deferred.tsx deleted file mode 100644 index b24336ec40..0000000000 --- a/e2e/vue-start/streaming-ssr/src/routes/nested-deferred.tsx +++ /dev/null @@ -1,143 +0,0 @@ -import { Await, createFileRoute } from '@tanstack/vue-router' -import { createServerFn } from '@tanstack/vue-start' -import { Suspense } from 'vue' -import { - delay, - makeDeferred, - makeLevelData, - nestedLevelDelays, - nestedPlainDelay, - nestedPlainMessage, -} from '../../../../streaming-ssr-fixtures' - -const getLevel1Data = createServerFn({ method: 'GET' }).handler(async () => { - await delay(nestedLevelDelays[0]) - return makeLevelData(1) -}) - -const getLevel2Data = createServerFn({ method: 'GET' }).handler(async () => { - await delay(nestedLevelDelays[1]) - return makeLevelData(2) -}) - -const getLevel3Data = createServerFn({ method: 'GET' }).handler(async () => { - await delay(nestedLevelDelays[2]) - return makeLevelData(3) -}) - -export const Route = createFileRoute('/nested-deferred')({ - loader: async () => { - return { - level1: getLevel1Data(), - level2: getLevel2Data(), - level3: getLevel3Data(), - plainDeferred: makeDeferred(nestedPlainMessage, nestedPlainDelay), - } - }, - component: NestedDeferred, -}) - -function Level2Content(props: { - level3: Promise<{ level: number; timestamp: number }> -}) { - return ( -
- - {{ - default: () => ( - ( -
- Level 3: {value.level} @ {value.timestamp} -
- )} - /> - ), - fallback: () => ( -
Loading level 3...
- ), - }} -
-
- ) -} - -function Level1Content(props: { - level2: Promise<{ level: number; timestamp: number }> - level3: Promise<{ level: number; timestamp: number }> -}) { - return ( -
- - {{ - default: () => ( - ( -
- Level 2: {value.level} @ {value.timestamp} - -
- )} - /> - ), - fallback: () => ( -
Loading level 2...
- ), - }} -
-
- ) -} - -function NestedDeferred() { - const data = Route.useLoaderData() - - return ( -
-

Nested Deferred Test

-

- Tests multiple nested deferred promises resolving at different times. -

- - {{ - default: () => ( - ( -
{value}
- )} - /> - ), - fallback: () => ( -
Loading plain...
- ), - }} -
-
- - {{ - default: () => ( - ( -
- Level 1: {value.level} @ {value.timestamp} - -
- )} - /> - ), - fallback: () => ( -
Loading level 1...
- ), - }} -
-
-
- ) -} diff --git a/e2e/vue-start/streaming-ssr/src/routes/query-heavy.tsx b/e2e/vue-start/streaming-ssr/src/routes/query-heavy.tsx deleted file mode 100644 index b22154b78e..0000000000 --- a/e2e/vue-start/streaming-ssr/src/routes/query-heavy.tsx +++ /dev/null @@ -1,168 +0,0 @@ -import { queryOptions, useQuery } from '@tanstack/vue-query' -import { createFileRoute } from '@tanstack/vue-router' -import { Suspense, defineComponent } from 'vue' -import type { PropType } from 'vue' - -import { - delay, - makeQueryData, - queryHeavyItems, -} from '../../../../streaming-ssr-fixtures' -import type { QueryData } from '../../../../streaming-ssr-fixtures' - -function makeQueryOptions(item: (typeof queryHeavyItems)[number]) { - return queryOptions({ - queryKey: ['streaming-ssr-query-heavy', item.type, item.id], - queryFn: async (): Promise => { - if (item.delayMs > 0) { - await delay(item.delayMs) - } - - return makeQueryData(item) - }, - staleTime: Infinity, - }) -} - -const syncQuery1 = makeQueryOptions(queryHeavyItems[0]) -const syncQuery2 = makeQueryOptions(queryHeavyItems[1]) -const syncQuery3 = makeQueryOptions(queryHeavyItems[2]) -const fastAsyncQuery1 = makeQueryOptions(queryHeavyItems[3]) -const fastAsyncQuery2 = makeQueryOptions(queryHeavyItems[4]) -const fastAsyncQuery3 = makeQueryOptions(queryHeavyItems[5]) -const slowAsyncQuery1 = makeQueryOptions(queryHeavyItems[6]) -const slowAsyncQuery2 = makeQueryOptions(queryHeavyItems[7]) -const slowAsyncQuery3 = makeQueryOptions(queryHeavyItems[8]) - -type QueryOptions = ReturnType - -const QueryDisplay = defineComponent({ - props: { - queryOpts: { - type: Object as PropType, - required: true, - }, - testId: { - type: String, - required: true, - }, - }, - async setup(props) { - const query = useQuery(props.queryOpts) - await query.suspense() - - return () => { - const data = query.data.value - - return ( -
- {data?.value} (source: {data?.source}) -
- ) - } - }, -}) - -function QuerySuspense(props: { - queryOpts: QueryOptions - testId: string - fallback: string -}) { - return ( - - {{ - default: () => ( - - ), - fallback: () => ( -
{props.fallback}
- ), - }} -
- ) -} - -const QueryHeavy = defineComponent({ - setup() { - return () => ( -
-

Query Heavy Test (9 useQuery calls)

-

Tests multiple useQuery with mixed sync/async queryFn.

-

- All queries should show "source: server" if SSR streaming works - correctly. -

- -
-
-

Sync Queries (immediate)

- - - -
- -
-

Fast Async Queries (50-100ms)

- - - -
- -
-

Slow Async Queries (200-400ms)

- - - -
-
-
- ) - }, -}) - -export const Route = createFileRoute('/query-heavy')({ - component: QueryHeavy, -}) diff --git a/e2e/vue-start/streaming-ssr/src/routes/slow-render.tsx b/e2e/vue-start/streaming-ssr/src/routes/slow-render.tsx deleted file mode 100644 index f897e03ff0..0000000000 --- a/e2e/vue-start/streaming-ssr/src/routes/slow-render.tsx +++ /dev/null @@ -1,77 +0,0 @@ -import { Await, createFileRoute } from '@tanstack/vue-router' -import { createServerFn } from '@tanstack/vue-start' -import { Suspense } from 'vue' -import { - makeDeferredMessage, - makeServerData, - slowRenderComponents, - slowRenderDeferredDelay, - slowRenderDeferredMessage, - slowRenderQuickName, - sourceMarker, -} from '../../../../streaming-ssr-fixtures' - -const getQuickData = createServerFn({ method: 'GET' }).handler(() => - makeServerData(slowRenderQuickName), -) - -function SlowComponent(props: { data: string; index: number }) { - const startTime = Date.now() - while (Date.now() - startTime < 100) { - // Simulate slow render work. - } - return
{props.data}
-} - -export const Route = createFileRoute('/slow-render')({ - loader: async () => { - const quickData = await getQuickData() - return { - quickData, - deferredData: makeDeferredMessage( - slowRenderDeferredMessage, - slowRenderDeferredDelay, - ), - loaderSource: sourceMarker(), - } - }, - component: SlowRender, -}) - -function SlowRender() { - const data = Route.useLoaderData() - - return ( -
-

Slow Render Test

-

Tests when render takes longer than serialization.

-
- Quick: {data.value.quickData.name} @ {data.value.quickData.timestamp} -
-
- Quick data source: {data.value.quickData.source} -
-
- Loader source: {data.value.loaderSource} -
- - {{ - default: () => ( - ( -
- {value.message} (source: {value.source}) -
- )} - /> - ), - fallback: () =>
Loading...
, - }} -
- {slowRenderComponents.map((data, index) => ( - - ))} -
- ) -} diff --git a/e2e/vue-start/streaming-ssr/src/routes/stream.tsx b/e2e/vue-start/streaming-ssr/src/routes/stream.tsx deleted file mode 100644 index 31368bedfc..0000000000 --- a/e2e/vue-start/streaming-ssr/src/routes/stream.tsx +++ /dev/null @@ -1,171 +0,0 @@ -import { Await, createFileRoute, useRouter } from '@tanstack/vue-router' -import { - Suspense, - defineComponent, - onMounted, - onUnmounted, - ref, - watch, -} from 'vue' -import { - createChunkStream, - createStreamPromise, -} from '../../../../streaming-ssr-fixtures' - -export const Route = createFileRoute('/stream')({ - component: () => , - loader() { - return { - promise: createStreamPromise(), - stream: createChunkStream(), - } - }, -}) - -const decoder = new TextDecoder('utf-8') - -const StreamRoute = defineComponent({ - setup() { - const data = Route.useLoaderData() - const router = useRouter() - const streamData = ref>([]) - const streamComplete = ref(false) - const streamReadCount = ref(0) - let reader: ReadableStreamDefaultReader | undefined - let mounted = false - let activeStream: ReadableStream | undefined - let reading = false - let readTimer: ReturnType | undefined - - function clearReadTimer() { - if (readTimer) { - clearTimeout(readTimer) - readTimer = undefined - } - } - - function scheduleRead(delay = 0) { - if (!mounted || reading) { - return - } - - clearReadTimer() - readTimer = setTimeout(() => { - readTimer = undefined - void readStream() - }, delay) - } - - async function readStream() { - const stream = data.value.stream - if (!mounted || reading || activeStream === stream) { - return - } - - if (stream.locked) { - scheduleRead(10) - return - } - - streamData.value = [] - streamComplete.value = false - - let activeReader: ReadableStreamDefaultReader | undefined - - try { - const currentReader = stream.getReader() - activeReader = currentReader - reader = currentReader - activeStream = stream - reading = true - streamReadCount.value++ - - let chunk - while (!(chunk = await currentReader.read()).done) { - let value = chunk.value - if (typeof value !== 'string') { - value = decoder.decode(value, { stream: !chunk.done }) - } - streamData.value = [...streamData.value, value] - } - streamComplete.value = true - } catch (e) { - const message = String(e) - if (e instanceof TypeError && message.includes('locked')) { - activeStream = undefined - scheduleRead(10) - } else if (!(e instanceof TypeError && message.includes('cancelled'))) { - console.error('Stream error:', e) - } - } finally { - activeReader?.releaseLock() - if (reader === activeReader) { - reader = undefined - } - reading = false - if (activeStream !== data.value.stream) { - scheduleRead() - } - } - } - - onMounted(() => { - mounted = true - scheduleRead() - }) - watch( - () => data.value.stream, - () => { - activeStream = undefined - scheduleRead() - }, - ) - onUnmounted(() => { - mounted = false - clearReadTimer() - reader?.cancel().catch(() => {}) - reader = undefined - }) - - return () => ( -
-

ReadableStream Test

- - - {{ - default: () => ( - ( -
{value}
- )} - /> - ), - fallback: () => ( -
Loading promise...
- ), - }} -
-
-

Stream chunks:

-
- {streamData.value.map((chunk, i) => ( -
{chunk}
- ))} -
- {streamComplete.value && ( -
Stream complete!
- )} -
-
- ) - }, -}) diff --git a/e2e/vue-start/streaming-ssr/src/routes/sync-only.tsx b/e2e/vue-start/streaming-ssr/src/routes/sync-only.tsx deleted file mode 100644 index bbad10839e..0000000000 --- a/e2e/vue-start/streaming-ssr/src/routes/sync-only.tsx +++ /dev/null @@ -1,25 +0,0 @@ -import { createFileRoute } from '@tanstack/vue-router' -import { makeSyncOnlyData } from '../../../../streaming-ssr-fixtures' - -export const Route = createFileRoute('/sync-only')({ - loader: async () => makeSyncOnlyData(), - component: SyncOnly, -}) - -function SyncOnly() { - const data = Route.useLoaderData() - - return ( -
-

Synchronous Serialization Test

-

{data.value.message}

-

Loaded at: {data.value.timestamp}

-

Source: {data.value.source}

-
    - {data.value.items.map((item: string) => ( -
  • {item}
  • - ))} -
-
- ) -} diff --git a/e2e/vue-start/streaming-ssr/tests/client-navigation.spec.ts b/e2e/vue-start/streaming-ssr/tests/client-navigation.spec.ts deleted file mode 100644 index 8b9b3a8dcc..0000000000 --- a/e2e/vue-start/streaming-ssr/tests/client-navigation.spec.ts +++ /dev/null @@ -1 +0,0 @@ -import '../../../streaming-ssr-specs/client-navigation' diff --git a/e2e/vue-start/streaming-ssr/tests/concurrent.spec.ts b/e2e/vue-start/streaming-ssr/tests/concurrent.spec.ts deleted file mode 100644 index 8625473a58..0000000000 --- a/e2e/vue-start/streaming-ssr/tests/concurrent.spec.ts +++ /dev/null @@ -1 +0,0 @@ -import '../../../streaming-ssr-specs/concurrent' diff --git a/e2e/vue-start/streaming-ssr/tests/deferred-rejection.spec.ts b/e2e/vue-start/streaming-ssr/tests/deferred-rejection.spec.ts deleted file mode 100644 index 355b5019bc..0000000000 --- a/e2e/vue-start/streaming-ssr/tests/deferred-rejection.spec.ts +++ /dev/null @@ -1 +0,0 @@ -import '../../../streaming-ssr-specs/deferred-rejection' diff --git a/e2e/vue-start/streaming-ssr/tests/deferred.spec.ts b/e2e/vue-start/streaming-ssr/tests/deferred.spec.ts deleted file mode 100644 index 3145897d7b..0000000000 --- a/e2e/vue-start/streaming-ssr/tests/deferred.spec.ts +++ /dev/null @@ -1 +0,0 @@ -import '../../../streaming-ssr-specs/deferred' diff --git a/e2e/vue-start/streaming-ssr/tests/fast-serial.spec.ts b/e2e/vue-start/streaming-ssr/tests/fast-serial.spec.ts deleted file mode 100644 index 95df0555e2..0000000000 --- a/e2e/vue-start/streaming-ssr/tests/fast-serial.spec.ts +++ /dev/null @@ -1 +0,0 @@ -import '../../../streaming-ssr-specs/fast-serial' diff --git a/e2e/vue-start/streaming-ssr/tests/home.spec.ts b/e2e/vue-start/streaming-ssr/tests/home.spec.ts deleted file mode 100644 index 5d49d34a56..0000000000 --- a/e2e/vue-start/streaming-ssr/tests/home.spec.ts +++ /dev/null @@ -1 +0,0 @@ -import '../../../streaming-ssr-specs/home' diff --git a/e2e/vue-start/streaming-ssr/tests/many-promises.spec.ts b/e2e/vue-start/streaming-ssr/tests/many-promises.spec.ts deleted file mode 100644 index b747bd7d0a..0000000000 --- a/e2e/vue-start/streaming-ssr/tests/many-promises.spec.ts +++ /dev/null @@ -1 +0,0 @@ -import '../../../streaming-ssr-specs/many-promises' diff --git a/e2e/vue-start/streaming-ssr/tests/nested-deferred.spec.ts b/e2e/vue-start/streaming-ssr/tests/nested-deferred.spec.ts deleted file mode 100644 index 8df20a8a95..0000000000 --- a/e2e/vue-start/streaming-ssr/tests/nested-deferred.spec.ts +++ /dev/null @@ -1 +0,0 @@ -import '../../../streaming-ssr-specs/nested-deferred' diff --git a/e2e/vue-start/streaming-ssr/tests/preview-streaming.spec.ts b/e2e/vue-start/streaming-ssr/tests/preview-streaming.spec.ts deleted file mode 100644 index 34241cfbaa..0000000000 --- a/e2e/vue-start/streaming-ssr/tests/preview-streaming.spec.ts +++ /dev/null @@ -1 +0,0 @@ -import '../../../streaming-ssr-specs/preview-streaming' diff --git a/e2e/vue-start/streaming-ssr/tests/query-heavy.spec.ts b/e2e/vue-start/streaming-ssr/tests/query-heavy.spec.ts deleted file mode 100644 index d15c092f6e..0000000000 --- a/e2e/vue-start/streaming-ssr/tests/query-heavy.spec.ts +++ /dev/null @@ -1 +0,0 @@ -import '../../../streaming-ssr-specs/query-heavy' diff --git a/e2e/vue-start/streaming-ssr/tests/slow-render.spec.ts b/e2e/vue-start/streaming-ssr/tests/slow-render.spec.ts deleted file mode 100644 index 0d5a87363f..0000000000 --- a/e2e/vue-start/streaming-ssr/tests/slow-render.spec.ts +++ /dev/null @@ -1 +0,0 @@ -import '../../../streaming-ssr-specs/slow-render' diff --git a/e2e/vue-start/streaming-ssr/tests/stream.spec.ts b/e2e/vue-start/streaming-ssr/tests/stream.spec.ts deleted file mode 100644 index 9dfc6820ad..0000000000 --- a/e2e/vue-start/streaming-ssr/tests/stream.spec.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { expect, testWithHydration } from '../../../streaming-ssr-assertions' -import '../../../streaming-ssr-specs/stream' - -testWithHydration( - 'reads a replacement stream after an active read', - async ({ page }) => { - await page.goto('/') - await page.waitForLoadState('networkidle') - await page.getByRole('link', { name: 'Stream' }).first().click() - await expect(page.getByTestId('stream-chunk-0')).toHaveText('chunk-0') - await expect(page.getByTestId('stream-complete')).toHaveCount(0) - - await page.getByTestId('refresh-stream').click() - - const streamData = page.getByTestId('stream-data') - await expect(streamData).toHaveAttribute('data-read-count', '2') - await expect(page.getByTestId('stream-complete')).toBeVisible() - await expect( - streamData.locator('[data-testid^="stream-chunk-"]'), - ).toHaveText(['chunk-0', 'chunk-1', 'chunk-2', 'chunk-3', 'chunk-4']) - }, -) diff --git a/e2e/vue-start/streaming-ssr/tests/sync-only.spec.ts b/e2e/vue-start/streaming-ssr/tests/sync-only.spec.ts deleted file mode 100644 index b25572f615..0000000000 --- a/e2e/vue-start/streaming-ssr/tests/sync-only.spec.ts +++ /dev/null @@ -1,7 +0,0 @@ -import '../../../streaming-ssr-specs/sync-only' -import { expect, test } from '../../../streaming-ssr-assertions' - -test('Vue renders an unwrapped document root', async ({ request }) => { - const response = await request.get('/sync-only') - expect(await response.text()).toMatch(/^)/) -}) diff --git a/e2e/vue-start/streaming-ssr/tsconfig.json b/e2e/vue-start/streaming-ssr/tsconfig.json deleted file mode 100644 index 390dad84c0..0000000000 --- a/e2e/vue-start/streaming-ssr/tsconfig.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "include": ["**/*.ts", "**/*.tsx"], - "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 - } -} diff --git a/e2e/vue-start/streaming-ssr/vite.config.ts b/e2e/vue-start/streaming-ssr/vite.config.ts deleted file mode 100644 index 6519ec54c8..0000000000 --- a/e2e/vue-start/streaming-ssr/vite.config.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { defineConfig } from 'vite' -import { tanstackStart } from '@tanstack/vue-start/plugin/vite' -import vueJsx from '@vitejs/plugin-vue-jsx' - -export default defineConfig({ - server: { - port: 3000, - }, - plugins: [tanstackStart(), vueJsx()], -}) diff --git a/e2e/vue-start/virtual-routes/package.json b/e2e/vue-start/virtual-routes/package.json index 90f09ce911..3697e87e52 100644 --- a/e2e/vue-start/virtual-routes/package.json +++ b/e2e/vue-start/virtual-routes/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/virtual-file-routes": "workspace:^", @@ -29,7 +29,7 @@ "@vitejs/plugin-vue": "^6.0.5", "@vitejs/plugin-vue-jsx": "^5.1.5", "combinate": "^1.1.11", - "srvx": "^1.0.0", + "srvx": "^0.11.9", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/vue-start/virtual-routes/playwright.config.ts b/e2e/vue-start/virtual-routes/playwright.config.ts index 1862174905..b0c365f8bd 100644 --- a/e2e/vue-start/virtual-routes/playwright.config.ts +++ b/e2e/vue-start/virtual-routes/playwright.config.ts @@ -1,7 +1,12 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { + getDummyServerPort, + getTestServerPort, +} from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) +const EXTERNAL_PORT = await getDummyServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -13,19 +18,19 @@ export default defineConfig({ reporter: [['line']], + globalSetup: './tests/setup/global.setup.ts', + globalTeardown: './tests/setup/global.teardown.ts', + use: { /* Base URL to use in actions like `await page.goto('/')`. */ baseURL, }, webServer: { - command: `pnpm build && PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + command: `VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} pnpm build && VITE_NODE_ENV="test" VITE_EXTERNAL_PORT=${EXTERNAL_PORT} VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', - env: { - NODE_OPTIONS: `${process.env.NODE_OPTIONS ?? ''} --import=@tanstack/router-e2e-utils/mock-api`, - }, }, projects: [ diff --git a/e2e/vue-start/virtual-routes/src/posts.tsx b/e2e/vue-start/virtual-routes/src/posts.tsx index f7a1941605..1b4c92b41d 100644 --- a/e2e/vue-start/virtual-routes/src/posts.tsx +++ b/e2e/vue-start/virtual-routes/src/posts.tsx @@ -7,7 +7,11 @@ export type PostType = { body: string } -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) diff --git a/e2e/vue-start/virtual-routes/src/routes/posts/posts-detail.tsx b/e2e/vue-start/virtual-routes/src/routes/posts/posts-detail.tsx index 4bc3824f62..5086e3ad88 100644 --- a/e2e/vue-start/virtual-routes/src/routes/posts/posts-detail.tsx +++ b/e2e/vue-start/virtual-routes/src/routes/posts/posts-detail.tsx @@ -1,20 +1,7 @@ -import { defineComponent } from 'vue' import { ErrorComponent, createFileRoute } from '@tanstack/vue-router' import { fetchPost } from '../../posts' import type { ErrorComponentProps } from '@tanstack/vue-router' -const PostComponent = defineComponent({ - setup() { - const post = Route.useLoaderData() - return () => ( -
-

{post.value.title}

-
{post.value.body}
-
- ) - }, -}) - export const Route = createFileRoute('/posts/$postId')({ loader: async ({ params: { postId } }) => fetchPost(postId), errorComponent: PostErrorComponent, @@ -27,3 +14,14 @@ export const Route = createFileRoute('/posts/$postId')({ function PostErrorComponent({ error }: ErrorComponentProps) { return } + +function PostComponent() { + const post = Route.useLoaderData() + + return ( +
+

{post.value.title}

+
{post.value.body}
+
+ ) +} diff --git a/e2e/vue-start/virtual-routes/src/routes/posts/posts.tsx b/e2e/vue-start/virtual-routes/src/routes/posts/posts.tsx index dd380aa353..f56d6550a6 100644 --- a/e2e/vue-start/virtual-routes/src/routes/posts/posts.tsx +++ b/e2e/vue-start/virtual-routes/src/routes/posts/posts.tsx @@ -1,39 +1,37 @@ -import { defineComponent } from 'vue' import { Link, Outlet, createFileRoute } from '@tanstack/vue-router' import { fetchPosts } from '../../posts' -const PostsComponent = defineComponent({ - setup() { - const posts = Route.useLoaderData() - return () => ( -
-
    - {[ - ...posts.value, - { id: 'i-do-not-exist', title: 'Non-existent Post' }, - ].map((post) => ( -
  • - -
    {post.title.substring(0, 20)}
    - -
  • - ))} -
-
- -
- ) - }, -}) - export const Route = createFileRoute('/posts')({ loader: fetchPosts, component: PostsComponent, }) + +function PostsComponent() { + const posts = Route.useLoaderData() + + return ( +
+
    + {[ + ...posts.value, + { id: 'i-do-not-exist', title: 'Non-existent Post' }, + ].map((post) => ( +
  • + +
    {post.title.substring(0, 20)}
    + +
  • + ))} +
+
+ +
+ ) +} diff --git a/e2e/vue-start/virtual-routes/src/utils/posts.tsx b/e2e/vue-start/virtual-routes/src/utils/posts.tsx index 11d80d08b5..66cb298f83 100644 --- a/e2e/vue-start/virtual-routes/src/utils/posts.tsx +++ b/e2e/vue-start/virtual-routes/src/utils/posts.tsx @@ -8,7 +8,11 @@ export type PostType = { body: string } -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export const fetchPost = createServerFn({ method: 'GET' }) .validator((postId: string) => postId) diff --git a/e2e/vue-start/virtual-routes/src/utils/users.tsx b/e2e/vue-start/virtual-routes/src/utils/users.tsx index 7ba645b383..46be4b1580 100644 --- a/e2e/vue-start/virtual-routes/src/utils/users.tsx +++ b/e2e/vue-start/virtual-routes/src/utils/users.tsx @@ -3,3 +3,7 @@ export type User = { name: string email: string } + +const PORT = process.env.VITE_SERVER_PORT || 3000 + +export const DEPLOY_URL = `http://localhost:${PORT}` diff --git a/e2e/vue-start/virtual-routes/tests/app.spec.ts b/e2e/vue-start/virtual-routes/tests/app.spec.ts index e9db98e3f3..3182febfa0 100644 --- a/e2e/vue-start/virtual-routes/tests/app.spec.ts +++ b/e2e/vue-start/virtual-routes/tests/app.spec.ts @@ -1,5 +1,4 @@ -import { expect } from '@playwright/test' -import { apiTest as test } from '@tanstack/router-e2e-utils' +import { expect, test } from '@playwright/test' test.beforeEach(async ({ page }) => { await page.goto('/') diff --git a/e2e/vue-start/virtual-routes/tests/setup/global.setup.ts b/e2e/vue-start/virtual-routes/tests/setup/global.setup.ts new file mode 100644 index 0000000000..3593d10ab9 --- /dev/null +++ b/e2e/vue-start/virtual-routes/tests/setup/global.setup.ts @@ -0,0 +1,6 @@ +import { e2eStartDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function setup() { + await e2eStartDummyServer(packageJson.name) +} diff --git a/e2e/vue-start/virtual-routes/tests/setup/global.teardown.ts b/e2e/vue-start/virtual-routes/tests/setup/global.teardown.ts new file mode 100644 index 0000000000..62fd79911c --- /dev/null +++ b/e2e/vue-start/virtual-routes/tests/setup/global.teardown.ts @@ -0,0 +1,6 @@ +import { e2eStopDummyServer } from '@tanstack/router-e2e-utils' +import packageJson from '../../package.json' with { type: 'json' } + +export default async function teardown() { + await e2eStopDummyServer(packageJson.name) +} diff --git a/e2e/vue-start/website/package.json b/e2e/vue-start/website/package.json index 6c30b1500f..5e92c93769 100644 --- a/e2e/vue-start/website/package.json +++ b/e2e/vue-start/website/package.json @@ -9,7 +9,7 @@ "build": "vite build && tsc --noEmit", "preview": "vite preview", "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "playwright test --project=chromium" + "test:e2e": "rm -rf port*.txt; playwright test --project=chromium" }, "dependencies": { "@tanstack/vue-router": "workspace:^", @@ -27,7 +27,7 @@ "@types/node": "^22.10.2", "@vitejs/plugin-vue": "^6.0.5", "@vitejs/plugin-vue-jsx": "^5.1.5", - "srvx": "^1.0.0", + "srvx": "^0.11.9", "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/playwright.config.ts b/e2e/vue-start/website/playwright.config.ts index e6b92ce385..f6dd61ba6c 100644 --- a/e2e/vue-start/website/playwright.config.ts +++ b/e2e/vue-start/website/playwright.config.ts @@ -1,7 +1,8 @@ import { defineConfig, devices } from '@playwright/test' -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const PORT = await getTestServerPort(packageJson.name) const baseURL = `http://localhost:${PORT}` /** @@ -20,8 +21,8 @@ export default defineConfig({ webServer: { command: `pnpm build && VITE_SERVER_PORT=${PORT} PORT=${PORT} pnpm start`, - wait: appServerReady, - reuseExistingServer: false, + url: baseURL, + reuseExistingServer: !process.env.CI, stdout: 'pipe', }, diff --git a/e2e/vue-start/website/src/components/DefaultCatchBoundary.tsx b/e2e/vue-start/website/src/components/DefaultCatchBoundary.tsx index 77c03c5afa..d06f4a948b 100644 --- a/e2e/vue-start/website/src/components/DefaultCatchBoundary.tsx +++ b/e2e/vue-start/website/src/components/DefaultCatchBoundary.tsx @@ -1,5 +1,3 @@ -import { defineComponent } from 'vue' -import type { PropType } from 'vue' import { ErrorComponent, Link, @@ -8,54 +6,46 @@ import { } from '@tanstack/vue-router' import type { ErrorComponentProps } from '@tanstack/vue-router' -export const DefaultCatchBoundary = defineComponent({ - props: { - error: { - type: Object as PropType, - required: true, - }, - }, - setup(props) { - const router = useRouter() - const isRoot = useLocation({ - select: (location) => location.pathname === '/', - }) - return () => { - console.error(props.error) - return ( -
- -
- - {isRoot.value ? ( - - Home - - ) : ( - { - e.preventDefault() - window.history.back() - }} - > - Go Back - - )} -
-
- ) - } - }, -}) +export function DefaultCatchBoundary({ error }: ErrorComponentProps) { + const router = useRouter() + const isRoot = useLocation({ + select: (location) => location.pathname === '/', + }) + + console.error(error) + + return ( +
+ +
+ + {isRoot.value ? ( + + Home + + ) : ( + { + e.preventDefault() + window.history.back() + }} + > + Go Back + + )} +
+
+ ) +} diff --git a/e2e/vue-start/website/src/routes/$project.$version.docs.framework.$framework.$.tsx b/e2e/vue-start/website/src/routes/$project.$version.docs.framework.$framework.$.tsx index 1d9173f200..f56c911b88 100644 --- a/e2e/vue-start/website/src/routes/$project.$version.docs.framework.$framework.$.tsx +++ b/e2e/vue-start/website/src/routes/$project.$version.docs.framework.$framework.$.tsx @@ -1,27 +1,9 @@ -import { defineComponent } from 'vue' import { ErrorComponent, createFileRoute } from '@tanstack/vue-router' import type { ErrorComponentProps } from '@tanstack/vue-router' import { NotFound } from '~/components/NotFound' import { getDocument } from '~/server/document' import { capitalize, seo } from '~/utils/seo' -const Page = defineComponent({ - setup() { - const post = Route.useLoaderData() - return () => ( -
-

- {post.value.title} -

-
{post.value.content}
-
- ) - }, -}) - export const Route = createFileRoute( '/$project/$version/docs/framework/$framework/$', )({ @@ -44,3 +26,19 @@ export const Route = createFileRoute( function PostErrorComponent({ error }: ErrorComponentProps) { return } + +function Page() { + const post = Route.useLoaderData() + + return ( +
+

+ {post.value.title} +

+
{post.value.content}
+
+ ) +} diff --git a/e2e/vue-start/website/src/routes/$project.$version.docs.framework.$framework.examples.$.tsx b/e2e/vue-start/website/src/routes/$project.$version.docs.framework.$framework.examples.$.tsx index 1ca9e97cbe..97f8fdd49a 100644 --- a/e2e/vue-start/website/src/routes/$project.$version.docs.framework.$framework.examples.$.tsx +++ b/e2e/vue-start/website/src/routes/$project.$version.docs.framework.$framework.examples.$.tsx @@ -1,24 +1,7 @@ -import { defineComponent } from 'vue' import { createFileRoute } from '@tanstack/vue-router' import { NotFound } from '~/components/NotFound' import { capitalize, seo } from '~/utils/seo' -const Page = defineComponent({ - setup() { - const params = Route.useParams() - return () => ( -
-

- {params.value._splat} example -

-
- ) - }, -}) - export const Route = createFileRoute( '/$project/$version/docs/framework/$framework/examples/$', )({ @@ -32,3 +15,18 @@ export const Route = createFileRoute( return Example not found }, }) + +function Page() { + const params = Route.useParams() + + return ( +
+

+ {params.value._splat} example +

+
+ ) +} diff --git a/e2e/vue-start/website/src/routes/$project.$version.docs.framework.$framework.tsx b/e2e/vue-start/website/src/routes/$project.$version.docs.framework.$framework.tsx index e1c57491aa..1b422b2ea0 100644 --- a/e2e/vue-start/website/src/routes/$project.$version.docs.framework.$framework.tsx +++ b/e2e/vue-start/website/src/routes/$project.$version.docs.framework.$framework.tsx @@ -1,4 +1,3 @@ -import { defineComponent } from 'vue' import { Link, Outlet, @@ -8,108 +7,6 @@ import { import { getDocumentHeads } from '~/server/document' import { getProject } from '~/server/projects' -const Page = defineComponent({ - setup() { - const project = Route.useLoaderData({ select: (s) => s.library }) - const documents = Route.useLoaderData({ select: (s) => s.documents }) - const pathname = useLocation({ select: (s) => s.pathname }) - return () => ( -
- -
-

- {pathname.value} -

- -
-
- ) - }, -}) - export const Route = createFileRoute( '/$project/$version/docs/framework/$framework', )({ @@ -123,3 +20,104 @@ export const Route = createFileRoute( }, component: Page, }) + +function Page() { + const project = Route.useLoaderData({ select: (s) => s.library }) + const documents = Route.useLoaderData({ select: (s) => s.documents }) + const pathname = useLocation({ select: (s) => s.pathname }) + + return ( +
+ +
+

+ {pathname.value} +

+ +
+
+ ) +} diff --git a/e2e/vue-start/website/src/routes/_library.$project.$version.index.tsx b/e2e/vue-start/website/src/routes/_library.$project.$version.index.tsx index d6c9b00671..ed8e4d0bb4 100644 --- a/e2e/vue-start/website/src/routes/_library.$project.$version.index.tsx +++ b/e2e/vue-start/website/src/routes/_library.$project.$version.index.tsx @@ -1,31 +1,23 @@ -import { defineComponent } from 'vue' import { Link, createFileRoute } from '@tanstack/vue-router' -const Page = defineComponent({ - setup() { - const params = Route.useParams() - return () => ( -
-

- {params.value.project} landing page -

-

- version: {params.value.version} -

-

- - Get started with our documentation. - -

-
- ) - }, -}) - export const Route = createFileRoute('/_library/$project/$version/')({ component: Page, }) + +function Page() { + const params = Route.useParams() + + return ( +
+

+ {params.value.project} landing page +

+

version: {params.value.version}

+

+ + Get started with our documentation. + +

+
+ ) +} diff --git a/e2e/vue-start/website/src/routes/_library.tsx b/e2e/vue-start/website/src/routes/_library.tsx index b52198950d..fcbeaa35d0 100644 --- a/e2e/vue-start/website/src/routes/_library.tsx +++ b/e2e/vue-start/website/src/routes/_library.tsx @@ -1,4 +1,3 @@ -import { defineComponent } from 'vue' import { Link, Outlet, @@ -7,53 +6,6 @@ import { } from '@tanstack/vue-router' import { getProjects } from '~/server/projects' -const Layout = defineComponent({ - setup() { - const loaderData = Route.useLoaderData() - const pathname = useLocation({ select: (s) => s.pathname }) - return () => ( -
- -
-

- {pathname.value} -

- -
-
- ) - }, -}) - export const Route = createFileRoute('/_library')({ loader: async () => { const projects = await getProjects() @@ -63,3 +15,48 @@ export const Route = createFileRoute('/_library')({ }, component: Layout, }) + +function Layout() { + const loaderData = Route.useLoaderData() + const pathname = useLocation({ select: (s) => s.pathname }) + return ( +
+ +
+

+ {pathname.value} +

+ +
+
+ ) +} diff --git a/examples/AGENTS.md b/examples/AGENTS.md deleted file mode 100644 index eb47fbd925..0000000000 --- a/examples/AGENTS.md +++ /dev/null @@ -1,4 +0,0 @@ -# Examples - -- Versioned dependencies on this repository's packages resolve locally through `pnpm-workspace.yaml` overrides. Keep published version ranges in example manifests; do not replace them with `workspace:*` as a linking fix. -- Root `pnpm dev` watches package builds. To run an example app, use its own `dev` script after building its workspace dependencies. diff --git a/examples/react/authenticated-routes-firebase/package.json b/examples/react/authenticated-routes-firebase/package.json index 1efa172047..5ab9507529 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/router-plugin": "^1.168.36", "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 6af48f1d34..7ba770dfef 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/router-plugin": "^1.168.36", "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 96c68fecd4..8589ee35c5 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.46", - "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", "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 ccae95d73f..a3b0a0fe37 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.46", - "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", "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 9c3cacada1..615f4e5662 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/router-plugin": "^1.168.36", "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 32e856ebcf..b2f8b1dd23 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.46", - "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", "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 d01a02872e..f1a1148e1d 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/router-plugin": "^1.168.36", "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 edab96afac..ec1dcaf956 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.46", - "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", "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 3222c33e19..9f6543522b 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.46", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/react-router": "^1.170.33", + "@tanstack/router-plugin": "^1.168.36", "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.3", + "@tanstack/react-router-devtools": "^1.167.1", "@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 c3c87c8d88..15744888e6 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.46", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/react-router": "^1.170.33", + "@tanstack/router-plugin": "^1.168.36", "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.3", + "@tanstack/react-router-devtools": "^1.167.1", "@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 84d326435c..aa7e8d154d 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/router-plugin": "^1.168.36", "@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 c04cb6012e..0047b01ac9 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/router-plugin": "^1.168.36", "@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 2c09a3dfdf..e192db5857 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.46", - "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", "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 99afb661ee..35b5fbf6a5 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.46", - "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", "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 88140e8911..4b32bf095e 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.46", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/react-router": "^1.170.33", + "@tanstack/router-plugin": "^1.168.36", "react": "^19.1.1", "react-dom": "^19.1.1", "tailwindcss": "^4.2.2" @@ -26,16 +26,5 @@ "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", "@inlang/paraglide-js": "^2.4.0" - }, - "nx": { - "targets": { - "build": { - "outputs": [ - "...", - "{projectRoot}/src/paraglide", - "{projectRoot}/project.inlang/cache" - ] - } - } } } diff --git a/examples/react/kitchen-sink-file-based/package.json b/examples/react/kitchen-sink-file-based/package.json index e02defb3ce..998f41d2c9 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/router-plugin": "^1.168.36", "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 e3dd032ac2..329c3bc5f0 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/router-plugin": "^1.168.36", "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 14d0dc8e86..4982117704 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.46", - "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", "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 f738efc37e..446d53070f 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.46", - "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", "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 23d469d120..cdd00f2fd5 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/router-plugin": "^1.168.36", "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 fe005c0d2f..47182055b3 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.46", - "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", "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 a7677dfd51..cda7a3a78f 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.46", - "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", "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 2f83a79984..fb7950d1fa 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' })], + plugins: [tanstackRouter({ target: 'react', autoCodeSplitting: true })], } diff --git a/examples/react/quickstart-esbuild-file-based/package.json b/examples/react/quickstart-esbuild-file-based/package.json index d855694fec..fe8a7c3db1 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/router-plugin": "^1.168.36", "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 976ec838d1..8c5d1e5a6c 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/router-plugin": "^1.168.36", "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 824998f428..485533857a 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.46", - "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", "postcss": "^8.5.1", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwindcss": "^4.2.2" }, "devDependencies": { - "@rsbuild/core": "^2.3.1", + "@rsbuild/core": "^2.1.0", "@rsbuild/plugin-react": "^2.0.0", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/router-plugin": "^1.168.36", "@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 baa14b89dd..333eeb0163 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.46", - "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", "react": "^19.0.0", "react-dom": "^19.0.0" }, "devDependencies": { "@swc/core": "^1.15.33", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/router-plugin": "^1.168.36", "@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 b6db476ea8..3446de0b0e 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.46", - "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", "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 b158eeda56..fda8a94846 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/router-plugin": "^1.168.36", "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 f0994165c2..cbbf07dac5 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.3", + "@tanstack/react-router-devtools": "^1.167.1", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", @@ -33,12 +33,6 @@ "dependsOn": [ "^build" ] - }, - "build": { - "inputs": [ - "...", - "{workspaceRoot}/examples/react/router-monorepo-react-query/.gitignore" - ] } } } diff --git a/examples/react/router-monorepo-react-query/packages/app/tsconfig.json b/examples/react/router-monorepo-react-query/packages/app/tsconfig.json index 196cb055a9..ce3a7d2339 100644 --- a/examples/react/router-monorepo-react-query/packages/app/tsconfig.json +++ b/examples/react/router-monorepo-react-query/packages/app/tsconfig.json @@ -8,6 +8,5 @@ "module": "ESNext", "lib": ["DOM", "DOM.Iterable", "ES2022"], "skipLibCheck": true - }, - "exclude": ["node_modules", "dist"] + } } 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 1397db14b5..87105f43eb 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.5", + "@tanstack/history": "^1.162.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.46", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/react-router": "^1.170.33", + "@tanstack/router-plugin": "^1.168.36", "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 e044d86681..678ff11e67 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/router-plugin": "^1.168.36", "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 cfc7a94942..a1e792cc3d 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.3", + "@tanstack/react-router-devtools": "^1.167.1", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", @@ -32,12 +32,6 @@ "dependsOn": [ "^build" ] - }, - "build": { - "inputs": [ - "...", - "{workspaceRoot}/examples/react/router-monorepo-simple-lazy/.gitignore" - ] } } } diff --git a/examples/react/router-monorepo-simple-lazy/packages/app/tsconfig.json b/examples/react/router-monorepo-simple-lazy/packages/app/tsconfig.json index 196cb055a9..ce3a7d2339 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/app/tsconfig.json +++ b/examples/react/router-monorepo-simple-lazy/packages/app/tsconfig.json @@ -8,6 +8,5 @@ "module": "ESNext", "lib": ["DOM", "DOM.Iterable", "ES2022"], "skipLibCheck": true - }, - "exclude": ["node_modules", "dist"] + } } 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 afd4702b5d..e6f00c58d6 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.5", - "@tanstack/react-router": "^1.170.46", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/history": "^1.162.2", + "@tanstack/react-router": "^1.170.33", + "@tanstack/router-plugin": "^1.168.36", "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 800d948c81..6c18f2b31e 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/router-plugin": "^1.168.36", "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 a06431ef86..01da864c38 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.3", + "@tanstack/react-router-devtools": "^1.167.1", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", @@ -32,12 +32,6 @@ "dependsOn": [ "^build" ] - }, - "build": { - "inputs": [ - "...", - "{workspaceRoot}/examples/react/router-monorepo-simple/.gitignore" - ] } } } diff --git a/examples/react/router-monorepo-simple/packages/app/tsconfig.json b/examples/react/router-monorepo-simple/packages/app/tsconfig.json index 196cb055a9..ce3a7d2339 100644 --- a/examples/react/router-monorepo-simple/packages/app/tsconfig.json +++ b/examples/react/router-monorepo-simple/packages/app/tsconfig.json @@ -8,6 +8,5 @@ "module": "ESNext", "lib": ["DOM", "DOM.Iterable", "ES2022"], "skipLibCheck": true - }, - "exclude": ["node_modules", "dist"] + } } diff --git a/examples/react/router-monorepo-simple/packages/router/package.json b/examples/react/router-monorepo-simple/packages/router/package.json index 391b72e610..6d3fea1dd8 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.5", - "@tanstack/react-router": "^1.170.46", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/history": "^1.162.2", + "@tanstack/react-router": "^1.170.33", + "@tanstack/router-plugin": "^1.168.36", "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 704ff13838..0a0cd9404a 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.46", - "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", "@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 35e041e825..2b650aacc2 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/router-plugin": "^1.168.36", "@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": "^7.0.1", + "@testing-library/jest-dom": "^6.6.3", "@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": "^5.0.4" + "vitest": "^4.1.4" } } diff --git a/examples/react/search-validator-adapters/tests/arktype.test.tsx b/examples/react/search-validator-adapters/tests/arktype.test.tsx index 776cc8369e..1c3a1baf76 100644 --- a/examples/react/search-validator-adapters/tests/arktype.test.tsx +++ b/examples/react/search-validator-adapters/tests/arktype.test.tsx @@ -8,6 +8,7 @@ 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 deleted file mode 100644 index 8f7cbf15be..0000000000 --- a/examples/react/search-validator-adapters/tests/jest-dom.setup.ts +++ /dev/null @@ -1,18 +0,0 @@ -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 d3e18db414..3680d2302c 100644 --- a/examples/react/search-validator-adapters/tests/valibot.test.tsx +++ b/examples/react/search-validator-adapters/tests/valibot.test.tsx @@ -8,6 +8,7 @@ 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 e4b93f5cc3..5b41e6e26b 100644 --- a/examples/react/search-validator-adapters/vite.config.ts +++ b/examples/react/search-validator-adapters/vite.config.ts @@ -11,7 +11,6 @@ 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 4ab9aff272..9cc234d1b7 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/react-start": "^1.169.6", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-start": "^1.168.50", "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 7f1b093ba5..4e5ee29b40 100644 --- a/examples/react/start-basic-auth/README.md +++ b/examples/react/start-basic-auth/README.md @@ -39,13 +39,3 @@ 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 9ab89bdac9..231e69a86a 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -14,10 +14,9 @@ "@libsql/client": "^0.15.15", "@prisma/adapter-libsql": "^7.0.0", "@prisma/client": "^7.0.0", - "@tanstack/react-router": "^1.170.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/react-start": "^1.169.6", - "iron-session": "^9.0.1", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-start": "^1.168.50", "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 3367c62f27..5728345fcf 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 { getAppSession } from '~/utils/session.js' +import { useAppSession } 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 getAppSession() + const session = await useAppSession() - if (!session.userEmail) { + if (!session.data.userEmail) { return null } return { - email: session.userEmail, + email: session.data.userEmail, } }) diff --git a/examples/react/start-basic-auth/src/routes/_authed.tsx b/examples/react/start-basic-auth/src/routes/_authed.tsx index 0b5c6f9047..3af371e844 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 { getAppSession } from '~/utils/session' +import { useAppSession } from '~/utils/session' export const loginFn = createServerFn({ method: 'POST' }) .validator((d: { email: string; password: string }) => d) @@ -33,10 +33,13 @@ export const loginFn = createServerFn({ method: 'POST' }) } } + // Create a session + const session = await useAppSession() + // Store the user's email in the session - const session = await getAppSession() - session.userEmail = user.email - await session.save() + await session.update({ + userEmail: user.email, + }) }) 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 73cdaf1600..28f3c9f8fe 100644 --- a/examples/react/start-basic-auth/src/routes/logout.tsx +++ b/examples/react/start-basic-auth/src/routes/logout.tsx @@ -1,10 +1,11 @@ import { redirect, createFileRoute } from '@tanstack/react-router' import { createServerFn } from '@tanstack/react-start' -import { getAppSession } from '~/utils/session' +import { useAppSession } from '~/utils/session' const logoutFn = createServerFn().handler(async () => { - const session = await getAppSession() - session.destroy() + const session = await useAppSession() + + session.clear() 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 4dc8e350ac..247a94c03c 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 { getAppSession } from '~/utils/session' +import { useAppSession } from '~/utils/session' export const signupFn = createServerFn({ method: 'POST' }) .validator( @@ -20,6 +20,9 @@ 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 { @@ -30,9 +33,9 @@ export const signupFn = createServerFn({ method: 'POST' }) } // Store the user's email in the session - const session = await getAppSession() - session.userEmail = found.email - await session.save() + await session.update({ + userEmail: found.email, + }) // Redirect to the prev page stored in the "redirect" search param throw redirect({ @@ -49,9 +52,9 @@ export const signupFn = createServerFn({ method: 'POST' }) }) // Store the user's email in the session - const session = await getAppSession() - session.userEmail = user.email - await session.save() + await session.update({ + userEmail: user.email, + }) // 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 7df7bc4da2..c38bac1e48 100644 --- a/examples/react/start-basic-auth/src/utils/session.ts +++ b/examples/react/start-basic-auth/src/utils/session.ts @@ -1,29 +1,13 @@ -import { getIronSession } from 'iron-session' -import { getCookie, setCookie } from '@tanstack/react-start/server' +// src/services/session.server.ts +import { useSession } from '@tanstack/react-start/server' import type { User } from '@prisma/client' type SessionUser = { userEmail: User['email'] } -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: '/', - }, - }, - ) +export function useAppSession() { + return useSession({ + password: 'ChangeThisBeforeShippingToProdOrYouWillBeFired', + }) } diff --git a/examples/react/start-basic-authjs/package.json b/examples/react/start-basic-authjs/package.json index e9fa789ea6..5d0d7aa6c4 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/react-start": "^1.169.6", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-start": "^1.168.50", "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 2108922446..48d62ba093 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/react-start": "^1.169.6", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-start": "^1.168.50", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-basic-react-query/README.md b/examples/react/start-basic-react-query/README.md index 70cc728ae4..77c61c2504 100644 --- a/examples/react/start-basic-react-query/README.md +++ b/examples/react/start-basic-react-query/README.md @@ -38,18 +38,5 @@ This example demonstrates how to use TanStack Query with TanStack Start for: - Server-side data fetching - Client-side caching and synchronization -- Confirmed server mutations followed by query invalidation -- Explicit freshness and automatic refetching - -## SSR and mutation checks - -Read the [Start + TanStack Query guide](https://tanstack.com/start/latest/docs/framework/react/guide/tanstack-query). The `/preferences` page stores a harmless display name in a cookie, so its tests need no account or external API. This cookie is not authentication. The other post/user examples use JSONPlaceholder. - -```sh -pnpm exec playwright install chromium -pnpm test:e2e -pnpm build -QUERY_EXAMPLE_PRODUCTION=1 pnpm test:e2e -``` - -The tests check concurrent SSR request isolation, no duplicate hydration read, one refetch after mutation invalidation, and persistence on reload. Query data is fresh for 30 seconds by default in this example; choose a window appropriate for your application. +- Optimistic updates +- Automatic refetching diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index 9d819d4390..3ac341d08a 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -7,16 +7,15 @@ "dev": "vite dev", "build": "vite build && tsc --noEmit", "preview": "vite preview", - "start": "pnpx srvx --prod -s ../client dist/server/server.js", - "test:e2e": "playwright test" + "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@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.169.6", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-router-ssr-query": "^1.167.2", + "@tanstack/react-start": "^1.168.50", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", @@ -31,7 +30,6 @@ "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", - "vite": "^8.0.14", - "@playwright/test": "^1.61.0" + "vite": "^8.0.14" } } diff --git a/examples/react/start-basic-react-query/playwright.config.ts b/examples/react/start-basic-react-query/playwright.config.ts deleted file mode 100644 index 298a1133e9..0000000000 --- a/examples/react/start-basic-react-query/playwright.config.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { defineConfig } from '@playwright/test' - -export default defineConfig({ - testDir: './tests', - use: { baseURL: 'http://localhost:3110', browserName: 'chromium' }, - webServer: { - command: - process.env.QUERY_EXAMPLE_PRODUCTION === '1' - ? 'PORT=3110 pnpm start' - : 'pnpm dev --port 3110', - url: 'http://localhost:3110/preferences', - timeout: 120_000, - }, -}) diff --git a/examples/react/start-basic-react-query/src/routeTree.gen.ts b/examples/react/start-basic-react-query/src/routeTree.gen.ts index 0c7a90d4a1..e010af19fe 100644 --- a/examples/react/start-basic-react-query/src/routeTree.gen.ts +++ b/examples/react/start-basic-react-query/src/routeTree.gen.ts @@ -13,7 +13,6 @@ import { Route as IndexRouteImport } from './routes/index' import { Route as PathlessLayoutRouteImport } from './routes/_pathlessLayout' import { Route as DeferredRouteImport } from './routes/deferred' import { Route as PostsRouteRouteImport } from './routes/posts.route' -import { Route as PreferencesRouteImport } from './routes/preferences' import { Route as RedirectRouteImport } from './routes/redirect' import { Route as UsersRouteRouteImport } from './routes/users.route' import { Route as PathlessLayoutNestedLayoutRouteImport } from './routes/_pathlessLayout/_nested-layout' @@ -46,11 +45,6 @@ const PostsRouteRoute = PostsRouteRouteImport.update({ path: '/posts', getParentRoute: () => rootRouteImport, } as any) -const PreferencesRoute = PreferencesRouteImport.update({ - id: '/preferences', - path: '/preferences', - getParentRoute: () => rootRouteImport, -} as any) const RedirectRoute = RedirectRouteImport.update({ id: '/redirect', path: '/redirect', @@ -119,7 +113,6 @@ export interface FileRoutesByFullPath { '/posts': typeof PostsRouteRouteWithChildren '/users': typeof UsersRouteRouteWithChildren '/deferred': typeof DeferredRoute - '/preferences': typeof PreferencesRoute '/redirect': typeof RedirectRoute '/api/users': typeof ApiUsersRouteWithChildren '/posts/$postId': typeof PostsPostIdRoute @@ -134,7 +127,6 @@ export interface FileRoutesByFullPath { export interface FileRoutesByTo { '/': typeof IndexRoute '/deferred': typeof DeferredRoute - '/preferences': typeof PreferencesRoute '/redirect': typeof RedirectRoute '/api/users': typeof ApiUsersRouteWithChildren '/posts/$postId': typeof PostsPostIdRoute @@ -153,7 +145,6 @@ export interface FileRoutesById { '/users': typeof UsersRouteRouteWithChildren '/_pathlessLayout': typeof PathlessLayoutRouteWithChildren '/deferred': typeof DeferredRoute - '/preferences': typeof PreferencesRoute '/redirect': typeof RedirectRoute '/_pathlessLayout/_nested-layout': typeof PathlessLayoutNestedLayoutRouteWithChildren '/api/users': typeof ApiUsersRouteWithChildren @@ -173,7 +164,6 @@ export interface FileRouteTypes { | '/posts' | '/users' | '/deferred' - | '/preferences' | '/redirect' | '/api/users' | '/posts/$postId' @@ -188,7 +178,6 @@ export interface FileRouteTypes { to: | '/' | '/deferred' - | '/preferences' | '/redirect' | '/api/users' | '/posts/$postId' @@ -206,7 +195,6 @@ export interface FileRouteTypes { | '/users' | '/_pathlessLayout' | '/deferred' - | '/preferences' | '/redirect' | '/_pathlessLayout/_nested-layout' | '/api/users' @@ -226,7 +214,6 @@ export interface RootRouteChildren { UsersRouteRoute: typeof UsersRouteRouteWithChildren PathlessLayoutRoute: typeof PathlessLayoutRouteWithChildren DeferredRoute: typeof DeferredRoute - PreferencesRoute: typeof PreferencesRoute RedirectRoute: typeof RedirectRoute ApiUsersRoute: typeof ApiUsersRouteWithChildren PostsPostIdDeepRoute: typeof PostsPostIdDeepRoute @@ -262,13 +249,6 @@ declare module '@tanstack/react-router' { preLoaderRoute: typeof PostsRouteRouteImport parentRoute: typeof rootRouteImport } - '/preferences': { - id: '/preferences' - path: '/preferences' - fullPath: '/preferences' - preLoaderRoute: typeof PreferencesRouteImport - parentRoute: typeof rootRouteImport - } '/redirect': { id: '/redirect' path: '/redirect' @@ -432,7 +412,6 @@ const rootRouteChildren: RootRouteChildren = { UsersRouteRoute: UsersRouteRouteWithChildren, PathlessLayoutRoute: PathlessLayoutRouteWithChildren, DeferredRoute: DeferredRoute, - PreferencesRoute: PreferencesRoute, RedirectRoute: RedirectRoute, ApiUsersRoute: ApiUsersRouteWithChildren, PostsPostIdDeepRoute: PostsPostIdDeepRoute, @@ -442,11 +421,10 @@ export const routeTree = rootRouteImport ._addFileTypes() import type { getRouter } from './router.tsx' -import type { startInstance } from './start.ts' +import type { createStart } from '@tanstack/react-start' declare module '@tanstack/react-start' { interface Register { ssr: true router: Awaited> - config: Awaited> } } diff --git a/examples/react/start-basic-react-query/src/router.tsx b/examples/react/start-basic-react-query/src/router.tsx index 345055c116..314b29edd0 100644 --- a/examples/react/start-basic-react-query/src/router.tsx +++ b/examples/react/start-basic-react-query/src/router.tsx @@ -6,15 +6,12 @@ import { DefaultCatchBoundary } from './components/DefaultCatchBoundary' import { NotFound } from './components/NotFound' export function getRouter() { - const queryClient = new QueryClient({ - defaultOptions: { queries: { staleTime: 30_000 } }, - }) + const queryClient = new QueryClient() const router = createRouter({ routeTree, context: { queryClient }, defaultPreload: 'intent', - defaultPreloadStaleTime: 0, defaultErrorComponent: DefaultCatchBoundary, defaultNotFoundComponent: () => , }) diff --git a/examples/react/start-basic-react-query/src/routes/__root.tsx b/examples/react/start-basic-react-query/src/routes/__root.tsx index 71c19b2c6f..bc278f8036 100644 --- a/examples/react/start-basic-react-query/src/routes/__root.tsx +++ b/examples/react/start-basic-react-query/src/routes/__root.tsx @@ -83,7 +83,6 @@ function RootDocument({ children }: { children: React.ReactNode }) {
- Preferences { - await context.queryClient.query(readerNameOptions) - }, - headers: () => ({ 'Cache-Control': 'private, no-store' }), - head: () => ({ meta: [{ title: 'Reader preferences' }] }), - component: Preferences, -}) - -function Preferences() { - const { data: name } = useSuspenseQuery(readerNameOptions) - const queryClient = useQueryClient() - const save = useServerFn(saveReaderName) - const hydrated = useHydrated() - const mutation = useMutation({ - mutationFn: (name: string) => save({ data: name }), - onSuccess: () => - queryClient.invalidateQueries({ queryKey: readerNameOptions.queryKey }), - }) - - return ( -
-

Reader preferences

-

Hello, {name}

-
{ - event.preventDefault() - const value = new FormData(event.currentTarget).get('name') - if (typeof value === 'string') { - mutation.mutate(value) - } - }} - > -
- - -
- {mutation.isError ? ( -

Could not save your name. Try again.

- ) : null} -
-
- ) -} diff --git a/examples/react/start-basic-react-query/src/start.ts b/examples/react/start-basic-react-query/src/start.ts deleted file mode 100644 index 5fb1e247fb..0000000000 --- a/examples/react/start-basic-react-query/src/start.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { createCsrfMiddleware, createStart } from '@tanstack/react-start' - -export const startInstance = createStart(() => ({ - requestMiddleware: [ - createCsrfMiddleware({ - filter: (ctx) => ctx.handlerType === 'serverFn', - }), - ], -})) diff --git a/examples/react/start-basic-react-query/src/utils/preferences.ts b/examples/react/start-basic-react-query/src/utils/preferences.ts deleted file mode 100644 index 74c33e5848..0000000000 --- a/examples/react/start-basic-react-query/src/utils/preferences.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { queryOptions } from '@tanstack/react-query' -import { createServerFn } from '@tanstack/react-start' -import { - getCookie, - setCookie, - setResponseHeader, -} from '@tanstack/react-start/server' - -export const getReaderName = createServerFn({ method: 'GET' }).handler(() => { - setResponseHeader('Cache-Control', 'private, no-store') - return getCookie('reader-name') || 'Guest' -}) - -export const saveReaderName = createServerFn({ method: 'POST' }) - .validator((name: string) => { - if (typeof name !== 'string' || !name.trim() || name.length > 40) { - throw new Error('Enter a name between 1 and 40 characters') - } - return name.trim() - }) - .handler(({ data }) => { - setResponseHeader('Cache-Control', 'private, no-store') - setCookie('reader-name', data, { - httpOnly: true, - sameSite: 'lax', - secure: process.env.NODE_ENV === 'production', - path: '/', - }) - }) - -export const readerNameOptions = queryOptions({ - queryKey: ['reader-name'], - queryFn: () => getReaderName(), -}) diff --git a/examples/react/start-basic-react-query/tests/preferences.spec.ts b/examples/react/start-basic-react-query/tests/preferences.spec.ts deleted file mode 100644 index 309c402798..0000000000 --- a/examples/react/start-basic-react-query/tests/preferences.spec.ts +++ /dev/null @@ -1,67 +0,0 @@ -import { expect, test } from '@playwright/test' - -test('concurrent SSR requests keep the same query key isolated by request', async ({ - request, -}) => { - const names = ['Lucia', 'Omar', 'Maya', 'Felix'] - const responses = await Promise.all( - names.map((name) => - request.get('/preferences', { - headers: { Cookie: `reader-name=${name}` }, - }), - ), - ) - for (const [index, response] of responses.entries()) { - expect(response.status()).toBe(200) - expect(response.headers()['cache-control']).toContain('no-store') - const html = await response.text() - expect(html).toContain(names[index]) - for (const other of names.filter((_, otherIndex) => otherIndex !== index)) { - expect(html).not.toContain(other) - } - } -}) - -test('hydration reuses SSR data and mutation invalidation refetches once', async ({ - page, -}) => { - const reads: string[] = [] - page.on('request', (request) => { - if ( - request.method() === 'GET' && - new URL(request.url()).pathname.startsWith('/_serverFn/') - ) { - reads.push(request.url()) - } - }) - await page.goto('/preferences') - await expect(page.getByTestId('reader-name')).toHaveText('Hello, Guest') - await expect(page.getByLabel('Display name')).toBeEnabled() - await page.waitForLoadState('networkidle') - expect(reads).toHaveLength(0) - - await page.getByLabel('Display name').fill('Ada') - const mutation = page.waitForRequest((request) => request.method() === 'POST') - await page.getByRole('button', { name: 'Save name' }).click() - await expect(page.getByTestId('reader-name')).toHaveText('Hello, Ada') - await expect(page.getByRole('button', { name: 'Save name' })).toBeEnabled() - await page.waitForLoadState('networkidle') - expect(reads).toHaveLength(1) - - const savedRequest = await mutation - const headers = await savedRequest.allHeaders() - delete headers['content-length'] - headers.origin = 'https://untrusted.example' - headers['sec-fetch-site'] = 'cross-site' - const denied = await page.request.post(savedRequest.url(), { - headers, - data: savedRequest.postData() ?? '', - }) - expect(denied.status()).toBe(403) - - await page.reload() - await expect(page.getByTestId('reader-name')).toHaveText('Hello, Ada') - await expect(page.getByLabel('Display name')).toBeEnabled() - await page.waitForLoadState('networkidle') - expect(reads).toHaveLength(1) -}) diff --git a/examples/react/start-basic-rsbuild/package.json b/examples/react/start-basic-rsbuild/package.json index bea4ba26ef..e96372bc1d 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/react-start": "^1.169.6", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-start": "^1.168.50", "react": "^19.2.3", "react-dom": "^19.2.3", "tailwind-merge": "^3.6.0", "zod": "^4.4.3" }, "devDependencies": { - "@rsbuild/core": "^2.3.1", + "@rsbuild/core": "^2.0.11", "@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": "^1.0.0", + "srvx": "^0.11.18", "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 58d573ca36..8d1c0e9a17 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/react-start": "^1.169.6", - "@tanstack/start-static-server-functions": "^1.167.44", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-start": "^1.168.50", + "@tanstack/start-static-server-functions": "^1.167.33", "@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 46df8e4650..45cbc9bff5 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/react-start": "^1.169.6", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-start": "^1.168.50", "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.260903-beta", + "nitro": "^3.0.260311-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 24f7113912..7ee38c93e5 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/react-router-ssr-query": "^1.167.3", - "@tanstack/react-start": "^1.169.6", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-router-ssr-query": "^1.167.2", + "@tanstack/react-start": "^1.168.50", + "@tanstack/router-plugin": "^1.168.36", "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": "^5.0.4", + "vitest": "^4.1.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 022300e159..976480d6b2 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/react-start": "^1.169.6", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-start": "^1.168.50", "@vitejs/plugin-react": "^6.0.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", - "srvx": "^1.0.0", + "srvx": "^0.11.9", "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 3452f910d0..a3c4f92817 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/react-router-ssr-query": "^1.167.3", - "@tanstack/react-start": "^1.169.6", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-router-ssr-query": "^1.167.2", + "@tanstack/react-start": "^1.168.50", "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 8f4673143e..c71b8bb62a 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/react-start": "^1.169.6", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-start": "^1.168.50", "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 074f714d5c..d723499390 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/react-start": "^1.169.6", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-start": "^1.168.50", "react": "^19.1.1", "react-dom": "^19.1.1" }, @@ -27,16 +27,5 @@ "@tailwindcss/vite": "^4.2.2", "tailwindcss": "^4.2.2", "@inlang/paraglide-js": "^2.4.0" - }, - "nx": { - "targets": { - "build": { - "outputs": [ - "...", - "{projectRoot}/src/paraglide", - "{projectRoot}/project.inlang/cache" - ] - } - } } } diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index f9f86b81d1..87bff7dd84 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/react-start": "^1.169.6", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-start": "^1.168.50", "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 1647e95f20..d5d088f812 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/react-start": "^1.169.6", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-start": "^1.168.50", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^4.4.3" diff --git a/examples/react/start-next-migration/.gitignore b/examples/react/start-next-migration/.gitignore deleted file mode 100644 index 24e8148a7d..0000000000 --- a/examples/react/start-next-migration/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -node_modules -.next -.output -.nitro -.tanstack -test-results -playwright-report -.env -.env.local -*.tsbuildinfo -next-env.d.ts -next-app/AGENTS.md -next-app/CLAUDE.md diff --git a/examples/react/start-next-migration/README.md b/examples/react/start-next-migration/README.md deleted file mode 100644 index 03bb53244e..0000000000 --- a/examples/react/start-next-migration/README.md +++ /dev/null @@ -1,61 +0,0 @@ -# Next.js to TanStack Start - -Two versions of the same small article site. `next-app/` uses the Next.js App Router; `src/` uses TanStack Start. They keep the public paths, article content, titles, descriptions, canonical URLs, search parameter, and permanent redirect. - -The private page saves one article in an encrypted session cookie. This keeps the example runnable without a database or an auth-provider account. It is a migration reference, not an authentication starter: the single demo account has no registration, password recovery, rate limiting, or account database. Do not deploy it as a public sign-in service. - -## Run - -Use Node 24 or newer and pnpm 12. From the repository root: - -```sh -pnpm install -pnpm nx run @tanstack/react-start:build -cd examples/react/start-next-migration -``` - -In each terminal that starts a server, set these variables. Generate your own secret and choose a demo password: - -```sh -export SESSION_PASSWORD="$(node -e "console.log(require('node:crypto').randomBytes(32).toString('hex'))")" -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. - -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 - -From this directory, with those ports free: - -```sh -pnpm exec playwright install chromium -pnpm test:e2e -pnpm build:next -pnpm build -MIGRATION_PRODUCTION=1 pnpm test:e2e -``` - -Playwright starts both dev servers with test-only credentials. The same tests run against each app and check server-rendered metadata, public paths, search, a 308 redirect, a missing article, sitemap membership, login errors, session persistence, private cache headers, saved-state mutation, and rejection of a captured mutation after sign-out. - -For a production-mode smoke check, keep the environment variables set and run `pnpm start:next` or `PORT=3101 pnpm start` after building. The cookie settings assume HTTPS in production. Deployment infrastructure, a shared database, real account security, and CDN behavior are outside this local fixture. - -## Compare - -| Next.js | TanStack Start | -| --------------------------------------------- | ------------------------------------------------------- | -| `next-app/app/page.tsx`, async `searchParams` | `src/routes/index.tsx`, `validateSearch` | -| `next-app/app/posts/[slug]/page.tsx` | `src/routes/posts.$slug.tsx` | -| `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` | `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 | - -The Next.js forms use Server Actions. The Start forms in this example handle client submit events and require JavaScript. For a no-JavaScript form, use a FormData-compatible server function URL or an explicit server-route POST implementation, including validation and CSRF protection. Replacing an Action with `createServerFn` does not preserve progressive enhancement automatically. - -The canonical origin is intentionally `https://field-notes.example` in both content modules, so local ports do not change the comparison. Replace it with your real public origin before adapting the example. - -The Start app enables `createCsrfMiddleware` for server-function requests in `src/start.ts`. The paired browser tests replay a mutation with an authenticated cookie jar and cross-site request metadata, then verify that it was rejected and the saved value did not change. Endpoint authorization is still checked independently after sign-out. diff --git a/examples/react/start-next-migration/next-app/account.ts b/examples/react/start-next-migration/next-app/account.ts deleted file mode 100644 index 7073518994..0000000000 --- a/examples/react/start-next-migration/next-app/account.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { cookies } from 'next/headers' -import { getIronSession } from 'iron-session' -export async function getSession() { - const cookieStore = await cookies() - const password = process.env.SESSION_PASSWORD - if (!password || password.length < 32) { - throw new Error('Set SESSION_PASSWORD to at least 32 characters') - } - return getIronSession<{ email: string; saved: boolean }>(cookieStore, { - cookieName: 'next-migration-session', - password, - cookieOptions: { secure: process.env.NODE_ENV === 'production' }, - }) -} diff --git a/examples/react/start-next-migration/next-app/app/actions.ts b/examples/react/start-next-migration/next-app/app/actions.ts deleted file mode 100644 index 325a4de176..0000000000 --- a/examples/react/start-next-migration/next-app/app/actions.ts +++ /dev/null @@ -1,36 +0,0 @@ -'use server' -import { redirect } from 'next/navigation' -import { revalidatePath } from 'next/cache' -import { getSession } from '../account' -export async function signIn(_state: { error: string }, form: FormData) { - if (!process.env.DEMO_PASSWORD) { - throw new Error('Set DEMO_PASSWORD before running the example') - } - const email = form.get('email'), - password = form.get('password') - if ( - email !== 'reader@example.com' || - password !== process.env.DEMO_PASSWORD - ) { - return { error: 'Invalid credentials' } - } - const session = await getSession() - session.email = email - session.saved = false - await session.save() - redirect('/saved') -} -export async function toggleSaved() { - const session = await getSession() - if (!session.email) { - throw new Error('Unauthorized') - } - session.saved = !session.saved - await session.save() - revalidatePath('/saved') -} -export async function signOut() { - const session = await getSession() - session.destroy() - redirect('/login') -} diff --git a/examples/react/start-next-migration/next-app/app/layout.tsx b/examples/react/start-next-migration/next-app/app/layout.tsx deleted file mode 100644 index 2aafe653dd..0000000000 --- a/examples/react/start-next-migration/next-app/app/layout.tsx +++ /dev/null @@ -1,16 +0,0 @@ -import Link from 'next/link' -import type { ReactNode } from 'react' -export default function Layout({ children }: { children: ReactNode }) { - return ( - - - - {children} - - - ) -} diff --git a/examples/react/start-next-migration/next-app/app/login/form.tsx b/examples/react/start-next-migration/next-app/app/login/form.tsx deleted file mode 100644 index 41347eb65b..0000000000 --- a/examples/react/start-next-migration/next-app/app/login/form.tsx +++ /dev/null @@ -1,25 +0,0 @@ -'use client' -import { useActionState } from 'react' -import { signIn } from '../actions' -export function LoginForm() { - const [state, action, pending] = useActionState(signIn, { error: '' }) - return ( -
- - - -

{state.error}

-
- ) -} diff --git a/examples/react/start-next-migration/next-app/app/login/page.tsx b/examples/react/start-next-migration/next-app/app/login/page.tsx deleted file mode 100644 index 9cbb900629..0000000000 --- a/examples/react/start-next-migration/next-app/app/login/page.tsx +++ /dev/null @@ -1,13 +0,0 @@ -import { LoginForm } from './form' -export const metadata = { - title: 'Sign in | Field notes', - robots: { index: false }, -} -export default function Login() { - return ( -
-

Sign in

- -
- ) -} diff --git a/examples/react/start-next-migration/next-app/app/not-found.tsx b/examples/react/start-next-migration/next-app/app/not-found.tsx deleted file mode 100644 index 5da341bf43..0000000000 --- a/examples/react/start-next-migration/next-app/app/not-found.tsx +++ /dev/null @@ -1,9 +0,0 @@ -import Link from 'next/link' -export default function NotFound() { - return ( -
-

Article not found

- All articles -
- ) -} diff --git a/examples/react/start-next-migration/next-app/app/page.tsx b/examples/react/start-next-migration/next-app/app/page.tsx deleted file mode 100644 index 75653b8344..0000000000 --- a/examples/react/start-next-migration/next-app/app/page.tsx +++ /dev/null @@ -1,37 +0,0 @@ -import Link from 'next/link' -import { articles, siteUrl } from '../content' -export const metadata = { - title: 'Field notes', - description: - 'Notes on moving a web application without losing its public URLs.', - alternates: { canonical: siteUrl }, -} -export default async function Page({ - searchParams, -}: { - searchParams: Promise<{ q?: string | string[] }> -}) { - const search = await searchParams - const q = typeof search.q === 'string' ? search.q : '' - const visible = articles.filter((article) => - article.title.toLowerCase().includes(q.toLowerCase()), - ) - return ( -
-

Field notes

-
- - -
-
    - {visible.map((article) => ( -
  • - {article.title} -
  • - ))} -
-
- ) -} diff --git a/examples/react/start-next-migration/next-app/app/posts/[slug]/page.tsx b/examples/react/start-next-migration/next-app/app/posts/[slug]/page.tsx deleted file mode 100644 index 36ed5b62da..0000000000 --- a/examples/react/start-next-migration/next-app/app/posts/[slug]/page.tsx +++ /dev/null @@ -1,36 +0,0 @@ -import { notFound } from 'next/navigation' -import { articles, siteUrl } from '../../../content' -async function getArticle(params: Promise<{ slug: string }>) { - const { slug } = await params - const article = articles.find((item) => item.slug === slug) - if (!article) { - notFound() - } - return article -} -export async function generateMetadata({ - params, -}: { - params: Promise<{ slug: string }> -}) { - const article = await getArticle(params) - return { - title: article.title, - description: article.description, - openGraph: { title: article.title }, - alternates: { canonical: `${siteUrl}/posts/${article.slug}` }, - } -} -export default async function Page({ - params, -}: { - params: Promise<{ slug: string }> -}) { - const article = await getArticle(params) - return ( -
-

{article.title}

-

{article.body}

-
- ) -} diff --git a/examples/react/start-next-migration/next-app/app/saved/page.tsx b/examples/react/start-next-migration/next-app/app/saved/page.tsx deleted file mode 100644 index 5310dbc37e..0000000000 --- a/examples/react/start-next-migration/next-app/app/saved/page.tsx +++ /dev/null @@ -1,28 +0,0 @@ -import { redirect } from 'next/navigation' -import { getSession } from '../../account' -import { signOut, toggleSaved } from '../actions' -export const metadata = { - title: 'Saved articles | Field notes', - robots: { index: false }, -} -export default async function Saved() { - const session = await getSession() - if (!session.email) { - redirect('/login') - } - return ( -
-

Saved articles

-

{session.email}

-

- {session.saved ? 'Keeping your URLs is saved' : 'No saved articles'} -

-
- -
-
- -
-
- ) -} diff --git a/examples/react/start-next-migration/next-app/app/sitemap.ts b/examples/react/start-next-migration/next-app/app/sitemap.ts deleted file mode 100644 index 9859cffa17..0000000000 --- a/examples/react/start-next-migration/next-app/app/sitemap.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { articles, siteUrl } from '../content' -export default function sitemap() { - return [ - { url: siteUrl }, - ...articles.map((article) => ({ url: `${siteUrl}/posts/${article.slug}` })), - ] -} diff --git a/examples/react/start-next-migration/next-app/content.ts b/examples/react/start-next-migration/next-app/content.ts deleted file mode 100644 index 2a9d15c1c0..0000000000 --- a/examples/react/start-next-migration/next-app/content.ts +++ /dev/null @@ -1,15 +0,0 @@ -export const articles = [ - { - slug: 'keeping-your-urls', - title: 'Keeping your URLs', - description: 'Preserve public URLs when changing frameworks.', - body: 'A framework migration can keep the URLs your readers already use.', - }, - { - slug: 'checking-your-metadata', - title: 'Checking your metadata', - description: 'Compare rendered titles and canonical URLs before launch.', - body: 'Check the server response as well as the page after client navigation.', - }, -] -export const siteUrl = 'https://field-notes.example' diff --git a/examples/react/start-next-migration/next-app/next.config.ts b/examples/react/start-next-migration/next-app/next.config.ts deleted file mode 100644 index dc72c3ae72..0000000000 --- a/examples/react/start-next-migration/next-app/next.config.ts +++ /dev/null @@ -1,13 +0,0 @@ -import type { NextConfig } from 'next' -const config: NextConfig = { - async redirects() { - return [ - { - source: '/old-notes', - destination: '/posts/keeping-your-urls', - permanent: true, - }, - ] - }, -} -export default config diff --git a/examples/react/start-next-migration/next-app/tsconfig.json b/examples/react/start-next-migration/next-app/tsconfig.json deleted file mode 100644 index 8786ab9834..0000000000 --- a/examples/react/start-next-migration/next-app/tsconfig.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "compilerOptions": { - "target": "ES2024", - "lib": ["dom", "dom.iterable", "esnext"], - "allowJs": true, - "skipLibCheck": true, - "strict": true, - "noEmit": true, - "esModuleInterop": true, - "module": "esnext", - "moduleResolution": "bundler", - "resolveJsonModule": true, - "isolatedModules": true, - "jsx": "react-jsx", - "incremental": true, - "plugins": [ - { - "name": "next" - } - ] - }, - "include": [ - "next-env.d.ts", - "**/*.ts", - "**/*.tsx", - ".next/types/**/*.ts", - ".next/dev/types/**/*.ts" - ], - "exclude": ["node_modules"] -} diff --git a/examples/react/start-next-migration/package.json b/examples/react/start-next-migration/package.json deleted file mode 100644 index 0c2a2a9563..0000000000 --- a/examples/react/start-next-migration/package.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "name": "tanstack-start-example-next-migration", - "private": true, - "type": "module", - "scripts": { - "dev": "vite dev --port 3101", - "dev:next": "next dev next-app --port 3100", - "build": "vite build && tsc --noEmit", - "build:next": "next build next-app", - "start": "node .output/server/index.mjs", - "start:next": "next start next-app --port 3100", - "test:e2e": "playwright test" - }, - "dependencies": { - "@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" - }, - "devDependencies": { - "@playwright/test": "^1.61.0", - "@types/node": "^22.10.2", - "@types/react": "^19.2.8", - "@types/react-dom": "^19.2.3", - "@vitejs/plugin-react": "^6.0.1", - "nitro": "^3.0.260903-beta", - "typescript": "npm:@typescript/typescript6@^6.0.2", - "vite": "^8.0.14" - }, - "nx": { - "targets": { - "test:e2e": { - "outputs": [ - "...", - "{projectRoot}/next-app/.next", - "{projectRoot}/next-app/next-env.d.ts" - ] - } - } - } -} diff --git a/examples/react/start-next-migration/playwright.config.ts b/examples/react/start-next-migration/playwright.config.ts deleted file mode 100644 index ce48715df4..0000000000 --- a/examples/react/start-next-migration/playwright.config.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { defineConfig } from '@playwright/test' - -const production = process.env.MIGRATION_PRODUCTION === '1' -const env = { - SESSION_PASSWORD: 'migration-reference-test-secret-at-least-32-characters', - DEMO_PASSWORD: 'migration-test-password', -} - -export default defineConfig({ - testDir: './tests', - use: { browserName: 'chromium' }, - projects: [ - { name: 'next', use: { baseURL: 'http://localhost:3100' } }, - { name: 'start', use: { baseURL: 'http://localhost:3101' } }, - ], - webServer: [ - { - command: production ? 'pnpm start:next' : 'pnpm dev:next', - url: 'http://localhost:3100', - env, - timeout: 120_000, - }, - { - command: production ? 'PORT=3101 pnpm start' : 'pnpm dev', - url: 'http://localhost:3101', - env, - timeout: 120_000, - }, - ], -}) diff --git a/examples/react/start-next-migration/src/content.ts b/examples/react/start-next-migration/src/content.ts deleted file mode 100644 index 2a9d15c1c0..0000000000 --- a/examples/react/start-next-migration/src/content.ts +++ /dev/null @@ -1,15 +0,0 @@ -export const articles = [ - { - slug: 'keeping-your-urls', - title: 'Keeping your URLs', - description: 'Preserve public URLs when changing frameworks.', - body: 'A framework migration can keep the URLs your readers already use.', - }, - { - slug: 'checking-your-metadata', - title: 'Checking your metadata', - description: 'Compare rendered titles and canonical URLs before launch.', - body: 'Check the server response as well as the page after client navigation.', - }, -] -export const siteUrl = 'https://field-notes.example' diff --git a/examples/react/start-next-migration/src/routeTree.gen.ts b/examples/react/start-next-migration/src/routeTree.gen.ts deleted file mode 100644 index 15eeafce02..0000000000 --- a/examples/react/start-next-migration/src/routeTree.gen.ts +++ /dev/null @@ -1,167 +0,0 @@ -/* 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 LoginRouteImport } from './routes/login' -import { Route as OldNotesRouteImport } from './routes/old-notes' -import { Route as SavedRouteImport } from './routes/saved' -import { Route as SitemapDotxmlRouteImport } from './routes/sitemap[.]xml' -import { Route as PostsSlugRouteImport } from './routes/posts.$slug' - -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => rootRouteImport, -} as any) -const LoginRoute = LoginRouteImport.update({ - id: '/login', - path: '/login', - getParentRoute: () => rootRouteImport, -} as any) -const OldNotesRoute = OldNotesRouteImport.update({ - id: '/old-notes', - path: '/old-notes', - getParentRoute: () => rootRouteImport, -} as any) -const SavedRoute = SavedRouteImport.update({ - id: '/saved', - path: '/saved', - getParentRoute: () => rootRouteImport, -} as any) -const SitemapDotxmlRoute = SitemapDotxmlRouteImport.update({ - id: '/sitemap.xml', - path: '/sitemap.xml', - getParentRoute: () => rootRouteImport, -} as any) -const PostsSlugRoute = PostsSlugRouteImport.update({ - id: '/posts/$slug', - path: '/posts/$slug', - getParentRoute: () => rootRouteImport, -} as any) - -export interface FileRoutesByFullPath { - '/': typeof IndexRoute - '/login': typeof LoginRoute - '/old-notes': typeof OldNotesRoute - '/saved': typeof SavedRoute - '/sitemap.xml': typeof SitemapDotxmlRoute - '/posts/$slug': typeof PostsSlugRoute -} -export interface FileRoutesByTo { - '/': typeof IndexRoute - '/login': typeof LoginRoute - '/old-notes': typeof OldNotesRoute - '/saved': typeof SavedRoute - '/sitemap.xml': typeof SitemapDotxmlRoute - '/posts/$slug': typeof PostsSlugRoute -} -export interface FileRoutesById { - __root__: typeof rootRouteImport - '/': typeof IndexRoute - '/login': typeof LoginRoute - '/old-notes': typeof OldNotesRoute - '/saved': typeof SavedRoute - '/sitemap.xml': typeof SitemapDotxmlRoute - '/posts/$slug': typeof PostsSlugRoute -} -export interface FileRouteTypes { - fileRoutesByFullPath: FileRoutesByFullPath - fullPaths: - '/' | '/login' | '/old-notes' | '/saved' | '/sitemap.xml' | '/posts/$slug' - fileRoutesByTo: FileRoutesByTo - to: '/' | '/login' | '/old-notes' | '/saved' | '/sitemap.xml' | '/posts/$slug' - id: - | '__root__' - | '/' - | '/login' - | '/old-notes' - | '/saved' - | '/sitemap.xml' - | '/posts/$slug' - fileRoutesById: FileRoutesById -} -export interface RootRouteChildren { - IndexRoute: typeof IndexRoute - LoginRoute: typeof LoginRoute - OldNotesRoute: typeof OldNotesRoute - SavedRoute: typeof SavedRoute - SitemapDotxmlRoute: typeof SitemapDotxmlRoute - PostsSlugRoute: typeof PostsSlugRoute -} - -declare module '@tanstack/react-router' { - interface FileRoutesByPath { - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport - parentRoute: typeof rootRouteImport - } - '/login': { - id: '/login' - path: '/login' - fullPath: '/login' - preLoaderRoute: typeof LoginRouteImport - parentRoute: typeof rootRouteImport - } - '/old-notes': { - id: '/old-notes' - path: '/old-notes' - fullPath: '/old-notes' - preLoaderRoute: typeof OldNotesRouteImport - parentRoute: typeof rootRouteImport - } - '/saved': { - id: '/saved' - path: '/saved' - fullPath: '/saved' - preLoaderRoute: typeof SavedRouteImport - parentRoute: typeof rootRouteImport - } - '/sitemap.xml': { - id: '/sitemap.xml' - path: '/sitemap.xml' - fullPath: '/sitemap.xml' - preLoaderRoute: typeof SitemapDotxmlRouteImport - parentRoute: typeof rootRouteImport - } - '/posts/$slug': { - id: '/posts/$slug' - path: '/posts/$slug' - fullPath: '/posts/$slug' - preLoaderRoute: typeof PostsSlugRouteImport - parentRoute: typeof rootRouteImport - } - } -} - -const rootRouteChildren: RootRouteChildren = { - IndexRoute: IndexRoute, - LoginRoute: LoginRoute, - OldNotesRoute: OldNotesRoute, - SavedRoute: SavedRoute, - SitemapDotxmlRoute: SitemapDotxmlRoute, - PostsSlugRoute: PostsSlugRoute, -} -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/examples/react/start-next-migration/src/router.tsx b/examples/react/start-next-migration/src/router.tsx deleted file mode 100644 index 9711e610bf..0000000000 --- a/examples/react/start-next-migration/src/router.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import { createRouter } from '@tanstack/react-router' -import { routeTree } from './routeTree.gen' -export function getRouter() { - return createRouter({ routeTree, scrollRestoration: true }) -} diff --git a/examples/react/start-next-migration/src/routes/__root.tsx b/examples/react/start-next-migration/src/routes/__root.tsx deleted file mode 100644 index a7eaa0168f..0000000000 --- a/examples/react/start-next-migration/src/routes/__root.tsx +++ /dev/null @@ -1,46 +0,0 @@ -import { - createRootRoute, - HeadContent, - Link, - Outlet, - Scripts, -} from '@tanstack/react-router' -import type { ReactNode } from 'react' -export const Route = createRootRoute({ - head: () => ({ - meta: [ - { charSet: 'utf-8' }, - { name: 'viewport', content: 'width=device-width, initial-scale=1' }, - ], - }), - component: Outlet, - shellComponent: Document, - notFoundComponent: () => ( -
-

Article not found

- - All articles - -
- ), -}) -function Document({ children }: { children: ReactNode }) { - return ( - - - - - - - {children} - - - - ) -} diff --git a/examples/react/start-next-migration/src/routes/index.tsx b/examples/react/start-next-migration/src/routes/index.tsx deleted file mode 100644 index 8778d9d01f..0000000000 --- a/examples/react/start-next-migration/src/routes/index.tsx +++ /dev/null @@ -1,45 +0,0 @@ -import { createFileRoute, Link } from '@tanstack/react-router' -import { articles, siteUrl } from '../content' -export const Route = createFileRoute('/')({ - validateSearch: (search) => ({ - q: typeof search.q === 'string' ? search.q : '', - }), - head: () => ({ - meta: [ - { title: 'Field notes' }, - { - name: 'description', - content: - 'Notes on moving a web application without losing its public URLs.', - }, - ], - links: [{ rel: 'canonical', href: siteUrl }], - }), - component: Articles, -}) -function Articles() { - const { q } = Route.useSearch() - const visible = articles.filter((article) => - article.title.toLowerCase().includes(q.toLowerCase()), - ) - return ( -
-

Field notes

-
- - -
-
    - {visible.map((article) => ( -
  • - - {article.title} - -
  • - ))} -
-
- ) -} diff --git a/examples/react/start-next-migration/src/routes/login.tsx b/examples/react/start-next-migration/src/routes/login.tsx deleted file mode 100644 index 628261cc8e..0000000000 --- a/examples/react/start-next-migration/src/routes/login.tsx +++ /dev/null @@ -1,70 +0,0 @@ -import { createFileRoute, useHydrated, useRouter } from '@tanstack/react-router' -import { useServerFn } from '@tanstack/react-start' -import { useState } from 'react' -import { signIn } from '../server/account' -export const Route = createFileRoute('/login')({ - head: () => ({ - meta: [ - { title: 'Sign in | Field notes' }, - { name: 'robots', content: 'noindex' }, - ], - }), - component: Login, -}) -function Login() { - const hydrated = useHydrated() - const login = useServerFn(signIn) - const router = useRouter() - const [error, setError] = useState('') - const [pending, setPending] = useState(false) - return ( -
-

Sign in

-
{ - event.preventDefault() - const form = new FormData(event.currentTarget) - const email = form.get('email'), - password = form.get('password') - if (typeof email !== 'string' || typeof password !== 'string') { - return - } - setPending(true) - setError('') - try { - const result = await login({ data: { email, password } }) - if (result.error) { - setError(result.error) - return - } - await router.invalidate() - await router.navigate({ to: '/saved' }) - } catch { - setError('Sign-in failed. Try again.') - } finally { - setPending(false) - } - }} - > -
- - - -
-

{error}

-
-
- ) -} diff --git a/examples/react/start-next-migration/src/routes/old-notes.tsx b/examples/react/start-next-migration/src/routes/old-notes.tsx deleted file mode 100644 index 1fb5ce846b..0000000000 --- a/examples/react/start-next-migration/src/routes/old-notes.tsx +++ /dev/null @@ -1,10 +0,0 @@ -import { createFileRoute, redirect } from '@tanstack/react-router' -export const Route = createFileRoute('/old-notes')({ - beforeLoad: () => { - throw redirect({ - to: '/posts/$slug', - params: { slug: 'keeping-your-urls' }, - statusCode: 308, - }) - }, -}) diff --git a/examples/react/start-next-migration/src/routes/posts.$slug.tsx b/examples/react/start-next-migration/src/routes/posts.$slug.tsx deleted file mode 100644 index 1998717393..0000000000 --- a/examples/react/start-next-migration/src/routes/posts.$slug.tsx +++ /dev/null @@ -1,34 +0,0 @@ -import { createFileRoute, notFound } from '@tanstack/react-router' -import { articles, siteUrl } from '../content' -export const Route = createFileRoute('/posts/$slug')({ - loader: ({ params }) => { - const article = articles.find((item) => item.slug === params.slug) - if (!article) { - throw notFound() - } - return article - }, - head: ({ loaderData }) => - loaderData - ? { - meta: [ - { title: loaderData.title }, - { name: 'description', content: loaderData.description }, - { property: 'og:title', content: loaderData.title }, - ], - links: [ - { rel: 'canonical', href: `${siteUrl}/posts/${loaderData.slug}` }, - ], - } - : {}, - component: Article, -}) -function Article() { - const article = Route.useLoaderData() - return ( -
-

{article.title}

-

{article.body}

-
- ) -} diff --git a/examples/react/start-next-migration/src/routes/saved.tsx b/examples/react/start-next-migration/src/routes/saved.tsx deleted file mode 100644 index 2f526eb7b5..0000000000 --- a/examples/react/start-next-migration/src/routes/saved.tsx +++ /dev/null @@ -1,79 +0,0 @@ -import { - createFileRoute, - redirect, - useHydrated, - useRouter, -} from '@tanstack/react-router' -import { useServerFn } from '@tanstack/react-start' -import { useState } from 'react' -import { getAccount, signOut, toggleSaved } from '../server/account' -export const Route = createFileRoute('/saved')({ - loader: async () => { - const account = await getAccount() - if (!account) { - throw redirect({ to: '/login' }) - } - return account - }, - headers: () => ({ 'Cache-Control': 'private, no-store' }), - head: () => ({ - meta: [ - { title: 'Saved articles | Field notes' }, - { name: 'robots', content: 'noindex' }, - ], - }), - component: Saved, -}) -function Saved() { - const hydrated = useHydrated() - const account = Route.useLoaderData() - const toggle = useServerFn(toggleSaved), - logout = useServerFn(signOut) - const router = useRouter() - const [pending, setPending] = useState(false), - [error, setError] = useState('') - return ( -
-

Saved articles

-

{account.email}

-

- {account.saved ? 'Keeping your URLs is saved' : 'No saved articles'} -

- - -

{error}

-
- ) -} diff --git a/examples/react/start-next-migration/src/routes/sitemap[.]xml.ts b/examples/react/start-next-migration/src/routes/sitemap[.]xml.ts deleted file mode 100644 index a7dfcaa594..0000000000 --- a/examples/react/start-next-migration/src/routes/sitemap[.]xml.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { createFileRoute } from '@tanstack/react-router' -import { articles, siteUrl } from '../content' -export const Route = createFileRoute('/sitemap.xml')({ - server: { - handlers: { - GET: () => - new Response( - `${siteUrl}${articles.map((article) => `${siteUrl}/posts/${article.slug}`).join('')}`, - { headers: { 'Content-Type': 'application/xml' } }, - ), - }, - }, -}) diff --git a/examples/react/start-next-migration/src/server/account.ts b/examples/react/start-next-migration/src/server/account.ts deleted file mode 100644 index 85e921c74b..0000000000 --- a/examples/react/start-next-migration/src/server/account.ts +++ /dev/null @@ -1,77 +0,0 @@ -import { getIronSession } from 'iron-session' -import { createServerFn } from '@tanstack/react-start' -import { - getCookie, - setCookie, - setResponseStatus, - setResponseHeader, -} from '@tanstack/react-start/server' -import { redirect } from '@tanstack/react-router' -async function session() { - setResponseHeader('Cache-Control', 'private, no-store') - const password = process.env.SESSION_PASSWORD - if (!password || password.length < 32) { - throw new Error('Set SESSION_PASSWORD to at least 32 characters') - } - 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.email - ? { email: current.email, saved: current.saved ?? false } - : null - }, -) -export const signIn = createServerFn({ method: 'POST' }) - .validator((input: { email: string; password: string }) => { - if (typeof input.email !== 'string' || typeof input.password !== 'string') { - throw new Error('Invalid credentials') - } - return input - }) - .handler(async ({ data }) => { - if (!process.env.DEMO_PASSWORD) { - throw new Error('Set DEMO_PASSWORD before running the example') - } - if ( - data.email !== 'reader@example.com' || - data.password !== process.env.DEMO_PASSWORD - ) { - return { error: 'Invalid credentials' } - } - const current = await session() - 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.email) { - setResponseStatus(401) - throw new Error('Unauthorized') - } - current.saved = !current.saved - await current.save() - }, -) -export const signOut = createServerFn({ method: 'POST' }).handler(async () => { - const current = await session() - current.destroy() - throw redirect({ to: '/login' }) -}) diff --git a/examples/react/start-next-migration/src/start.ts b/examples/react/start-next-migration/src/start.ts deleted file mode 100644 index 5fb1e247fb..0000000000 --- a/examples/react/start-next-migration/src/start.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { createCsrfMiddleware, createStart } from '@tanstack/react-start' - -export const startInstance = createStart(() => ({ - requestMiddleware: [ - createCsrfMiddleware({ - filter: (ctx) => ctx.handlerType === 'serverFn', - }), - ], -})) diff --git a/examples/react/start-next-migration/tests/migration.spec.ts b/examples/react/start-next-migration/tests/migration.spec.ts deleted file mode 100644 index 7009095977..0000000000 --- a/examples/react/start-next-migration/tests/migration.spec.ts +++ /dev/null @@ -1,163 +0,0 @@ -import { expect, test } from '@playwright/test' - -test('public URLs, server metadata, search, redirects, and missing pages survive migration', async ({ - page, - request, -}) => { - const response = await request.get('/posts/keeping-your-urls') - expect(response.status()).toBe(200) - const html = await response.text() - expect(html).toContain('Keeping your URLs') - expect(html).toMatch( - /]+name="description"[^>]+content="Preserve public URLs when changing frameworks\."/, - ) - expect(html).toMatch( - /]+rel="canonical"[^>]+href="https:\/\/field-notes\.example\/posts\/keeping-your-urls"/, - ) - expect(html).toMatch( - /]+property="og:title"[^>]+content="Keeping your URLs"/, - ) - expect(html).toContain( - 'A framework migration can keep the URLs your readers already use.', - ) - - const old = await request.get('/old-notes', { maxRedirects: 0 }) - expect(old.status()).toBe(308) - expect(new URL(old.headers().location, old.url()).pathname).toBe( - '/posts/keeping-your-urls', - ) - expect((await request.get('/posts/missing')).status()).toBe(404) - const sitemap = await (await request.get('/sitemap.xml')).text() - expect(sitemap).toContain( - 'https://field-notes.example/posts/keeping-your-urls', - ) - expect(sitemap).not.toContain('/saved') - - await page.goto('/?q=metadata') - await expect( - page.getByRole('link', { name: 'Checking your metadata' }), - ).toBeVisible() - await expect( - page.getByRole('link', { name: 'Keeping your URLs' }), - ).toHaveCount(0) - await page.getByRole('link', { name: 'Checking your metadata' }).click() - await expect(page).toHaveURL(/\/posts\/checking-your-metadata$/) - await expect(page).toHaveTitle('Checking your metadata') - await expect(page.locator('link[rel="canonical"]')).toHaveAttribute( - 'href', - 'https://field-notes.example/posts/checking-your-metadata', - ) -}) - -test('sessions and protected mutations survive reload but cannot run after sign-out', async ({ - page, -}, testInfo) => { - await page.goto('/saved') - await expect(page).toHaveURL(/\/login$/) - await page.getByLabel('Email', { exact: true }).fill('reader@example.com') - await page.getByLabel('Password', { exact: true }).fill('wrong-password') - await page.getByRole('button', { name: 'Sign in', exact: true }).click() - await expect(page.getByRole('main').getByRole('alert')).toHaveText( - 'Invalid credentials', - ) - await page.getByLabel('Email', { exact: true }).fill('reader@example.com') - await page - .getByLabel('Password', { exact: true }) - .fill('migration-test-password') - await page.getByRole('button', { name: 'Sign in', exact: true }).click() - await expect(page).toHaveURL(/\/saved$/) - await expect(page.getByTestId('saved-state')).toHaveText('No saved articles') - const mutation = page.waitForRequest((request) => request.method() === 'POST') - await page.getByRole('button', { name: 'Save article', exact: true }).click() - const savedRequest = await mutation - await expect(page.getByTestId('saved-state')).toHaveText( - 'Keeping your URLs is saved', - ) - // Keep the authenticated cookie jar while replaying a cross-site request. - const crossSiteHeaders = await savedRequest.allHeaders() - delete crossSiteHeaders.cookie - delete crossSiteHeaders['content-length'] - crossSiteHeaders.origin = 'https://untrusted.example' - crossSiteHeaders['sec-fetch-site'] = 'cross-site' - const crossSite = await page.request.post(savedRequest.url(), { - headers: crossSiteHeaders, - data: savedRequest.postData() ?? '', - }) - if (testInfo.project.name === 'start') { - expect(crossSite.status()).toBe(403) - } else { - expect(crossSite.status()).toBeGreaterThanOrEqual(400) - } - - const response = await page.reload() - expect(response?.headers()['cache-control']).toMatch( - process.env.MIGRATION_PRODUCTION ? /no-store/ : /no-store|no-cache/, - ) - await expect(page.getByTestId('saved-state')).toHaveText( - 'Keeping your URLs is saved', - ) - await page.getByRole('button', { name: 'Sign out', exact: true }).click() - await expect(page).toHaveURL(/\/login$/) - - // Replay the real mutation with the now-signed-out browser cookie jar. - const headers = await savedRequest.allHeaders() - delete headers.cookie - delete headers['content-length'] - const denied = await page.request.post(savedRequest.url(), { - headers, - data: savedRequest.postData() ?? '', - }) - expect(denied.status()).toBeGreaterThanOrEqual(400) - await page.goto('/saved') - await expect(page).toHaveURL(/\/login$/) -}) - -test('Start serializes saving and signing out so their responses cannot arrive out of order', async ({ - page, -}, testInfo) => { - test.skip(testInfo.project.name !== 'start', 'Start event-handler regression') - await page.goto('/login') - await page.getByLabel('Email', { exact: true }).fill('reader@example.com') - await page - .getByLabel('Password', { exact: true }) - .fill('migration-test-password') - await page.getByRole('button', { name: 'Sign in', exact: true }).click() - await expect(page).toHaveURL(/\/saved$/) - - for (const action of ['Save article', 'Sign out']) { - let release = () => {} - const held = new Promise((resolve) => { - release = resolve - }) - await page.route('**/_serverFn/**', async (route) => { - if (route.request().method() === 'POST') { - await held - } - await route.continue() - }) - await page.getByRole('button', { name: action, exact: true }).click() - try { - await expect( - page.getByRole('button', { name: /^(Save|Remove) article$/ }), - ).toBeDisabled() - await expect( - page.getByRole('button', { name: 'Sign out', exact: true }), - ).toBeDisabled() - } finally { - release() - } - if (action === 'Save article') { - await expect(page.getByTestId('saved-state')).toHaveText( - 'Keeping your URLs is saved', - ) - await expect( - page.getByRole('button', { name: 'Sign out', exact: true }), - ).toBeEnabled() - } else { - await expect(page).toHaveURL(/\/login$/) - } - await page.unrouteAll({ behavior: 'wait' }) - } - await page.goto('/saved') - await expect(page).toHaveURL(/\/login$/) -}) diff --git a/examples/react/start-next-migration/tsconfig.json b/examples/react/start-next-migration/tsconfig.json deleted file mode 100644 index a41553b9a1..0000000000 --- a/examples/react/start-next-migration/tsconfig.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "include": [ - "src/**/*.ts", - "src/**/*.tsx", - "vite.config.ts", - "playwright.config.ts", - "tests/**/*.ts" - ], - "compilerOptions": { - "strict": true, - "esModuleInterop": true, - "jsx": "react-jsx", - "module": "ESNext", - "moduleResolution": "Bundler", - "lib": ["DOM", "DOM.Iterable", "ES2024"], - "skipLibCheck": true, - "target": "ES2024", - "noEmit": true, - "types": ["vite/client"] - } -} diff --git a/examples/react/start-next-migration/vite.config.ts b/examples/react/start-next-migration/vite.config.ts deleted file mode 100644 index 26d0e455d5..0000000000 --- a/examples/react/start-next-migration/vite.config.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { defineConfig } from 'vite' -import react from '@vitejs/plugin-react' -import { tanstackStart } from '@tanstack/react-start/plugin/vite' -import { nitro } from 'nitro/vite' -export default defineConfig({ plugins: [tanstackStart(), react(), nitro()] }) diff --git a/examples/react/start-rscs/package.json b/examples/react/start-rscs/package.json index 00c88681d7..ad7d1d686d 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/react-start": "^1.169.6", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-start": "^1.168.50", "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.39", - "nitro": "^3.0.260903-beta", + "@vitejs/plugin-rsc": "^0.5.30", + "nitro": "^3.0.260311-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 762bbff733..c9c05f39cb 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/react-start": "^1.169.6", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-start": "^1.168.50", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^4.4.3" diff --git a/examples/react/start-supabase-basic/.gitignore b/examples/react/start-supabase-basic/.gitignore index 372dc30373..8293849e8d 100644 --- a/examples/react/start-supabase-basic/.gitignore +++ b/examples/react/start-supabase-basic/.gitignore @@ -1,11 +1,12 @@ node_modules +# Keep environment variables out of version control +!.env package-lock.json yarn.lock .DS_Store .cache -# The checked-in .env contains public demo values used by the build. -!.env +.env .vercel .output /build/ diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 0bf4b2c246..1deb8c6f1e 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/react-start": "^1.169.6", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-start": "^1.168.50", "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 b58fbe4ff0..0e2dd2c693 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/react-start": "^1.169.6", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-start": "^1.168.50", "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 7755d227fc..53a55c1442 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/react-router-ssr-query": "^1.167.3", - "@tanstack/react-start": "^1.169.6", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-router-ssr-query": "^1.167.2", + "@tanstack/react-start": "^1.168.50", "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 0ab7e89c2d..777496cf54 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/react-start": "^1.169.6", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/react-start": "^1.168.50", "@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 0be3c60e8f..a0b2bb5643 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/router-plugin": "^1.168.36", "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 c606070dfb..ef2d3bad47 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.46", - "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", "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 11df7bf03b..9038ed8ff5 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/router-plugin": "^1.168.36", "@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 5612419cae..b386068487 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.46", - "@tanstack/react-router-devtools": "^1.167.3", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/react-router": "^1.170.33", + "@tanstack/react-router-devtools": "^1.167.1", + "@tanstack/router-plugin": "^1.168.36", "@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 110b4d2621..182268ca8b 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.169.0", - "@tanstack/solid-router": "^1.170.43", - "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.168.36", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", "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 ea7d05c902..8b9245e8e3 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.169.0", - "@tanstack/solid-router": "^1.170.43", - "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.168.36", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", "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 830df7b9cf..1ada52853d 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", "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 e7d608f5fe..58ec814f6f 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", "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 867118382e..7bb1706e1f 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2", "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/router-plugin": "^1.168.36", "@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 c8e00ee43e..1a40fd7913 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", "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 fdb5f05f52..dd8b5299ad 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2", "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/router-plugin": "^1.168.36", "@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 7b132b11a1..520c62f65d 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/router-plugin": "^1.168.36", "@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 e3699970a9..b472b683ed 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.43", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/router-plugin": "^1.168.36", "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.3", + "@tanstack/solid-router-devtools": "^1.167.1", "@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 92367442fc..5948e5a410 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", "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.169.0", + "@tanstack/router-plugin": "^1.168.36", "@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 801b452192..e77b63fb25 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.169.0", - "@tanstack/solid-router": "^1.170.43", - "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.168.36", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", "@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 a9cc6360a5..b53aca1272 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.169.0", - "@tanstack/solid-router": "^1.170.43", - "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.168.36", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", "@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 95ec804011..6e82e5253f 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", "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 56114afd04..b6660c7d4a 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", "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 6493a3c7c8..63590945c1 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.43", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/router-plugin": "^1.168.36", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" }, @@ -23,16 +23,5 @@ "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", "@inlang/paraglide-js": "^2.4.0" - }, - "nx": { - "targets": { - "build": { - "outputs": [ - "...", - "{projectRoot}/src/paraglide", - "{projectRoot}/project.inlang/cache" - ] - } - } } } diff --git a/examples/solid/kitchen-sink-file-based/package.json b/examples/solid/kitchen-sink-file-based/package.json index 8cd73e38ff..e06d3c8f58 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", "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.169.0", + "@tanstack/router-plugin": "^1.168.36", "@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 25a1c29953..b098ce82b2 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.169.0", + "@tanstack/router-plugin": "^1.168.36", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.43", - "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", "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 7a7dc81025..f98a062f30 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", "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 08ad918a60..2bf8e2cbd9 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", "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 cd758ab704..fd3baabc9e 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.169.0", + "@tanstack/router-plugin": "^1.168.36", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.43", - "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", "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 7d2fbb6756..91993f1041 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", "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 2338d32305..dbe36a2909 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", "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 af5e01b4cd..f8d31fbbd9 100644 --- a/examples/solid/quickstart-esbuild-file-based/build.js +++ b/examples/solid/quickstart-esbuild-file-based/build.js @@ -14,7 +14,10 @@ const ctx = await esbuild.context({ target: ['esnext'], sourcemap: true, conditions: ['style'], - plugins: [solidPlugin(), tanstackRouter({ target: 'solid' })], + plugins: [ + solidPlugin(), + tanstackRouter({ target: 'solid', autoCodeSplitting: true }), + ], }) if (isDev) { diff --git a/examples/solid/quickstart-esbuild-file-based/package.json b/examples/solid/quickstart-esbuild-file-based/package.json index 9bcc9a08d0..711a272a9f 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.169.0", - "@tanstack/solid-router": "^1.170.43", - "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.168.36", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", "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 920154566d..0c9a943f8f 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2", "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/router-plugin": "^1.168.36", "@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 2d9c886ac3..2ef10d0421 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", "postcss": "^8.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" }, "devDependencies": { - "@rsbuild/core": "^2.3.1", + "@rsbuild/core": "^2.1.0", "@rsbuild/plugin-babel": "^1.1.2", "@rsbuild/plugin-solid": "^1.1.1", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/router-plugin": "^1.168.36", "@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 16167be207..ad85425355 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", "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.169.0", + "@tanstack/router-plugin": "^1.168.36", "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 454382e8cc..b7bf16898d 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", "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 1d60ab2765..28e3fc99d3 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/router-plugin": "^1.168.36", "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 a2e018fa96..3cfa6a1377 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.3", + "@tanstack/solid-router-devtools": "^1.167.1", "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 0672c42931..c68b3f48e1 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.5", - "@tanstack/solid-router": "^1.170.43", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/history": "^1.162.2", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/router-plugin": "^1.168.36", "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 3770256692..7b035c2f41 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/router-plugin": "^1.168.36", "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 61234ac455..937bf9795c 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.3", + "@tanstack/solid-router-devtools": "^1.167.1", "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 ca08511d3e..ea563d407e 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.5", - "@tanstack/solid-router": "^1.170.43", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/history": "^1.162.2", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/router-plugin": "^1.168.36", "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 3d9fd2e2d0..9da4a8872c 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/router-plugin": "^1.168.36", "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 76bb059de5..bf2cc8ab04 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.3", + "@tanstack/solid-router-devtools": "^1.167.1", "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 93943a1df8..34ff771273 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.5", + "@tanstack/history": "^1.162.2", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.43", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/router-plugin": "^1.168.36", "@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 eaa5a5aaea..48b7331065 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", "@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 59991edb36..0fc7c76ae0 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/router-plugin": "^1.168.36", "@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": "^7.0.1", + "@testing-library/jest-dom": "^6.6.3", "@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": "^5.0.4" + "vitest": "^4.1.4" } } diff --git a/examples/solid/search-validator-adapters/tests/arktype.test.tsx b/examples/solid/search-validator-adapters/tests/arktype.test.tsx index f22a359995..4ec555fc7b 100644 --- a/examples/solid/search-validator-adapters/tests/arktype.test.tsx +++ b/examples/solid/search-validator-adapters/tests/arktype.test.tsx @@ -8,6 +8,7 @@ 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 deleted file mode 100644 index 8f7cbf15be..0000000000 --- a/examples/solid/search-validator-adapters/tests/jest-dom.setup.ts +++ /dev/null @@ -1,18 +0,0 @@ -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 8594c1cb29..cd4545397c 100644 --- a/examples/solid/search-validator-adapters/tests/valibot.test.tsx +++ b/examples/solid/search-validator-adapters/tests/valibot.test.tsx @@ -8,6 +8,7 @@ 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 4e05d81e75..5b9dbebfef 100644 --- a/examples/solid/search-validator-adapters/vite.config.ts +++ b/examples/solid/search-validator-adapters/vite.config.ts @@ -11,7 +11,6 @@ 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 313c930051..90cba4aac1 100644 --- a/examples/solid/start-basic-auth/README.md +++ b/examples/solid/start-basic-auth/README.md @@ -70,13 +70,3 @@ 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 d686fdf616..f8b1752ce9 100644 --- a/examples/solid/start-basic-auth/package.json +++ b/examples/solid/start-basic-auth/package.json @@ -14,10 +14,9 @@ "@libsql/client": "^0.15.15", "@prisma/adapter-libsql": "^7.0.0", "@prisma/client": "^7.0.0", - "@tanstack/solid-router": "^1.170.43", - "@tanstack/solid-router-devtools": "^1.167.3", - "@tanstack/solid-start": "^1.169.6", - "iron-session": "^9.0.1", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-start": "^1.168.48", "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 05ad0d298a..3aa0bfa18b 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 { getAppSession } from '~/utils/session.js' +import { useAppSession } 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 getAppSession() + const session = await useAppSession() - if (!session.userEmail) { + if (!session.data.userEmail) { return null } return { - email: session.userEmail, + email: session.data.userEmail, } }) diff --git a/examples/solid/start-basic-auth/src/routes/_authed.tsx b/examples/solid/start-basic-auth/src/routes/_authed.tsx index cded7ca880..60ad613e56 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 { getAppSession } from '~/utils/session' +import { useAppSession } from '~/utils/session' export const loginFn = createServerFn({ method: 'POST' }) .validator((d: { email: string; password: string }) => d) @@ -33,10 +33,13 @@ export const loginFn = createServerFn({ method: 'POST' }) } } + // Create a session + const session = await useAppSession() + // Store the user's email in the session - const session = await getAppSession() - session.userEmail = user.email - await session.save() + await session.update({ + userEmail: user.email, + }) }) 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 56cd70cbc2..f7d624ff15 100644 --- a/examples/solid/start-basic-auth/src/routes/logout.tsx +++ b/examples/solid/start-basic-auth/src/routes/logout.tsx @@ -1,10 +1,11 @@ import { createFileRoute, redirect } from '@tanstack/solid-router' import { createServerFn } from '@tanstack/solid-start' -import { getAppSession } from '~/utils/session' +import { useAppSession } from '~/utils/session' const logoutFn = createServerFn().handler(async () => { - const session = await getAppSession() - session.destroy() + const session = await useAppSession() + + session.clear() 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 b8d6bf89fa..7cb9ae7161 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 { getAppSession } from '~/utils/session' +import { useAppSession } from '~/utils/session' export const signupFn = createServerFn({ method: 'POST' }) .validator( @@ -20,6 +20,9 @@ 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 { @@ -30,9 +33,9 @@ export const signupFn = createServerFn({ method: 'POST' }) } // Store the user's email in the session - const session = await getAppSession() - session.userEmail = found.email - await session.save() + await session.update({ + userEmail: found.email, + }) // Redirect to the prev page stored in the "redirect" search param throw redirect({ @@ -49,9 +52,9 @@ export const signupFn = createServerFn({ method: 'POST' }) }) // Store the user's email in the session - const session = await getAppSession() - session.userEmail = user.email - await session.save() + await session.update({ + userEmail: user.email, + }) // 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 4577764d28..120a410b60 100644 --- a/examples/solid/start-basic-auth/src/utils/session.ts +++ b/examples/solid/start-basic-auth/src/utils/session.ts @@ -1,29 +1,13 @@ -import { getIronSession } from 'iron-session' -import { getCookie, setCookie } from '@tanstack/solid-start/server' +// src/services/session.server.ts +import { useSession } from '@tanstack/solid-start/server' import type { User } from '@prisma/client' type SessionUser = { userEmail: User['email'] } -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: '/', - }, - }, - ) +export function useAppSession() { + return useSession({ + password: 'ChangeThisBeforeShippingToProdOrYouWillBeFired', + }) } diff --git a/examples/solid/start-basic-authjs/package.json b/examples/solid/start-basic-authjs/package.json index 2c910663bd..c0ef48cff2 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", - "@tanstack/solid-start": "^1.169.6", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-start": "^1.168.48", "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 7ece143f61..6dbc51eedd 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", - "@tanstack/solid-start": "^1.169.6", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-start": "^1.168.48", "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 69299cdb79..1c82088910 100644 --- a/examples/solid/start-basic-netlify/package.json +++ b/examples/solid/start-basic-netlify/package.json @@ -9,13 +9,13 @@ "preview": "vite preview" }, "dependencies": { - "@tanstack/solid-router": "^1.170.43", - "@tanstack/solid-router-devtools": "^1.167.3", - "@tanstack/solid-start": "^1.169.6", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-start": "^1.168.48", "solid-js": "^1.9.10" }, "devDependencies": { - "@netlify/vite-plugin-tanstack-start": "^1.3.19", + "@netlify/vite-plugin-tanstack-start": "^1.1.4", "@tailwindcss/vite": "^4.2.2", "@types/node": "^22.5.4", "tailwindcss": "^4.2.2", diff --git a/examples/solid/start-basic-nitro/package.json b/examples/solid/start-basic-nitro/package.json index 2c0dc7dad6..349cc87875 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", - "@tanstack/solid-start": "^1.169.6", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-start": "^1.168.48", "solid-js": "^1.9.10" }, "devDependencies": { "@tailwindcss/vite": "^4.2.2", "@types/node": "^22.5.4", - "nitro": "^3.0.260903-beta", + "nitro": "^3.0.260311-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 ddbb7d8764..bf21fa759c 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", - "@tanstack/solid-router-ssr-query": "^1.167.3", - "@tanstack/solid-start": "^1.169.6", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-router-ssr-query": "^1.167.2", + "@tanstack/solid-start": "^1.168.48", "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 8b639da68a..7dc54d029b 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", - "@tanstack/solid-start": "^1.169.6", - "@tanstack/start-static-server-functions": "^1.167.44", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-start": "^1.168.48", + "@tanstack/start-static-server-functions": "^1.167.33", "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 758815b669..d9e9d5be64 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", - "@tanstack/solid-start": "^1.169.6", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-start": "^1.168.48", "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.260903-beta", + "nitro": "^3.0.260311-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 d1ad9a9563..cea4cec6db 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", - "@tanstack/solid-router-ssr-query": "^1.167.3", - "@tanstack/solid-start": "^1.169.6", - "@tanstack/router-plugin": "^1.169.0", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-router-ssr-query": "^1.167.2", + "@tanstack/solid-start": "^1.168.48", + "@tanstack/router-plugin": "^1.168.36", "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": "^5.0.4", + "vitest": "^4.1.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 ea13a1c1e3..c163519da0 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", - "@tanstack/solid-start": "^1.169.6", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-start": "^1.168.48", "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 8b49c516bd..847cb5193b 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", - "@tanstack/solid-start": "^1.169.6", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-start": "^1.168.48", "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 076c9b41dc..b4d8be7e18 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", - "@tanstack/solid-start": "^1.169.6", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-start": "^1.168.48", "solid-js": "^1.9.10" }, "devDependencies": { @@ -24,16 +24,5 @@ "@tailwindcss/vite": "^4.2.2", "tailwindcss": "^4.2.2", "@inlang/paraglide-js": "^2.4.0" - }, - "nx": { - "targets": { - "build": { - "outputs": [ - "...", - "{projectRoot}/src/paraglide", - "{projectRoot}/project.inlang/cache" - ] - } - } } } diff --git a/examples/solid/start-large/package.json b/examples/solid/start-large/package.json index 83f3589cc2..c906558645 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", - "@tanstack/solid-start": "^1.169.6", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-start": "^1.168.48", "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 83e0719b39..e3a5fbfea5 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", - "@tanstack/solid-start": "^1.169.6", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-start": "^1.168.48", "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 81ab5cd63c..bdc5ea3413 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", - "@tanstack/solid-start": "^1.169.6", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-start": "^1.168.48", "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 94db6ac790..2e6b6aea7d 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", - "@tanstack/solid-start": "^1.169.6", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", + "@tanstack/solid-start": "^1.168.48", "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 2acb2432bf..cc53c28e1b 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.169.0", - "@tanstack/solid-router": "^1.170.43", - "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.168.36", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", "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 449d8a3927..7fd745cdb4 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.43", - "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", "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 46d33436db..08afa6f8aa 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.169.0", - "@tanstack/solid-router": "^1.170.43", - "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.168.36", + "@tanstack/solid-router": "^1.170.31", + "@tanstack/solid-router-devtools": "^1.167.1", "@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 9cc36a6991..92acade7ff 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.169.0", - "@tanstack/vue-router": "^1.170.42", - "@tanstack/vue-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.168.36", + "@tanstack/vue-router": "^1.170.30", + "@tanstack/vue-router-devtools": "^1.167.1", "redaxios": "^0.5.1", "tailwindcss": "^4.2.2", "vue": "^3.5.16", diff --git a/examples/vue/basic-file-based-jsx/src/posts.tsx b/examples/vue/basic-file-based-jsx/src/posts.tsx index f7a1941605..1b4c92b41d 100644 --- a/examples/vue/basic-file-based-jsx/src/posts.tsx +++ b/examples/vue/basic-file-based-jsx/src/posts.tsx @@ -7,7 +7,11 @@ export type PostType = { body: string } -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) 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 5922c5f7b1..3922025c82 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-jsx/src/routes/(another-group)/onlyrouteinside.tsx b/examples/vue/basic-file-based-jsx/src/routes/(another-group)/onlyrouteinside.tsx index e475111e40..727c1b4d94 100644 --- a/examples/vue/basic-file-based-jsx/src/routes/(another-group)/onlyrouteinside.tsx +++ b/examples/vue/basic-file-based-jsx/src/routes/(another-group)/onlyrouteinside.tsx @@ -1,32 +1,27 @@ import { createFileRoute, getRouteApi, useSearch } from '@tanstack/vue-router' -import { defineComponent } from 'vue' import { z } from 'zod' -const OnlyRouteInsideComponent = defineComponent({ - setup() { - const searchViaHook = useSearch({ - from: '/(another-group)/onlyrouteinside', - }) - const searchViaRouteHook = routeApi.useSearch() - const searchViaRouteApi = routeApi.useSearch() - - return () => ( -
-
{searchViaHook.value.hello}
-
- {searchViaRouteHook.value.hello} -
-
- {searchViaRouteApi.value.hello} -
-
- ) - }, -}) - export const Route = createFileRoute('/(another-group)/onlyrouteinside')({ validateSearch: z.object({ hello: z.string().optional() }), component: OnlyRouteInsideComponent, }) const routeApi = getRouteApi('/(another-group)/onlyrouteinside') + +function OnlyRouteInsideComponent() { + const searchViaHook = useSearch({ from: '/(another-group)/onlyrouteinside' }) + const searchViaRouteHook = routeApi.useSearch() + const searchViaRouteApi = routeApi.useSearch() + + return ( +
+
{searchViaHook.value.hello}
+
+ {searchViaRouteHook.value.hello} +
+
+ {searchViaRouteApi.value.hello} +
+
+ ) +} diff --git a/examples/vue/basic-file-based-jsx/src/routes/(group)/_layout.insidelayout.tsx b/examples/vue/basic-file-based-jsx/src/routes/(group)/_layout.insidelayout.tsx index 869e536811..4b239f3ef4 100644 --- a/examples/vue/basic-file-based-jsx/src/routes/(group)/_layout.insidelayout.tsx +++ b/examples/vue/basic-file-based-jsx/src/routes/(group)/_layout.insidelayout.tsx @@ -1,30 +1,27 @@ import { createFileRoute, getRouteApi, useSearch } from '@tanstack/vue-router' -import { defineComponent } from 'vue' import { z } from 'zod' -const InsideLayoutComponent = defineComponent({ - setup() { - const searchViaHook = useSearch({ from: '/(group)/_layout/insidelayout' }) - const searchViaRouteHook = routeApi.useSearch() - const searchViaRouteApi = routeApi.useSearch() - - return () => ( -
-
{searchViaHook.value.hello}
-
- {searchViaRouteHook.value.hello} -
-
- {searchViaRouteApi.value.hello} -
-
- ) - }, -}) - export const Route = createFileRoute('/(group)/_layout/insidelayout')({ validateSearch: z.object({ hello: z.string().optional() }), component: InsideLayoutComponent, }) const routeApi = getRouteApi('/(group)/_layout/insidelayout') + +function InsideLayoutComponent() { + const searchViaHook = useSearch({ from: '/(group)/_layout/insidelayout' }) + const searchViaRouteHook = routeApi.useSearch() + const searchViaRouteApi = routeApi.useSearch() + + return ( +
+
{searchViaHook.value.hello}
+
+ {searchViaRouteHook.value.hello} +
+
+ {searchViaRouteApi.value.hello} +
+
+ ) +} diff --git a/examples/vue/basic-file-based-jsx/src/routes/(group)/inside.tsx b/examples/vue/basic-file-based-jsx/src/routes/(group)/inside.tsx index 4a0caa8f8d..f12ca517d3 100644 --- a/examples/vue/basic-file-based-jsx/src/routes/(group)/inside.tsx +++ b/examples/vue/basic-file-based-jsx/src/routes/(group)/inside.tsx @@ -1,30 +1,27 @@ import { createFileRoute, getRouteApi, useSearch } from '@tanstack/vue-router' -import { defineComponent } from 'vue' import { z } from 'zod' -const InsideComponent = defineComponent({ - setup() { - const searchViaHook = useSearch({ from: '/(group)/inside' }) - const searchViaRouteHook = routeApi.useSearch() - const searchViaRouteApi = routeApi.useSearch() - - return () => ( -
-
{searchViaHook.value.hello}
-
- {searchViaRouteHook.value.hello} -
-
- {searchViaRouteApi.value.hello} -
-
- ) - }, -}) - export const Route = createFileRoute('/(group)/inside')({ validateSearch: z.object({ hello: z.string().optional() }), component: InsideComponent, }) const routeApi = getRouteApi('/(group)/inside') + +function InsideComponent() { + const searchViaHook = useSearch({ from: '/(group)/inside' }) + const searchViaRouteHook = routeApi.useSearch() + const searchViaRouteApi = routeApi.useSearch() + + return ( +
+
{searchViaHook.value.hello}
+
+ {searchViaRouteHook.value.hello} +
+
+ {searchViaRouteApi.value.hello} +
+
+ ) +} diff --git a/examples/vue/basic-file-based-jsx/src/routes/(group)/lazyinside.tsx b/examples/vue/basic-file-based-jsx/src/routes/(group)/lazyinside.tsx index fdae632aee..05b34eb201 100644 --- a/examples/vue/basic-file-based-jsx/src/routes/(group)/lazyinside.tsx +++ b/examples/vue/basic-file-based-jsx/src/routes/(group)/lazyinside.tsx @@ -1,30 +1,27 @@ import { createFileRoute, getRouteApi, useSearch } from '@tanstack/vue-router' -import { defineComponent } from 'vue' import { z } from 'zod' -const LazyInsideComponent = defineComponent({ - setup() { - const searchViaHook = useSearch({ from: '/(group)/lazyinside' }) - const searchViaRouteHook = routeApi.useSearch() - const searchViaRouteApi = routeApi.useSearch() - - return () => ( -
-
{searchViaHook.value.hello}
-
- {searchViaRouteHook.value.hello} -
-
- {searchViaRouteApi.value.hello} -
-
- ) - }, -}) - export const Route = createFileRoute('/(group)/lazyinside')({ validateSearch: z.object({ hello: z.string().optional() }), component: LazyInsideComponent, }) const routeApi = getRouteApi('/(group)/lazyinside') + +function LazyInsideComponent() { + const searchViaHook = useSearch({ from: '/(group)/lazyinside' }) + const searchViaRouteHook = routeApi.useSearch() + const searchViaRouteApi = routeApi.useSearch() + + return ( +
+
{searchViaHook.value.hello}
+
+ {searchViaRouteHook.value.hello} +
+
+ {searchViaRouteApi.value.hello} +
+
+ ) +} diff --git a/examples/vue/basic-file-based-jsx/src/routes/(group)/subfolder/inside.tsx b/examples/vue/basic-file-based-jsx/src/routes/(group)/subfolder/inside.tsx index 8c7222ee70..317c766186 100644 --- a/examples/vue/basic-file-based-jsx/src/routes/(group)/subfolder/inside.tsx +++ b/examples/vue/basic-file-based-jsx/src/routes/(group)/subfolder/inside.tsx @@ -1,30 +1,27 @@ import { createFileRoute, getRouteApi, useSearch } from '@tanstack/vue-router' -import { defineComponent } from 'vue' import { z } from 'zod' -const SubfolderInsideComponent = defineComponent({ - setup() { - const searchViaHook = useSearch({ from: '/(group)/subfolder/inside' }) - const searchViaRouteHook = routeApi.useSearch() - const searchViaRouteApi = routeApi.useSearch() - - return () => ( -
-
{searchViaHook.value.hello}
-
- {searchViaRouteHook.value.hello} -
-
- {searchViaRouteApi.value.hello} -
-
- ) - }, -}) - export const Route = createFileRoute('/(group)/subfolder/inside')({ validateSearch: z.object({ hello: z.string().optional() }), component: SubfolderInsideComponent, }) const routeApi = getRouteApi('/(group)/subfolder/inside') + +function SubfolderInsideComponent() { + const searchViaHook = useSearch({ from: '/(group)/subfolder/inside' }) + const searchViaRouteHook = routeApi.useSearch() + const searchViaRouteApi = routeApi.useSearch() + + return ( +
+
{searchViaHook.value.hello}
+
+ {searchViaRouteHook.value.hello} +
+
+ {searchViaRouteApi.value.hello} +
+
+ ) +} diff --git a/examples/vue/basic-file-based-jsx/src/routes/__root.tsx b/examples/vue/basic-file-based-jsx/src/routes/__root.tsx index adcc3acbd7..59c9e6fa48 100644 --- a/examples/vue/basic-file-based-jsx/src/routes/__root.tsx +++ b/examples/vue/basic-file-based-jsx/src/routes/__root.tsx @@ -8,100 +8,97 @@ import { useRouterState, } from '@tanstack/vue-router' import { TanStackRouterDevtools } from '@tanstack/vue-router-devtools' -import { defineComponent } from 'vue' import NotFoundComponent from '../components/NotFoundComponent.vue' -const RootComponent = defineComponent({ - setup() { - const router = useRouter() - const canGoBack = useCanGoBack() - // test useRouterState doesn't crash client side navigation - const _state = useRouterState() - - return () => ( - <> - -
- - - Home - - - Posts - - - Layout - - - Only Route Inside Group - - - Inside Group - - - Inside Subfolder Inside Group - - - Inside Group Inside Layout - - - Lazy Inside Group - - - unicode path - - - This Route Does Not Exist - -
-
- - - - ) - }, -}) - export const Route = createRootRoute({ component: RootComponent, notFoundComponent: NotFoundComponent, }) + +function RootComponent() { + const router = useRouter() + const canGoBack = useCanGoBack() + // test useRouterState doesn't crash client side navigation + const _state = useRouterState() + + return ( + <> + +
+ + + Home + + + Posts + + + Layout + + + Only Route Inside Group + + + Inside Group + + + Inside Subfolder Inside Group + + + Inside Group Inside Layout + + + Lazy Inside Group + + + unicode path + + + This Route Does Not Exist + +
+
+ + + + ) +} diff --git a/examples/vue/basic-file-based-jsx/src/routes/posts.$postId.tsx b/examples/vue/basic-file-based-jsx/src/routes/posts.$postId.tsx index bc1dbfbbd0..15d17387c8 100644 --- a/examples/vue/basic-file-based-jsx/src/routes/posts.$postId.tsx +++ b/examples/vue/basic-file-based-jsx/src/routes/posts.$postId.tsx @@ -1,27 +1,24 @@ import { createFileRoute } from '@tanstack/vue-router' -import { defineComponent } from 'vue' import PostErrorComponent from '../components/PostErrorComponent.vue' import { fetchPost } from '../posts' import type { PostType } from '../posts' -const PostComponent = defineComponent({ - setup() { - const post = Route.useLoaderData() - - return () => ( -
-

- {(post.value as PostType).title} -

-
{(post.value as PostType).body}
-
- ) - }, -}) - export const Route = createFileRoute('/posts/$postId')({ loader: async ({ params: { postId } }) => fetchPost(postId), component: PostComponent, errorComponent: PostErrorComponent, notFoundComponent: () =>

Post not found

, }) + +function PostComponent() { + const post = Route.useLoaderData() + + return ( +
+

+ {(post.value as PostType).title} +

+
{(post.value as PostType).body}
+
+ ) +} diff --git a/examples/vue/basic-file-based-jsx/src/routes/posts.tsx b/examples/vue/basic-file-based-jsx/src/routes/posts.tsx index 522988e52b..ae580dfc02 100644 --- a/examples/vue/basic-file-based-jsx/src/routes/posts.tsx +++ b/examples/vue/basic-file-based-jsx/src/routes/posts.tsx @@ -1,38 +1,7 @@ import { Link, Outlet, createFileRoute } from '@tanstack/vue-router' -import { defineComponent } from 'vue' import { fetchPosts } from '../posts' import type { PostType } from '../posts' -const PostsComponent = defineComponent({ - setup() { - const posts = Route.useLoaderData() - - return () => ( -
-
    - {[ - ...(posts.value as Array), - { id: 'i-do-not-exist', title: 'Non-existent Post' }, - ].map((post) => ( -
  • - -
    {post.title.substring(0, 20)}
    - -
  • - ))} -
-
- -
- ) - }, -}) - export const Route = createFileRoute('/posts')({ head: () => ({ meta: [ @@ -44,3 +13,31 @@ export const Route = createFileRoute('/posts')({ loader: fetchPosts, component: PostsComponent, }) + +function PostsComponent() { + const posts = Route.useLoaderData() + + return ( +
+
    + {[ + ...(posts.value as Array), + { id: 'i-do-not-exist', title: 'Non-existent Post' }, + ].map((post) => ( +
  • + +
    {post.title.substring(0, 20)}
    + +
  • + ))} +
+
+ +
+ ) +} diff --git a/examples/vue/basic-file-based-jsx/src/routes/posts_.$postId.edit.tsx b/examples/vue/basic-file-based-jsx/src/routes/posts_.$postId.edit.tsx index ad20bcdf97..57963c6b64 100644 --- a/examples/vue/basic-file-based-jsx/src/routes/posts_.$postId.edit.tsx +++ b/examples/vue/basic-file-based-jsx/src/routes/posts_.$postId.edit.tsx @@ -1,28 +1,23 @@ import { createFileRoute, getRouteApi, useParams } from '@tanstack/vue-router' -import { defineComponent } from 'vue' - -const PostEditComponent = defineComponent({ - setup() { - const paramsViaApi = api.useParams() - const paramsViaHook = useParams({ from: '/posts_/$postId/edit' }) - const paramsViaRouteHook = api.useParams() - - return () => ( -
-
{paramsViaHook.value.postId}
-
- {paramsViaRouteHook.value.postId} -
-
- {paramsViaApi.value.postId} -
-
- ) - }, -}) export const Route = createFileRoute('/posts_/$postId/edit')({ component: PostEditComponent, }) const api = getRouteApi('/posts_/$postId/edit') + +function PostEditComponent() { + const paramsViaApi = api.useParams() + const paramsViaHook = useParams({ from: '/posts_/$postId/edit' }) + const paramsViaRouteHook = api.useParams() + + return ( +
+
{paramsViaHook.value.postId}
+
+ {paramsViaRouteHook.value.postId} +
+
{paramsViaApi.value.postId}
+
+ ) +} diff --git a/examples/vue/basic-file-based-sfc/package.json b/examples/vue/basic-file-based-sfc/package.json index 87ab2c332b..d0e936155d 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.169.0", - "@tanstack/vue-router": "^1.170.42", - "@tanstack/vue-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.168.36", + "@tanstack/vue-router": "^1.170.30", + "@tanstack/vue-router-devtools": "^1.167.1", "redaxios": "^0.5.1", "tailwindcss": "^4.2.2", "vue": "^3.5.16", diff --git a/examples/vue/basic-file-based-sfc/src/posts.ts b/examples/vue/basic-file-based-sfc/src/posts.ts index f7a1941605..1b4c92b41d 100644 --- a/examples/vue/basic-file-based-sfc/src/posts.ts +++ b/examples/vue/basic-file-based-sfc/src/posts.ts @@ -7,7 +7,11 @@ export type PostType = { body: string } -const queryURL = 'https://jsonplaceholder.typicode.com' +let queryURL = 'https://jsonplaceholder.typicode.com' + +if (import.meta.env.VITE_NODE_ENV === 'test') { + queryURL = `http://localhost:${import.meta.env.VITE_EXTERNAL_PORT}` +} export const fetchPost = async (postId: string) => { console.info(`Fetching post with id ${postId}...`) 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 0bfdddab3d..09d62b0706 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 af74afff3a..7164ea907f 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.42", - "@tanstack/vue-router-devtools": "^1.167.3", + "@tanstack/vue-router": "^1.170.30", + "@tanstack/vue-router-devtools": "^1.167.1", "redaxios": "^0.5.1", "vue": "^3.5.13", "tailwindcss": "4.1.18" diff --git a/examples/vue/basic/src/main.tsx b/examples/vue/basic/src/main.tsx index 09878913a8..dc12871db0 100644 --- a/examples/vue/basic/src/main.tsx +++ b/examples/vue/basic/src/main.tsx @@ -1,4 +1,4 @@ -import { createApp, defineComponent } from 'vue' +import { createApp } from 'vue' import { ErrorComponent, Link, @@ -102,20 +102,6 @@ function PostsIndexComponent() { return
Select a post.
} -const PostComponent = defineComponent({ - setup() { - const post = postRoute.useLoaderData() - - return () => ( -
-

{post.value.title}

-
-
{post.value.body}
-
- ) - }, -}) - const postRoute = createRoute({ getParentRoute: () => postsLayoutRoute, path: '$postId', @@ -132,6 +118,18 @@ function PostErrorComponent({ error }: ErrorComponentProps) { return } +function PostComponent() { + const post = postRoute.useLoaderData() + + return ( +
+

{post.value.title}

+
+
{post.value.body}
+
+ ) +} + const pathlessLayoutRoute = createRoute({ getParentRoute: () => rootRoute, id: '_pathlessLayout', diff --git a/examples/vue/basic/src/posts.lazy.tsx b/examples/vue/basic/src/posts.lazy.tsx index 8602de045f..1fd64723e5 100644 --- a/examples/vue/basic/src/posts.lazy.tsx +++ b/examples/vue/basic/src/posts.lazy.tsx @@ -1,39 +1,36 @@ import { Link, Outlet, createLazyRoute } from '@tanstack/vue-router' -import { defineComponent } from 'vue' - -const PostsLayoutComponent = defineComponent({ - setup() { - const posts = Route.useLoaderData() - - return () => ( -
-
    - {[ - ...posts.value, - { id: 'i-do-not-exist', title: 'Non-existent Post' }, - ].map((post) => { - return ( -
  • - -
    {post.title.substring(0, 20)}
    - -
  • - ) - })} -
- -
- ) - }, -}) export const Route = createLazyRoute('/posts')({ component: PostsLayoutComponent, }) + +function PostsLayoutComponent() { + const posts = Route.useLoaderData() + + return ( +
+
    + {[ + ...posts.value, + { id: 'i-do-not-exist', title: 'Non-existent Post' }, + ].map((post) => { + return ( +
  • + +
    {post.title.substring(0, 20)}
    + +
  • + ) + })} +
+ +
+ ) +} diff --git a/labeler-config.yml b/labeler-config.yml index 9da92bf7ff..c1ad49328e 100644 --- a/labeler-config.yml +++ b/labeler-config.yml @@ -10,6 +10,9 @@ '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 b7df8b2c09..e521988aec 100644 --- a/nx.json +++ b/nx.json @@ -1,7 +1,6 @@ { "$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, @@ -11,10 +10,7 @@ "namedInputs": { "sharedGlobals": [ "{workspaceRoot}/.npmrc", - "{workspaceRoot}/nx.json", - "{workspaceRoot}/.github/workflows/pr.yml", - "{workspaceRoot}/.nx/ci-config.yaml", - "{workspaceRoot}/.nx/workflows/ultracache-config.yaml", + "{workspaceRoot}/.nx/workflows/sandboxing-config.yaml", "{workspaceRoot}/.nvmrc", "{workspaceRoot}/package.json", "{workspaceRoot}/tsconfig.json" @@ -25,11 +21,6 @@ "transitive": true } ], - "streamingSsrTests": [ - "{workspaceRoot}/e2e/streaming-ssr-assertions.ts", - "{workspaceRoot}/e2e/streaming-ssr-fixtures/**/*", - "{workspaceRoot}/e2e/streaming-ssr-specs/**/*" - ], "default": [ "sharedGlobals", "{projectRoot}/**/*", @@ -45,7 +36,7 @@ "targetDefaults": { "test:docs": { "cache": true, - "inputs": ["sharedGlobals", "{workspaceRoot}/docs/**/*"] + "inputs": ["{workspaceRoot}/docs/**/*"] }, "test:eslint": { "cache": true, @@ -71,27 +62,27 @@ "test:e2e": { "cache": true, "dependsOn": ["^build", "test:e2e--*"], - "inputs": ["buildProduction", "^production", "dependentTaskOutputs"], - "outputs": ["{projectRoot}/dist", "{projectRoot}/test-results"], - "parallelism": false + "inputs": ["default", "^production", "dependentTaskOutputs"], + "outputs": [ + "{projectRoot}/dist", + "{projectRoot}/port-*.txt", + "{projectRoot}/test-results" + ] }, "test:e2e:nitro": { "cache": true, "dependsOn": ["^build"], - "inputs": ["default", "^production"], - "parallelism": false + "inputs": ["default", "^production"] }, "test:e2e:basepath": { "cache": true, "dependsOn": ["^build"], - "inputs": ["default", "^production"], - "parallelism": false + "inputs": ["default", "^production"] }, "test:e2e:preview": { "cache": true, "dependsOn": ["^build"], - "inputs": ["default", "^production"], - "parallelism": false + "inputs": ["default", "^production"] }, "test:types": { "cache": true, @@ -103,21 +94,6 @@ "dependentTaskOutputs" ] }, - "test:types:client": { - "cache": true, - "inputs": [ - "default", - "^production", - "{workspaceRoot}/benchmarks/client-nav/*.{ts,json}", - "{workspaceRoot}/benchmarks/client-nav/scenarios/*.ts", - "{workspaceRoot}/benchmarks/client-nav/scenarios/*/*.ts", - "{workspaceRoot}/benchmarks/memory/*.ts", - "{workspaceRoot}/benchmarks/memory/client/*.{ts,json}", - "{workspaceRoot}/benchmarks/memory/client/scenarios/*/*.ts", - "{workspaceRoot}/benchmarks/cpu-simulation.ts", - "dependentTaskOutputs" - ] - }, "test:types:ssr": { "cache": true, "dependsOn": ["^build", "build"], @@ -126,10 +102,6 @@ "^production", "{workspaceRoot}/benchmarks/ssr/bench-utils.ts", "{workspaceRoot}/benchmarks/cpu-simulation.ts", - "{workspaceRoot}/benchmarks/ssr/scenarios/*/*.ts", - "{workspaceRoot}/benchmarks/memory/*.ts", - "{workspaceRoot}/benchmarks/memory/server/*.ts", - "{workspaceRoot}/benchmarks/memory/server/scenarios/*/*.ts", "dependentTaskOutputs" ] }, @@ -149,9 +121,6 @@ "cache": true, "dependsOn": ["build"], "inputs": ["buildProduction", "dependentTaskOutputs"] - }, - "test:e2e*": { - "parallelism": false } }, "plugins": [ diff --git a/package.json b/package.json index 3ef11b1969..f31dcbc3a6 100644 --- a/package.json +++ b/package.json @@ -5,24 +5,24 @@ "type": "git", "url": "git+https://github.com/TanStack/router.git" }, - "packageManager": "pnpm@12.18.0", + "packageManager": "pnpm@11.21.0", "engines": { - "pnpm": ">=12.18.0" + "pnpm": ">=11.21.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: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: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: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", "test:build": "nx affected --target=test:build --exclude=examples/**", "test:types": "nx affected --target=test:types --exclude=examples/**", "test:e2e": "nx run-many --target=test:e2e", - "benchmark:bundle-size": "node scripts/benchmarks/bundle-size/build.mjs", + "benchmark:bundle-size": "nx run @benchmarks/bundle-size:build", "benchmark:bundle-size:run": "node scripts/benchmarks/bundle-size/run.mjs", "benchmark:bundle-size:query": "node scripts/benchmarks/bundle-size/query.mjs", "benchmark:bundle-size:diff": "node scripts/benchmarks/bundle-size/diff.mjs", @@ -65,7 +65,7 @@ "devDependencies": { "@changesets/changelog-github": "^0.7.0", "@changesets/cli": "^2.30.0", - "@nx/devkit": "24.0.0", + "@nx/devkit": "22.7.5", "@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": "24.0.0", + "nx": "22.7.5", "prettier": "^3.8.0", "tinyglobby": "^0.2.15", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/packages/AGENTS.md b/packages/AGENTS.md deleted file mode 100644 index 0c63c3a15c..0000000000 --- a/packages/AGENTS.md +++ /dev/null @@ -1,16 +0,0 @@ -# Packages - -- Route generation/code splitting live in `router-generator`/`router-plugin`; Start build transforms live in `start-plugin-core`. - -## Router bindings - -- Navigation/render identity is more than href or route membership: same-href navigations can have different history keys, and suspended renders must acknowledge only their own match publication. Preserve those identity checks when optimizing stores or render notifications. -- In navigation params/search, an explicit `undefined` can clear an inherited value; an absent key can inherit it. Preserve that distinction when comparing or memoizing options; React's `useValueStable` uses `deepEqual` with `ignoreUndefined: false`. - -## Tests - -- Inspect test commands: several `test:unit` scripts immediately exit or only echo a message. For these packages, validate behavior in the shared core or consuming e2e app; a successful placeholder target provides no unit coverage. -- For `*-router-ssr-query` changes, run `router-ssr-query-core` unit tests and the affected framework's `e2e/-start/query-integration` tests. The framework wrapper unit targets currently exit without running tests. -- For single-command Vitest targets, append filters after `--`, e.g. `-- tests/link.test.tsx -t "preloading"`. -- `solid-router` and `router-generator` chain two Vitest commands in `test:unit`. Trailing file/name/update arguments reach only the final command. Run the full target for verification: Solid needs browser and server suites; the generator needs fixture generation followed by typechecking. -- For public type changes, add `*.test-d.*` inference regressions and run both unit and type targets. React/Solid Router's TypeScript compiler matrix checks `src`; Vitest runs their inference tests. For changes to inference cost, follow the [type-safety performance guidance](../docs/router/guide/type-safety.md#performance-recommendations); `test:perf` measures runtime, not compiler cost. diff --git a/packages/arktype-adapter/tests/index.test.tsx b/packages/arktype-adapter/tests/index.test.tsx index ce6eb74756..a99ecda9c4 100644 --- a/packages/arktype-adapter/tests/index.test.tsx +++ b/packages/arktype-adapter/tests/index.test.tsx @@ -9,6 +9,7 @@ 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 deleted file mode 100644 index 8f7cbf15be..0000000000 --- a/packages/arktype-adapter/tests/jest-dom.setup.ts +++ /dev/null @@ -1,18 +0,0 @@ -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 8d553e0a59..8c8c0c519f 100644 --- a/packages/arktype-adapter/vite.config.ts +++ b/packages/arktype-adapter/vite.config.ts @@ -9,7 +9,6 @@ const config = defineConfig({ watch: false, environment: 'jsdom', typecheck: { enabled: true }, - setupFiles: ['./tests/jest-dom.setup.ts'], }, }) diff --git a/packages/eslint-plugin-router/package.json b/packages/eslint-plugin-router/package.json index 9be54c220e..3270c14221 100644 --- a/packages/eslint-plugin-router/package.json +++ b/packages/eslint-plugin-router/package.json @@ -67,15 +67,5 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0" - }, - "nx": { - "targets": { - "build": { - "inputs": [ - "...", - "{workspaceRoot}/eslint.config.js" - ] - } - } } } diff --git a/packages/eslint-plugin-start/package.json b/packages/eslint-plugin-start/package.json index 803264ed10..b90642f1c4 100644 --- a/packages/eslint-plugin-start/package.json +++ b/packages/eslint-plugin-start/package.json @@ -68,15 +68,5 @@ "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.7.0" - }, - "nx": { - "targets": { - "build": { - "inputs": [ - "...", - "{workspaceRoot}/eslint.config.js" - ] - } - } } } diff --git a/packages/history/AGENTS.md b/packages/history/AGENTS.md deleted file mode 100644 index 509da6a4ec..0000000000 --- a/packages/history/AGENTS.md +++ /dev/null @@ -1,3 +0,0 @@ -# History - -Accepted browser push/replace operations update the in-memory location immediately and batch native writes into a microtask. Preserve coalescing: the latest href/state wins, but any queued push wins over replaces. Use `history.flush()` when native browser state must be current; verify subsequent updates still flush afterward in `tests/createBrowserHistory.test.ts`. diff --git a/packages/history/CHANGELOG.md b/packages/history/CHANGELOG.md index ca3341088c..05d88c02bf 100644 --- a/packages/history/CHANGELOG.md +++ b/packages/history/CHANGELOG.md @@ -1,49 +1,5 @@ # @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 - -- [#8359](https://github.com/TanStack/router/pull/8359) [`8fff7fa`](https://github.com/TanStack/router/commit/8fff7fa1f2e6f061916b0bf5e0ec486b2e732f94) - Normalize memory history hrefs consistently with browser and server history, including protocol-relative paths and control characters. - -- [#8352](https://github.com/TanStack/router/pull/8352) [`f021f6d`](https://github.com/TanStack/router/commit/f021f6d1c6dce6c9b54d70766f1d636d8fd9e184) - Avoid temporary arrays when replacing forward memory-history entries. - -- [#8349](https://github.com/TanStack/router/pull/8349) [`ae68535`](https://github.com/TanStack/router/commit/ae68535929043607d4ee9438f8ae401f3a064862) - Avoid generating unused history keys for locations with existing state. - -- [#8354](https://github.com/TanStack/router/pull/8354) [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244) - Use lightweight request history for SSR and make server navigation a no-op. Use redirect() to issue HTTP redirects. Server hrefs use the same normalization as browser history to handle protocol-relative URLs and control characters. - -## 1.162.3 - -### Patch Changes - -- [#8308](https://github.com/TanStack/router/pull/8308) [`9c1871c`](https://github.com/TanStack/router/commit/9c1871ccc88bc1157186b8b460941a304ec740b8) - Validate navigation and redirect destinations, keep ambiguous relative URLs on the current origin, and constrain prerender requests and output paths. Prevent redirect headers from appearing in serialized server function response bodies. - - Preserve native form HTTP redirects, route error handling and masks for document redirects, and per-navigation destinations for shared loader redirects. Avoid redundant origin parsing and reduce link styling and server-rendering work. Configured origins must already be normalized. - - Keep blocked-link inactive props consistent during React hydration, honor explicit redirect Location headers before checking route options, and refresh Vue link state when destinations become internal. Reuse the protocol-relative URL check while parsing redirect schemes once. - - Reduce React link bundle size by sharing pathname comparisons, state-prop selection, and element creation. - - Share normalized pathname comparisons in Solid and Vue links to reduce bundle size. - -- [#8287](https://github.com/TanStack/router/pull/8287) [`0654c0a`](https://github.com/TanStack/router/commit/0654c0a1a427db24d9af13c1d6ad1217a588c0c9) - Use full-document navigation when an output rewrite produces a cross-origin destination, including the public URL of a route mask. - - Respect registered history blockers during document navigation, passing history locations and the requested push or replace action. - ## 1.162.2 ### Patch Changes diff --git a/packages/history/package.json b/packages/history/package.json index d09c710d2f..1cbdf3b9e0 100644 --- a/packages/history/package.json +++ b/packages/history/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/history", - "version": "1.162.5", + "version": "1.162.2", "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 d2f80581b9..b0e006c80d 100644 --- a/packages/history/src/index.ts +++ b/packages/history/src/index.ts @@ -156,21 +156,27 @@ export function createHistory(opts: { else location = opts.getLocation() } - 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') - ) { + 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) { for (const blocker of blockers) { - const nextLocation = parseHref(args.path, args.state) + const nextLocation = parseHref(actionInfo.path, actionInfo.state) const isBlocked = await blocker.blockerFn({ currentLocation: location, nextLocation, - action: args.type, + action: actionInfo.type, }) if (isBlocked) { opts.onBlocked?.() @@ -179,7 +185,7 @@ export function createHistory(opts: { } } - args.task() + task() } return { @@ -275,6 +281,9 @@ export function createHistory(opts: { } function assignKeyAndIndex(index: number, state: HistoryState | undefined) { + if (!state) { + state = {} + } const key = createRandomKey() return { ...state, @@ -540,7 +549,7 @@ export function createBrowserHistory(opts?: { } win.history.go(n) }, - createHref, + createHref: (href) => createHref(href), flush, destroy: () => { win.history.pushState = originalPushState @@ -607,17 +616,14 @@ export function createHashHistory(opts?: { window?: any }): RouterHistory { return createBrowserHistory({ window: win, parseLocation: () => { - // `#/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, - ) + 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) }, createHref: (href) => `${win.location.pathname}${win.location.search}#${href}`, @@ -657,13 +663,13 @@ export function createMemoryHistory( getLength: () => entries.length, pushState: (path, state) => { // Removes all subsequent entries after the current index to start a new branch - index = index < entries.length - 1 ? index + 1 : entries.length - states[index] = state - entries[index] = path if (index < entries.length - 1) { - entries.length = index + 1 - states.length = index + 1 + entries.splice(index + 1) + states.splice(index + 1) } + states.push(state) + entries.push(path) + index = Math.max(entries.length - 1, 0) }, replaceState: (path, state) => { states[index] = state @@ -678,64 +684,12 @@ export function createMemoryHistory( go: (n) => { index = Math.min(Math.max(index + n, 0), entries.length - 1) }, - createHref: normalizeHref, + createHref: (path) => path, getBlockers: _getBlockers, setBlockers: _setBlockers, }) } -const noop = () => {} - -class ServerHistory implements RouterHistory { - declare private _subscribers?: RouterHistory['subscribers'] - - constructor(public location: HistoryLocation) {} - - get length() { - return 1 - } - - // Preserve the history interface without allocating a Set for each request. - get subscribers() { - return (this._subscribers ??= new Set()) - } - - subscribe() { - return noop - } - - push() {} - replace() {} - go() {} - back() {} - forward() {} - - canGoBack() { - return false - } - - createHref(href: string) { - return normalizeHref(href) - } - - block() { - return noop - } - - flush() {} - destroy() {} - notify() {} - - _getBlockers(): Array { - return [] - } -} - -/** A fixed request location; server navigation is a no-op. */ -export function createServerHistory(href: string): RouterHistory { - return new ServerHistory(parseHref(href, undefined)) -} - export function parseHref( href: string, state: ParsedHistoryState | undefined, @@ -743,24 +697,22 @@ export function parseHref( const sanitizedHref = normalizeHref(href) const hashIndex = sanitizedHref.indexOf('#') const searchIndex = sanitizedHref.indexOf('?') - if (!state) { - const key = createRandomKey() - state = { [stateIndexKey]: 0, key, __TSR_key: key } - } + + const addedKey = createRandomKey() return { href: sanitizedHref, - pathname: sanitizedHref.slice( + pathname: sanitizedHref.substring( 0, - hashIndex > -1 - ? searchIndex > -1 + hashIndex > 0 + ? searchIndex > 0 ? Math.min(hashIndex, searchIndex) : hashIndex - : searchIndex > -1 + : searchIndex > 0 ? searchIndex : sanitizedHref.length, ), - hash: hashIndex > -1 ? sanitizedHref.slice(hashIndex) : '', + hash: hashIndex > -1 ? sanitizedHref.substring(hashIndex) : '', search: searchIndex > -1 ? sanitizedHref.slice( @@ -768,11 +720,11 @@ export function parseHref( hashIndex === -1 ? undefined : hashIndex, ) : '', - state, + state: state || { [stateIndexKey]: 0, key: addedKey, __TSR_key: addedKey }, } } // Thanks co-pilot! function createRandomKey() { - return (Math.random() + 1).toString(36).slice(7) + return (Math.random() + 1).toString(36).substring(7) } diff --git a/packages/history/tests/createHashHistory.test.ts b/packages/history/tests/createHashHistory.test.ts index e54b1a1ae1..621cefe156 100644 --- a/packages/history/tests/createHashHistory.test.ts +++ b/packages/history/tests/createHashHistory.test.ts @@ -25,32 +25,6 @@ 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 = { @@ -85,78 +59,6 @@ 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/createMemoryHistory.test.ts b/packages/history/tests/createMemoryHistory.test.ts index c0f565115e..11a0c269b3 100644 --- a/packages/history/tests/createMemoryHistory.test.ts +++ b/packages/history/tests/createMemoryHistory.test.ts @@ -2,35 +2,6 @@ import { describe, expect, test, vi } from 'vitest' import { createMemoryHistory } from '../src' describe('createMemoryHistory', () => { - test.each([ - ['//example.com/path', '/example.com/path'], - ['/\\example.com/path', '/example.com/path'], - ['\\/example.com/path', '/example.com/path'], - ['\\\\example.com/path', '/example.com/path'], - [' \t/\r\\example.com/path', '/example.com/path'], - ['/\t/example.com/path', '/example.com/path'], - ['/a\tb?q=a\nb#section\r', '/ab?q=ab#section'], - ['/a\u0000b?q=a\u0001b#section\u007f', '/a%00b?q=a%01b#section%7F'], - ['/', '/'], - ['/posts/123?sort=new#comments', '/posts/123?sort=new#comments'], - ['/caf%C3%A9?q=%2F#//section', '/caf%C3%A9?q=%2F#//section'], - ['/a//b?q=//value#\\/section', '/a//b?q=//value#\\/section'], - ['/%2Fexample.com/path', '/%2Fexample.com/path'], - ])('creates href %j consistent with navigation', (href, expected) => { - const history = createMemoryHistory() - const location = history.location - const createdHref = history.createHref(href) - - expect(createdHref).toBe(expected) - expect(history.location).toBe(location) - expect(new URL(createdHref, 'https://app.example').origin).toBe( - 'https://app.example', - ) - - history.push(href) - expect(history.location.href).toBe(createdHref) - }) - test('exposes the current blocker registry after registration and removal', () => { const history = createMemoryHistory() const first = { blockerFn: vi.fn(() => true) } @@ -99,38 +70,6 @@ describe('createMemoryHistory', () => { expect(history.location.pathname).toBe('/b') }) - test('discards forward entries and their state when pushing a new branch', () => { - const initialEntries = ['/'] - const history = createMemoryHistory({ initialEntries }) - history.push('/kept', { marker: 'kept' }) - const keptState = history.location.state - history.push('/discarded-first', { marker: 'discarded-first' }) - history.push('/discarded-last', { marker: 'discarded-last' }) - history.go(-2) - history.push('/new', { marker: 'new' }) - - expect(initialEntries).toEqual(['/', '/kept', '/new']) - expect(history.length).toBe(3) - expect(history.location.pathname).toBe('/new') - expect(history.location.state).toMatchObject({ - __TSR_index: 2, - marker: 'new', - }) - const newState = history.location.state - - history.forward() - expect(history.location.pathname).toBe('/new') - expect(history.location.state).toBe(newState) - - history.back() - expect(history.location.pathname).toBe('/kept') - expect(history.location.state).toBe(keptState) - - history.forward() - expect(history.location.pathname).toBe('/new') - expect(history.location.state).toBe(newState) - }) - test('length', () => { const history = createMemoryHistory() expect(history.length).toBe(1) diff --git a/packages/history/tests/createServerHistory.test.ts b/packages/history/tests/createServerHistory.test.ts deleted file mode 100644 index c036cea185..0000000000 --- a/packages/history/tests/createServerHistory.test.ts +++ /dev/null @@ -1,95 +0,0 @@ -import { describe, expect, test, vi } from 'vitest' -import { - createBrowserHistory, - createMemoryHistory, - createServerHistory, -} from '../src' - -describe('server history', () => { - test.each([ - '/', - '/posts/123?sort=new#comments', - '/caf%C3%A9?q=%2F#//section', - '//example.com/path', - '/\\example.com/path', - '/path\nname?value=\u0000', - ])('parses and sanitizes %j like memory history', (href) => { - const history = createServerHistory(href) - const memory = createMemoryHistory({ initialEntries: [href] }) - expect(history.location).toEqual({ - ...memory.location, - state: { - key: expect.any(String), - __TSR_key: expect.any(String), - __TSR_index: 0, - }, - }) - expect(history.location.state.key).toBe(history.location.state.__TSR_key) - }) - - test.each([ - '//evil.example/path', - '/\\evil.example/path', - '\\/evil.example/path', - '\\\\evil.example/path', - ' \t/\r\\evil.example/path', - '/\t/evil.example/path', - '/a\tb?q=a\nb#section\r', - '/a\u0000b?q=a\u0001b#section\u007f', - '/', - '/posts/123?sort=new#comments', - '/caf%C3%A9?q=%2F#//section', - '/a//b?q=//value#\\/section', - '/%2Fevil.example/path', - ])('normalizes href %j like browser history', (href) => { - const history = createServerHistory('/request') - const browser = createBrowserHistory() - try { - expect(history.createHref(href)).toBe(browser.createHref(href)) - expect(history.location.href).toBe('/request') - } finally { - browser.destroy() - } - }) - - test('ignores navigation, subscriptions, and blockers', () => { - const history = createServerHistory('/request?q=1') - const location = history.location - const subscriber = vi.fn() - const blockerFn = vi.fn(() => true) - const unsubscribe = history.subscribe(subscriber) - const unblock = history.block({ blockerFn }) - - history.push('/pushed', { value: 1 }) - history.replace('/replaced', { value: 2 }) - history.go(-1) - history.back() - history.forward() - history.notify({ type: 'PUSH' }) - history.flush() - history.destroy() - unsubscribe() - unblock() - - expect(history.location).toBe(location) - expect(history.length).toBe(1) - expect(history.canGoBack()).toBe(false) - expect(history.subscribers.size).toBe(0) - expect(history._getBlockers()).toEqual([]) - expect(subscriber).not.toHaveBeenCalled() - expect(blockerFn).not.toHaveBeenCalled() - }) - - test('isolates state and exposed collections between requests', () => { - const first = createServerHistory('/first') - const second = createServerHistory('/second') - first.location.state.__TSR_index = 10 - first.subscribers.add(vi.fn()) - first._getBlockers().push({ blockerFn: () => true }) - - expect(second.location.pathname).toBe('/second') - expect(second.location.state.__TSR_index).toBe(0) - expect(second.subscribers.size).toBe(0) - expect(second._getBlockers()).toEqual([]) - }) -}) diff --git a/packages/history/tests/parseHref.test.ts b/packages/history/tests/parseHref.test.ts index aa6882e6fc..e1a95fafa4 100644 --- a/packages/history/tests/parseHref.test.ts +++ b/packages/history/tests/parseHref.test.ts @@ -21,42 +21,6 @@ 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' }, - ])('preserves supplied state %j', (state) => { - Object.freeze(state) - expect(parseHref('/foo', state).state).toBe(state) - }) - - test('creates independent initial states with matching history keys', () => { - const first = parseHref('/foo', undefined) - const second = parseHref('/bar', undefined) - - for (const location of [first, second]) { - expect(location.state).toEqual({ - __TSR_index: 0, - key: expect.any(String), - __TSR_key: location.state.key, - }) - } - - first.state.__TSR_index = 1 - expect(second.state.__TSR_index).toBe(0) - }) - describe('open redirect prevention', () => { test('strips CR characters to prevent open redirect', () => { // If \r (CR) is in the href, it should be stripped diff --git a/packages/nitro-v2-vite-plugin/CHANGELOG.md b/packages/nitro-v2-vite-plugin/CHANGELOG.md new file mode 100644 index 0000000000..a7f54ed58c --- /dev/null +++ b/packages/nitro-v2-vite-plugin/CHANGELOG.md @@ -0,0 +1,25 @@ +# @tanstack/nitro-v2-vite-plugin + +## 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 new file mode 100644 index 0000000000..5882e61120 --- /dev/null +++ b/packages/nitro-v2-vite-plugin/README.md @@ -0,0 +1 @@ +# 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 new file mode 100644 index 0000000000..8ce6ad05fc --- /dev/null +++ b/packages/nitro-v2-vite-plugin/eslint.config.js @@ -0,0 +1,5 @@ +// @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 new file mode 100644 index 0000000000..c5c9b9f115 --- /dev/null +++ b/packages/nitro-v2-vite-plugin/package.json @@ -0,0 +1,76 @@ +{ + "name": "@tanstack/nitro-v2-vite-plugin", + "version": "1.155.1", + "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 new file mode 100644 index 0000000000..9adf8d8577 --- /dev/null +++ b/packages/nitro-v2-vite-plugin/src/index.ts @@ -0,0 +1,188 @@ +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 new file mode 100644 index 0000000000..92be18587f --- /dev/null +++ b/packages/nitro-v2-vite-plugin/tsconfig.build.json @@ -0,0 +1,7 @@ +{ + "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 new file mode 100644 index 0000000000..bd398a8728 --- /dev/null +++ b/packages/nitro-v2-vite-plugin/tsconfig.json @@ -0,0 +1,8 @@ +{ + "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 new file mode 100644 index 0000000000..7401092b13 --- /dev/null +++ b/packages/nitro-v2-vite-plugin/vite.config.ts @@ -0,0 +1,14 @@ +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 f74de5f187..7634f3d19e 100644 --- a/packages/react-router-devtools/CHANGELOG.md +++ b/packages/react-router-devtools/CHANGELOG.md @@ -1,21 +1,5 @@ # @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 - -- Updated dependencies [[`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`6387d58`](https://github.com/TanStack/router/commit/6387d581eabc6e6a3acc87a0bc924e5a38d9c8b2), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5), [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58), [`6387d58`](https://github.com/TanStack/router/commit/6387d581eabc6e6a3acc87a0bc924e5a38d9c8b2), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef)]: - - @tanstack/router-core@1.171.30 - - @tanstack/react-router@1.170.36 - - @tanstack/router-devtools-core@1.168.2 - ## 1.167.1 ### Patch Changes diff --git a/packages/react-router-devtools/package.json b/packages/react-router-devtools/package.json index 969371a6a6..64ddd15b16 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.3", + "version": "1.167.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router-ssr-query/CHANGELOG.md b/packages/react-router-ssr-query/CHANGELOG.md index d0fc73ff50..082433df3d 100644 --- a/packages/react-router-ssr-query/CHANGELOG.md +++ b/packages/react-router-ssr-query/CHANGELOG.md @@ -1,32 +1,5 @@ # @tanstack/react-router-ssr-query -## 1.167.3 - -### Patch Changes - -- [#8204](https://github.com/TanStack/router/pull/8204) [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26) - Stream large deferred SSR hydration payloads through a backpressure-aware router transport, fail known setup errors before response creation, and close cancelled or expired transforms safely. - - Start now cancels discarded middleware and HEAD response bodies, including plain streams and derived branches. - - Server-function raw streams share one ordered response. Arbitrary or sequential consumption can require potentially unbounded buffering of unread data on the client. Cancelling one raw stream discards it locally, while aborting the whole call cancels the response and server work. Consume streams concurrently, cancel unused streams promptly, or use separate calls when independent backpressure is required. A raw stream that exceeds its unread-byte limit now fails alone; sibling streams and the JSON result keep flowing. - - The JSON wire shape of a `RawStream` server-function argument changed. Clients and servers must run matching versions for requests that pass a `RawStream`. - - The frame-protocol constants (`FRAME_TYPE_*`, `MAX_FRAME_PAYLOAD_SIZE`, `MAX_FRAMED_STREAMS`) moved from the `@tanstack/start-client-core` root to the `@tanstack/start-client-core/client-rpc` subpath. - - Router requests whose `Accept` header allows neither `text/html` nor `*/*` now receive `406 Not Acceptable` instead of `500`. - - Framework adapters share the body `` composition (`getSsrBodyScriptParts`, `composeSsrBodyScripts`) and the eager HTML response wrapper (`renderSsrHtmlResponse`) from `@tanstack/router-core`. - - Solid SSR now emits one document type and renders late lazy errors through route boundaries. A Solid `` without a `fallback` no longer holds the streamed shell; it renders inside the nearest `` boundary like React and Vue, and now renders falsy resolved values. - - Static server functions decode cached `RawStream` values with the client deserializer plugins. - - SSR Query integrations now keep request cleanup and stream ownership aligned with the router lifecycle. - -- Updated dependencies [[`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26)]: - - @tanstack/router-ssr-query-core@1.169.3 - ## 1.167.2 ### Patch Changes diff --git a/packages/react-router-ssr-query/package.json b/packages/react-router-ssr-query/package.json index 7333146047..0d6e1688d0 100644 --- a/packages/react-router-ssr-query/package.json +++ b/packages/react-router-ssr-query/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router-ssr-query", - "version": "1.167.3", + "version": "1.167.2", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", @@ -88,7 +88,7 @@ "react": ">=18.0.0 || >=19.0.0", "react-dom": ">=18.0.0 || >=19.0.0", "@tanstack/query-core": ">=5.102.0", - "@tanstack/react-router": ">=1.170.33", + "@tanstack/react-router": ">=1.127.0", "@tanstack/react-query": ">=5.102.0" } } diff --git a/packages/react-router/CHANGELOG.md b/packages/react-router/CHANGELOG.md index 7e1e2f1a62..5c294df5cf 100644 --- a/packages/react-router/CHANGELOG.md +++ b/packages/react-router/CHANGELOG.md @@ -1,179 +1,5 @@ # @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 - -- [#8436](https://github.com/TanStack/router/pull/8436) [`f5ffd38`](https://github.com/TanStack/router/commit/f5ffd3884ba26778a2a8ce53b379a5bded231676) - Skip unused Link preload cleanup when preloading is disabled and ignore queued viewport notifications after their effect has been cleaned up. - -- Updated dependencies [[`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f), [`0c1b5e3`](https://github.com/TanStack/router/commit/0c1b5e38de71b7e81bbf1fd81c73ee0cd68ffe47), [`3cdd1af`](https://github.com/TanStack/router/commit/3cdd1af04b3e2d6f777797ee7bddf285318dd9d2)]: - - @tanstack/router-core@1.171.33 - -## 1.170.39 - -### Patch Changes - -- [#8435](https://github.com/TanStack/router/pull/8435) [`73bfc15`](https://github.com/TanStack/router/commit/73bfc153eef460e9b670556215a5adb2b5cbf542) - Avoid hydration-triggered rerenders for links that do not compare URL hashes while preserving hash-sensitive active state and ClientOnly behavior. - -## 1.170.38 - -### Patch Changes - -- Updated dependencies [[`cecae54`](https://github.com/TanStack/router/commit/cecae5440b8edaea77c5448fe3d74bbd20fe10a4), [`0103578`](https://github.com/TanStack/router/commit/01035782e53af9b929c784b94ddd64b95efb89c7), [`ce10dcd`](https://github.com/TanStack/router/commit/ce10dcd4d9d3d23738744e453205aad5c6dbd716), [`84936cc`](https://github.com/TanStack/router/commit/84936cc04530bba11059c57b293a794922bbc5aa), [`bbd2336`](https://github.com/TanStack/router/commit/bbd2336b8446de3f7dd85070895e7cf43980183e)]: - - @tanstack/router-core@1.171.32 - -## 1.170.37 - -### Patch Changes - -- [#8418](https://github.com/TanStack/router/pull/8418) [`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387) - `deepEqual` now takes its flags as positional arguments — `deepEqual(a, b, partial?, explicitUndefined?)` — instead of an options object. The router's hot callers (Link option stabilization and active-state checks, `matchRoute`) no longer allocate an options object per comparison, and the comparator reads two booleans instead of a polymorphic object. `explicitUndefined` replaces `ignoreUndefined: false`. `deepEqual` is an internal helper; it stays exported for compatibility of two-argument calls. - -- [#8419](https://github.com/TanStack/router/pull/8419) [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd) - `resolvePath` (internal helper) now takes positional arguments — `resolvePath(base, to, trailingSlash?, cache?)` — so `buildLocation` and `matchRoute` no longer allocate an options object per path resolution. - -- [#8204](https://github.com/TanStack/router/pull/8204) [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26) - Stream large deferred SSR hydration payloads through a backpressure-aware router transport, fail known setup errors before response creation, and close cancelled or expired transforms safely. - - Start now cancels discarded middleware and HEAD response bodies, including plain streams and derived branches. - - Server-function raw streams share one ordered response. Arbitrary or sequential consumption can require potentially unbounded buffering of unread data on the client. Cancelling one raw stream discards it locally, while aborting the whole call cancels the response and server work. Consume streams concurrently, cancel unused streams promptly, or use separate calls when independent backpressure is required. A raw stream that exceeds its unread-byte limit now fails alone; sibling streams and the JSON result keep flowing. - - The JSON wire shape of a `RawStream` server-function argument changed. Clients and servers must run matching versions for requests that pass a `RawStream`. - - The frame-protocol constants (`FRAME_TYPE_*`, `MAX_FRAME_PAYLOAD_SIZE`, `MAX_FRAMED_STREAMS`) moved from the `@tanstack/start-client-core` root to the `@tanstack/start-client-core/client-rpc` subpath. - - Router requests whose `Accept` header allows neither `text/html` nor `*/*` now receive `406 Not Acceptable` instead of `500`. - - Framework adapters share the body `` composition (`getSsrBodyScriptParts`, `composeSsrBodyScripts`) and the eager HTML response wrapper (`renderSsrHtmlResponse`) from `@tanstack/router-core`. - - Solid SSR now emits one document type and renders late lazy errors through route boundaries. A Solid `` without a `fallback` no longer holds the streamed shell; it renders inside the nearest `` boundary like React and Vue, and now renders falsy resolved values. - - Static server functions decode cached `RawStream` values with the client deserializer plugins. - - SSR Query integrations now keep request cleanup and stream ownership aligned with the router lifecycle. - -- [#8420](https://github.com/TanStack/router/pull/8420) [`8e164d2`](https://github.com/TanStack/router/commit/8e164d28f9e9eb1a7301109230d7ece9817492a8) - `useLinkProps` no longer calls through an internal wrapper. The host element `Link` renders on is an `@internal` overload parameter that is stripped from the published declarations, so the public `useLinkProps(options, forwardedRef?)` signature is unchanged. - -- Updated dependencies [[`bc80866`](https://github.com/TanStack/router/commit/bc80866f6d6eb3e6f152ee3682eb783c96403e83), [`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a0b2ad9`](https://github.com/TanStack/router/commit/a0b2ad99aee64af08d16b0e4ff26b3ba42a99f0a), [`1ca361b`](https://github.com/TanStack/router/commit/1ca361ba52a627d2f76ab33323bd83d1d0aa65a3)]: - - @tanstack/router-core@1.171.31 - -## 1.170.36 - -### Patch Changes - -- [#8390](https://github.com/TanStack/router/pull/8390) [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776) - Keep the Link location cache out of server bundles: `buildLocation` only creates, reads and writes it when `isServer` is false. Render React Links on the server without the extra prop copies and the forwarded-ref hook. Link SSR rendering is 20-40% faster in the Link benchmarks and the React Start SSR request loop about 7% faster. - - React `activeProps` and `inactiveProps` now follow one precedence rule on every link, including links whose destination is blocked for using a disallowed scheme: state props override element props, `ref` and event handlers, while `href`, `disabled` and `target` stay controlled by the router. Previously a blocked link ignored a `ref` or handler from its inactive props. - - React `Link` and `useLinkProps` split router options from element props with one key set on the client and the server. Element props pass through as given: external links forward them verbatim, falsy values included, and `useLinkProps` now returns `children` for router-controlled links as it already did for external ones. - -- [#8324](https://github.com/TanStack/router/pull/8324) [`6387d58`](https://github.com/TanStack/router/commit/6387d581eabc6e6a3acc87a0bc924e5a38d9c8b2) - Reuse hydration snapshot getters to avoid unnecessary store-instance effect updates when Links and other hydration-aware components rerender. - -- [#8318](https://github.com/TanStack/router/pull/8318) [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8) - Allow active and inactive Link props to override base element props in React and Solid while preserving class/style merging. Keep React's `href`, `target`, and `disabled` values controlled by routing options. Preserve Vue object and nested-array class bindings, including reactive updates and server rendering, without mutating cached bindings during VNode normalization. - -- [#8327](https://github.com/TanStack/router/pull/8327) [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef) - Make `pathParamsAllowedCharacters` initialization-only. Configure it when creating the router; changing allowed characters requires a new router instance. Remove decoder-update bookkeeping and decoder-change checks from route-owned path caches. - -- [#8370](https://github.com/TanStack/router/pull/8370) [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5) - Stop exporting the internal `isPlainObject` and `isPlainArray` helpers. - -- [#8324](https://github.com/TanStack/router/pull/8324) [`6387d58`](https://github.com/TanStack/router/commit/6387d581eabc6e6a3acc87a0bc924e5a38d9c8b2) - Avoid a redundant prop copy when rendering native Links while preserving custom-component props and the public hook result. - -- [#8252](https://github.com/TanStack/router/pull/8252) [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734) - Reduce the bundle cost of shared Link pathname interpolation while preserving its rendering performance. Reuse one interpolation pass for pathname and optional metadata, keep the bounded cache on the router, and simplify React Link active-state and prop merging. - -- [#8370](https://github.com/TanStack/router/pull/8370) [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5) - Reuse built locations for Links whose destination does not depend on the current location. `buildLocation` keeps the result per options object when the build never read the current location, and the React `Link` passes one stable options object per instance, so navigations resolve unchanged Links with a lookup instead of a full build. The per-route pathname interpolation cache this replaces is removed. Link `params`, `search` and `activeOptions` are compared by value on render, so inline object literals with unchanged contents keep reusing the Link's location. Pass a new object to change a destination; like any other React prop, an object mutated in place is not re-read. - -- Updated dependencies [[`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`8fff7fa`](https://github.com/TanStack/router/commit/8fff7fa1f2e6f061916b0bf5e0ec486b2e732f94), [`f021f6d`](https://github.com/TanStack/router/commit/f021f6d1c6dce6c9b54d70766f1d636d8fd9e184), [`ae68535`](https://github.com/TanStack/router/commit/ae68535929043607d4ee9438f8ae401f3a064862), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5), [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef)]: - - @tanstack/router-core@1.171.30 - - @tanstack/history@1.162.4 - -## 1.170.35 - -### Patch Changes - -- [#7824](https://github.com/TanStack/router/pull/7824) [`8c43c71`](https://github.com/TanStack/router/commit/8c43c712523fc63dc3a814f3a19617e270ce8ed1) - Upgrade TanStack Store to 0.11 and migrate router subscriptions to useSelector, preserving selector comparisons and Vue subscription cleanup. - -## 1.170.34 - -### Patch Changes - -- [#8279](https://github.com/TanStack/router/pull/8279) [`aee42c6`](https://github.com/TanStack/router/commit/aee42c6b641d8e919bfed9e0f04bb1b72092f3a6) - Avoid allocating event-handler arrays and wrapper functions for links without user-supplied event handlers. - -- [#8308](https://github.com/TanStack/router/pull/8308) [`9c1871c`](https://github.com/TanStack/router/commit/9c1871ccc88bc1157186b8b460941a304ec740b8) - Validate navigation and redirect destinations, keep ambiguous relative URLs on the current origin, and constrain prerender requests and output paths. Prevent redirect headers from appearing in serialized server function response bodies. - - Preserve native form HTTP redirects, route error handling and masks for document redirects, and per-navigation destinations for shared loader redirects. Avoid redundant origin parsing and reduce link styling and server-rendering work. Configured origins must already be normalized. - - Keep blocked-link inactive props consistent during React hydration, honor explicit redirect Location headers before checking route options, and refresh Vue link state when destinations become internal. Reuse the protocol-relative URL check while parsing redirect schemes once. - - Reduce React link bundle size by sharing pathname comparisons, state-prop selection, and element creation. - - Share normalized pathname comparisons in Solid and Vue links to reduce bundle size. - -- [#8311](https://github.com/TanStack/router/pull/8311) [`9aec5a7`](https://github.com/TanStack/router/commit/9aec5a7012c47e83ec23bb4763494b72a5e68bfc) - React Links resolve state props without temporary class-name arrays or unnecessary style copies. - -- Updated dependencies [[`f9836f1`](https://github.com/TanStack/router/commit/f9836f16f0e25b0a8495f5e01e3f303b1cbc8725), [`9c1871c`](https://github.com/TanStack/router/commit/9c1871ccc88bc1157186b8b460941a304ec740b8), [`9871c06`](https://github.com/TanStack/router/commit/9871c0625806001d6bf373524821a00303438a91), [`0654c0a`](https://github.com/TanStack/router/commit/0654c0a1a427db24d9af13c1d6ad1217a588c0c9)]: - - @tanstack/router-core@1.171.29 - - @tanstack/history@1.162.3 - ## 1.170.33 ### Patch Changes diff --git a/packages/react-router/package.json b/packages/react-router/package.json index 9a61d5af25..34acb06758 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router", - "version": "1.170.46", + "version": "1.170.33", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", @@ -86,16 +86,14 @@ "sideEffects": false, "files": [ "dist", - "src", - "skills", - "!skills/_artifacts" + "src" ], "engines": { "node": ">=20.19" }, "dependencies": { "@tanstack/history": "workspace:*", - "@tanstack/react-store": "^0.11.2", + "@tanstack/react-store": "^0.9.3", "@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 4fdd74fc30..9bda851b1c 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, static queries and fire-and-forget queries in loaders, + in router context, ensureQueryData/prefetchQuery 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 `@tanstack/router-core#router-core` and [react-router](../../react-router/SKILL.md) first. +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 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: Static `query` in Loader + `useSuspenseQuery` in Component +## Core Pattern: `ensureQueryData` in Loader + `useSuspenseQuery` in Component -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. +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. ```tsx // src/routes/posts.tsx @@ -204,12 +204,9 @@ const postsQueryOptions = queryOptions({ export const Route = createFileRoute('/posts')({ loader: ({ context }) => { - // 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', - }) + // ensureQueryData returns cached data if available, fetches if not in cache + // To also refetch stale data, pass revalidateIfStale: true + return context.queryClient.ensureQueryData(postsQueryOptions) }, component: PostsPage, }) @@ -249,10 +246,7 @@ const postQueryOptions = (postId: string) => export const Route = createFileRoute('/posts/$postId')({ loader: ({ context, params }) => { - return context.queryClient.query({ - ...postQueryOptions(params.postId), - staleTime: 'static', - }) + return context.queryClient.ensureQueryData(postQueryOptions(params.postId)) }, component: PostPage, }) @@ -265,23 +259,20 @@ function PostPage() { } ``` -## Streaming Pattern: Fire-and-Forget `query` (Not Awaited) +## Streaming Pattern: `prefetchQuery` (Not Awaited) -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: +For non-critical data, start the fetch without blocking navigation: ```tsx -import { noop, useQuery, useSuspenseQuery } from '@tanstack/react-query' +import { useQuery, useSuspenseQuery } from '@tanstack/react-query' export const Route = createFileRoute('/dashboard')({ loader: ({ context }) => { // Await critical data - const user = context.queryClient.query({ - ...userQueryOptions, - staleTime: 'static', - }) + const user = context.queryClient.ensureQueryData(userQueryOptions) - // Start non-critical query without awaiting — streams during SSR - void context.queryClient.query({ ...analyticsQueryOptions }).catch(noop) + // Start non-critical fetch without awaiting — streams during SSR + context.queryClient.prefetchQuery(analyticsQueryOptions) return user }, @@ -313,10 +304,7 @@ import { useRouter } from '@tanstack/react-router' export const Route = createFileRoute('/posts')({ loader: ({ context }) => - context.queryClient.query({ - ...postsQueryOptions, - staleTime: 'static', - }), + context.queryClient.ensureQueryData(postsQueryOptions), errorComponent: PostsErrorComponent, component: PostsPage, }) @@ -385,29 +373,24 @@ export function createAppRouter() { } ``` -### 3. MEDIUM: Awaiting a fire-and-forget query in a loader blocks rendering +### 3. MEDIUM: Awaiting `prefetchQuery` in loader blocks rendering -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. +`prefetchQuery` is designed to fire-and-forget. 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.query({ ...analyticsQueryOptions }).catch(noop) + await context.queryClient.prefetchQuery(analyticsQueryOptions) } -// CORRECT — fire and forget for streaming, with handled rejection +// CORRECT — fire and forget for streaming loader: ({ context }) => { - void context.queryClient.query({ ...analyticsQueryOptions }).catch(noop) + context.queryClient.prefetchQuery(analyticsQueryOptions) } -// If you need to block (critical data), use a static query instead: +// If you need to block (critical data), use ensureQueryData instead: loader: ({ context }) => { - return context.queryClient.query({ - ...criticalQueryOptions, - staleTime: 'static', - }) + return context.queryClient.ensureQueryData(criticalQueryOptions) } ``` @@ -432,10 +415,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 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 +- 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` ## Cross-References -- `@tanstack/router-core#router-core/data-loading` — built-in loader caching fundamentals -- `@tanstack/router-core#router-core/ssr` — SSR setup for dehydration/hydration +- [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 diff --git a/packages/react-router/skills/react-router/SKILL.md b/packages/react-router/skills/react-router/SKILL.md index f8df76df02..ba628f7003 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 `@tanstack/router-core#router-core` first for foundational concepts. +This skill builds on router-core. Read [router-core](../../../router-core/skills/router-core/SKILL.md) 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 -- `@tanstack/router-core#router-core` — all sub-skills for domain-specific patterns (search params, data loading, navigation, auth, SSR, etc.) +- [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.) diff --git a/packages/react-router/src/ClientOnly.tsx b/packages/react-router/src/ClientOnly.tsx index 010a6d3117..102859d75a 100644 --- a/packages/react-router/src/ClientOnly.tsx +++ b/packages/react-router/src/ClientOnly.tsx @@ -2,9 +2,6 @@ import React from 'react' -const getSnapshot = () => true -const getServerSnapshot = () => false - export interface ClientOnlyProps { /** * The children to render when the JS is loaded. @@ -56,19 +53,11 @@ export function ClientOnly({ children, fallback = null }: ClientOnlyProps) { * ``` * @returns True if the JS has been hydrated already, false otherwise. */ -export function useHydrated(): boolean -/** - * @internal - * callers whose output does not depend on hydration can keep the - * same snapshot on both sides, avoiding an unnecessary post-hydration render. - */ -export function useHydrated(enabled: boolean): boolean -/** @internal */ -export function useHydrated(enabled = true): boolean { +export function useHydrated(): boolean { return React.useSyncExternalStore( subscribe, - getSnapshot, - enabled ? getServerSnapshot : getSnapshot, + () => true, + () => false, ) } diff --git a/packages/react-router/src/Match.tsx b/packages/react-router/src/Match.tsx index db1d341ec4..97b8f79589 100644 --- a/packages/react-router/src/Match.tsx +++ b/packages/react-router/src/Match.tsx @@ -1,13 +1,14 @@ 'use client' import * as React from 'react' -import { useSelector } from '@tanstack/react-store' +import { useStore } from '@tanstack/react-store' import { isNotFound, rootRouteId } from '@tanstack/router-core' import { isServer } from '@tanstack/router-core/isServer' 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' @@ -68,16 +69,22 @@ export const Match = React.memo(function MatchImpl({ if (isServer ?? router.isServer) { const match = router.stores.byRoute.get(routeId)!.get()! - return matchView(router, match) + return } const matchStore = router.stores.getMatchStore(routeId) // eslint-disable-next-line react-hooks/rules-of-hooks - const match = useSelector(matchStore)! - return matchView(router, match) + const match = useStore(matchStore, (value) => value) + return }) -function matchView(router: ReturnType, match: AnyRouteMatch) { +function MatchView({ + router, + match, +}: { + router: ReturnType + match: AnyRouteMatch +}) { const route: AnyRoute = router.routesById[match.routeId] const pendingElement = renderPending(router, route) @@ -96,90 +103,81 @@ function matchView(router: ReturnType, match: AnyRouteMatch) { 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 wrapInSuspense = + const ResolvedSuspenseBoundary = canWrapInSuspense(router, route, match.ssr) && (route.options.wrapInSuspense ?? pendingElement ?? ((route.options.errorComponent as any)?.preload || resolvedNoSsr)) + ? React.Suspense + : 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 ResolvedCatchBoundary = routeErrorComponent + ? CatchBoundary + : SafeFragment - const scrollRestoration = - (isServer ?? router.isServer) && - route.parentRoute?.id === rootRouteId && - router.options.scrollRestoration ? ( - - ) : null + const ResolvedNotFoundBoundary = routeNotFoundComponent + ? CatchNotFound + : SafeFragment - const ShellComponent = - route.isRoot && (route.options as RootRouteOptions).shellComponent + 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 - return ShellComponent ? ( - // The shell and route boundaries must share this match's context. - - - {content} - {scrollRestoration} - - - ) : ( - - {content} - {scrollRestoration} - + 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} + ) } @@ -290,14 +288,14 @@ export const Outlet = React.memo(function OutletImpl() { const parentMatchStore = router.stores.getMatchStore(routeId) // eslint-disable-next-line react-hooks/rules-of-hooks - ;[parentGlobalNotFound, parentNotFoundError] = useSelector( + ;[parentGlobalNotFound, parentNotFoundError] = useStore( parentMatchStore, (match): OutletMatchSelection => [!!match!._notFound, match!.error], - { compare: outletMatchSelectionEqual }, + outletMatchSelectionEqual, ) // eslint-disable-next-line react-hooks/rules-of-hooks - childRouteId = useSelector(router.stores.ids, (ids) => { + childRouteId = useStore(router.stores.ids, (ids) => { return ids[ids.indexOf(routeId) + 1] }) } diff --git a/packages/react-router/src/Matches.tsx b/packages/react-router/src/Matches.tsx index a20c862b23..576c40a16f 100644 --- a/packages/react-router/src/Matches.tsx +++ b/packages/react-router/src/Matches.tsx @@ -1,7 +1,7 @@ 'use client' import * as React from 'react' -import { useSelector } from '@tanstack/react-store' +import { useStore } from '@tanstack/react-store' import { rootRouteId } from '@tanstack/router-core' import { isServer } from '@tanstack/router-core/isServer' import { CatchBoundary } from './CatchBoundary' @@ -11,6 +11,7 @@ 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, @@ -50,6 +51,10 @@ 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) && ( @@ -62,13 +67,9 @@ export function Matches() { t={React.useState()[1]} /> )} - {(isServer ?? router.isServer) || router.ssr ? ( + - ) : ( - - - - )} + ) @@ -86,7 +87,7 @@ function MatchesInner() { (isServer ?? router.isServer) ? router.stores.matches.get() : // eslint-disable-next-line react-hooks/rules-of-hooks - useSelector( + useStore( router.stores.matches, (value) => acknowledgement[0 /* offered */] ?? value, ) @@ -101,24 +102,28 @@ 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} + + )} + ) } @@ -187,11 +192,11 @@ export function useMatchRoute(): < [ router, // eslint-disable-next-line react-hooks/rules-of-hooks, react-hooks/exhaustive-deps - useSelector(router.stores.location, (location) => location.href), + useStore(router.stores.location, (location) => location.href), // eslint-disable-next-line react-hooks/rules-of-hooks, react-hooks/exhaustive-deps - useSelector(router.stores.resolvedLocation, (location) => location?.href), + useStore(router.stores.resolvedLocation, (location) => location?.href), // eslint-disable-next-line react-hooks/rules-of-hooks, react-hooks/exhaustive-deps - useSelector(router.stores.status), + useStore(router.stores.status, (status) => status), ], ) } @@ -273,7 +278,7 @@ export function useMatches< } // eslint-disable-next-line react-hooks/rules-of-hooks -- condition is static - return useSelector( + return useStore( router.stores.matches, // eslint-disable-next-line react-hooks/rules-of-hooks -- condition is static useStructuralSharing(opts, router), diff --git a/packages/react-router/src/RouterProvider.tsx b/packages/react-router/src/RouterProvider.tsx index e61cdf1b8a..81c3fb4ece 100644 --- a/packages/react-router/src/RouterProvider.tsx +++ b/packages/react-router/src/RouterProvider.tsx @@ -53,8 +53,8 @@ export function RouterContextProvider< * Renders the current match presentation and provides the router to the React * tree via context. * - * Accepts mutable router options via props. Configure initialization-only - * options with `createRouter`. + * Accepts the same options as `createRouter` via props to update the router + * instance after creation. * * @link https://tanstack.com/router/latest/docs/framework/react/api/router/createRouterFunction */ @@ -80,7 +80,7 @@ export type RouterProps< TRouter['history'], TDehydrated >, - 'context' | 'pathParamsAllowedCharacters' + 'context' > & { router: TRouter context?: Partial< diff --git a/packages/react-router/src/SafeFragment.tsx b/packages/react-router/src/SafeFragment.tsx new file mode 100644 index 0000000000..72a95bac01 --- /dev/null +++ b/packages/react-router/src/SafeFragment.tsx @@ -0,0 +1,5 @@ +import * as React from 'react' + +export function SafeFragment(props: any) { + return <>{props.children} +} diff --git a/packages/react-router/src/Scripts.tsx b/packages/react-router/src/Scripts.tsx index 56afe0a443..a1b189d4c6 100644 --- a/packages/react-router/src/Scripts.tsx +++ b/packages/react-router/src/Scripts.tsx @@ -1,9 +1,5 @@ -import { useSelector } from '@tanstack/react-store' -import { - composeSsrBodyScripts, - deepEqual, - getSsrBodyScriptParts, -} from '@tanstack/router-core' +import { useStore } from '@tanstack/react-store' +import { _getAssetMatches, deepEqual } from '@tanstack/router-core' import { isServer } from '@tanstack/router-core/isServer' import { Asset } from './Asset' import { useRouter } from './useRouter' @@ -13,56 +9,82 @@ type ScriptRenderAsset = RouterManagedTag & { preventScriptHoist?: boolean } -const routeScriptAttrs = { suppressHydrationWarning: true } - /** * Render body script tags collected from route matches and SSR manifests. - * During streaming SSR, `` marks where late hydration scripts may - * begin to be inserted. + * Should be placed near the end of the document body. */ export const Scripts = () => { const router = useRouter() const nonce = router.options.ssr?.nonce - const getParts = (matches: Array) => { - const parts = getSsrBodyScriptParts( - matches, - router.ssr?.manifest, - nonce, - routeScriptAttrs, - ) - for (const script of parts[1]) { - if (typeof script.attrs?.src === 'string') { - const scriptWithHoist = script as ScriptRenderAsset - scriptWithHoist.preventScriptHoist = true + const getScripts = (matches: Array) => { + matches = _getAssetMatches(matches) + const scripts = matches + .flatMap((match) => match.scripts ?? []) + .filter(Boolean) + .map( + ({ children, ...script }) => + ({ + tag: 'script', + attrs: { + ...script, + suppressHydrationWarning: true, + nonce, + }, + children, + }) satisfies RouterManagedTag, + ) as Array + const manifest = router.ssr?.manifest + + if (!manifest) { + return scripts + } + + for (const match of matches) { + const manifestScripts = manifest.routes[match.routeId]?.scripts + + if (!manifestScripts) { + continue + } + + for (const asset of manifestScripts) { + scripts.push({ + tag: 'script', + attrs: { ...asset.attrs, nonce }, + children: asset.children, + ...(typeof asset.attrs?.src === 'string' + ? { preventScriptHoist: true } + : {}), + }) } } - return parts - } - const getScripts = (matches: Array) => { - return composeSsrBodyScripts(getParts(matches)) + return scripts } if (isServer ?? router.isServer) { const activeMatches = router.stores.matches.get() - return renderScripts( - composeSsrBodyScripts( - getParts(activeMatches), - router.serverSsr?.takeInitialHydrationScriptTags(), - ), - ) + const scripts = getScripts(activeMatches) + return renderScripts(router, scripts) } // eslint-disable-next-line react-hooks/rules-of-hooks -- condition is static - const scripts = useSelector(router.stores.matches, getScripts, { - compare: deepEqual, - }) + const scripts = useStore(router.stores.matches, getScripts, deepEqual) - return renderScripts(scripts) + return renderScripts(router, scripts) } -function renderScripts(scripts: Array) { +function renderScripts( + router: ReturnType, + scripts: Array, +) { + if ((isServer ?? router.isServer) && router.serverSsr) { + const serverBufferedScript = router.serverSsr.takeBufferedScripts() + if (serverBufferedScript) { + scripts.unshift(serverBufferedScript) + } + } + return ( <> {scripts.map((asset, i) => ( diff --git a/packages/react-router/src/headContentUtils.tsx b/packages/react-router/src/headContentUtils.tsx index d517e0e453..d61ca829db 100644 --- a/packages/react-router/src/headContentUtils.tsx +++ b/packages/react-router/src/headContentUtils.tsx @@ -1,5 +1,5 @@ import * as React from 'react' -import { useSelector } from '@tanstack/react-store' +import { useStore } from '@tanstack/react-store' import { _getAssetMatches, appendUniqueUserTags, @@ -212,5 +212,5 @@ export const useTags = (assetCrossOrigin?: AssetCrossOriginConfig) => { [assetCrossOrigin, nonce, router], ) // eslint-disable-next-line react-hooks/rules-of-hooks -- condition is static - return useSelector(router.stores.matches, selectTags, { compare: deepEqual }) + return useStore(router.stores.matches, selectTags, deepEqual) } diff --git a/packages/react-router/src/index.tsx b/packages/react-router/src/index.tsx index 23ebf57938..6637c7542b 100644 --- a/packages/react-router/src/index.tsx +++ b/packages/react-router/src/index.tsx @@ -17,6 +17,8 @@ export { stringifySearchWith, functionalUpdate, replaceEqualDeep, + isPlainObject, + isPlainArray, deepEqual, createControlledPromise, retainSearchParams, @@ -202,6 +204,7 @@ export type { RegisteredRouter, RouterContextOptions, ControllablePromise, + InjectedHtmlEntry, RouterOptions, RouterState, ListenerFn, diff --git a/packages/react-router/src/link.tsx b/packages/react-router/src/link.tsx index ce6a7ed9d1..6f0998c635 100644 --- a/packages/react-router/src/link.tsx +++ b/packages/react-router/src/link.tsx @@ -1,18 +1,23 @@ 'use client' import * as React from 'react' +import { useStore } from '@tanstack/react-store' import { deepEqual, + exactPathTest, functionalUpdate, getUrlScheme, + hasKeys, isDangerousProtocol, preloadWarning, removeTrailingSlash, } from '@tanstack/router-core' import { isServer } from '@tanstack/router-core/isServer' import { useRouter } from './useRouter' -import { createLinkScope, matchContext } from './matchContext' +import { useForwardedRef, useIntersectionObserver } from './utils' + +import { useHydrated } from './ClientOnly' import type { ActiveOptions, AnyRouter, @@ -32,37 +37,25 @@ import type { // Keep that classification with the href instead of parsing it again on render. type LinkState = [href: string | undefined, isActive?: boolean] -// Keep referentially stable values while their contents are equal. Links +// Keep a referentially stable value while the contents are equal. Links // routinely pass inline `params` / `search` object literals, which would -// 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. +// otherwise change `_options` identity on every parent render, rebuild the +// store selector, and discard its memoized selection. // -// The router reuses a built location for as long as it sees the same options -// object, so the references returned here are its invalidation signal: pass a -// new object to change a destination. Like every other React prop, an object -// mutated in place is not re-read. `deepEqual` short-circuits on reference -// equality, so an unchanged reference costs nothing. -// -// `explicitUndefined` is required: an explicit `undefined` clears an +// `ignoreUndefined: false` is required: an explicit `undefined` clears an // inherited param or search key, so `{}` and `{ category: undefined }` build // different locations and must not be treated as equal here. -function useStableValues>(...values: T): T { - const ref = React.useRef>(values) - const stable = ref.current as Array - values.forEach((value, index) => { - if (!deepEqual(stable[index], value, false, true)) { - stable[index] = value - } - }) - return ref.current as T +function useValueStable(value: T): T { + const ref = React.useRef(value) + // `deepEqual` short-circuits on reference equality, so this covers both cases. + if (!deepEqual(ref.current, value, { ignoreUndefined: false })) { + ref.current = value + } + return ref.current } -function preloadLink(router: AnyRouter, options: unknown) { - router.preloadRoute(options as any).catch((err) => { - console.warn(err) - console.warn(preloadWarning) - }) +function compareLinkState(a: LinkState, b: LinkState) { + return a[0] === b[0] && a[1] === b[1] } function resolveExternalLink( @@ -87,6 +80,7 @@ function resolveIsActive( next: ParsedLocation, activeOptions: ActiveOptions | undefined, basepath: string, + isHydrated: boolean, ): boolean { const currentPath = removeTrailingSlash(location.pathname, basepath) const nextPath = removeTrailingSlash(next.pathname, basepath) @@ -105,18 +99,19 @@ function resolveIsActive( } if (activeOptions?.includeSearch ?? true) { - const searchTest = deepEqual( - location.search, - next.search, - !activeOptions?.exact, - activeOptions?.explicitUndefined, - ) + const searchTest = deepEqual(location.search, next.search, { + partial: !activeOptions?.exact, + ignoreUndefined: !activeOptions?.explicitUndefined, + }) if (!searchTest) { return false } } - return !activeOptions?.includeHash || location.hash === next.hash + if (activeOptions?.includeHash) { + return isHydrated && location.hash === next.hash + } + return true } /** @@ -140,38 +135,50 @@ export function useLinkProps< >( options: UseLinkPropsOptions, forwardedRef?: React.ForwardedRef, -): React.ComponentPropsWithRef<'a'> -/** - * `host` is what the props are rendered on: `'a'` for `Link` or the component - * given to `createLink`. `Link` never renders `type` and an anchor never - * receives `disabled`, so those are left out here rather than copied away - * from the result in the component. Stripped from the public declarations. - * - * @internal - */ -export function useLinkProps< - TRouter extends AnyRouter = RegisteredRouter, - const TFrom extends string = string, - const TTo extends string | undefined = undefined, - const TMaskFrom extends string = TFrom, - const TMaskTo extends string = '', ->( - options: UseLinkPropsOptions, - forwardedRef: React.ForwardedRef | undefined, - host: 'a' | React.ElementType, -): React.ComponentPropsWithRef<'a'> -export function useLinkProps< - TRouter extends AnyRouter = RegisteredRouter, - const TFrom extends string = string, - const TTo extends string | undefined = undefined, - const TMaskFrom extends string = TFrom, - const TMaskTo extends string = '', ->( - options: UseLinkPropsOptions, - forwardedRef?: React.ForwardedRef, - host?: 'a' | React.ElementType, ): React.ComponentPropsWithRef<'a'> { const router = useRouter() + const innerRef = useForwardedRef(forwardedRef) + + const { + // custom props + activeProps, + inactiveProps, + activeOptions, + to: toOption, + preload: userPreload, + preloadDelay: userPreloadDelay, + preloadIntentProximity: _preloadIntentProximity, + hashScrollIntoView, + replace, + startTransition, + resetScroll, + viewTransition, + // element props + children, + target, + disabled, + style, + className, + onClick, + onBlur, + onFocus, + onMouseEnter, + onMouseLeave, + onTouchStart, + ignoreBlocker, + // prevent these from being returned + params: _params, + search: _search, + hash: _hash, + state: _state, + mask: _mask, + reloadDocument: _reloadDocument, + unsafeRelative: _unsafeRelative, + from: _from, + _fromLocation, + ...propsSafeToSpread + } = options + const to = toOption as string | undefined // ========================================================================== // SERVER EARLY RETURN @@ -185,10 +192,190 @@ export function useLinkProps< // Note: `location.hash` is not available on the server. // ========================================================================== // The expression must stay inlined in the `if` so bundlers fold the - // browser-build constant `isServer = false` and drop this server block, - // together with `getServerLinkProps` and the key sets only it references. + // browser-build constant `isServer = false` and drop this server block. if (isServer ?? router.isServer) { - return getServerLinkProps(router, options, forwardedRef, host) + const directExternalLink = resolveExternalLink(to, router.protocolAllowlist) + + // Direct-scheme links need no route resolution. Blocked links still use + // the shared inactive-prop merge so their server and client markup agree. + const next = + directExternalLink === undefined + ? router.buildLocation(options as any) + : undefined + + // 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 = next + ? getHrefOption(next, router, disabled) + : (directExternalLink ?? undefined) + const linkDisabled = disabled || !hrefOption + + const externalLink = + directExternalLink ?? + (hrefOption && getUrlScheme(hrefOption) ? hrefOption : undefined) + + const isActive = (() => { + if (!next || (!disabled && !hrefOption) || externalLink) { + return false + } + + const currentLocation = router.stores.location.get() + + const exact = activeOptions?.exact ?? false + + if (exact) { + const testExact = exactPathTest( + currentLocation.pathname, + next.pathname, + router.basepath, + ) + if (!testExact) { + return false + } + } else { + const currentPathSplit = removeTrailingSlash( + currentLocation.pathname, + router.basepath, + ) + const nextPathSplit = removeTrailingSlash( + next.pathname, + router.basepath, + ) + + const pathIsFuzzyEqual = + currentPathSplit.startsWith(nextPathSplit) && + (currentPathSplit.length === nextPathSplit.length || + currentPathSplit[nextPathSplit.length] === '/') + + if (!pathIsFuzzyEqual) { + return false + } + } + + const includeSearch = activeOptions?.includeSearch ?? true + if (includeSearch) { + if (currentLocation.search !== next.search) { + const currentSearchEmpty = + !currentLocation.search || + (typeof currentLocation.search === 'object' && + !hasKeys(currentLocation.search)) + const nextSearchEmpty = + !next.search || + (typeof next.search === 'object' && + !hasKeys(next.search as Record)) + + if (!(currentSearchEmpty && nextSearchEmpty)) { + const searchTest = deepEqual(currentLocation.search, next.search, { + partial: !exact, + ignoreUndefined: !activeOptions?.explicitUndefined, + }) + if (!searchTest) { + return false + } + } + } + } + + // Hash is not available on the server + if (activeOptions?.includeHash) { + return false + } + + return true + })() + + if (externalLink) { + return { + ...propsSafeToSpread, + ref: innerRef as React.ComponentPropsWithRef<'a'>['ref'], + href: externalLink, + ...(children && { children }), + ...(target && { target }), + ...(disabled && { disabled }), + ...(style && { style }), + ...(className && { className }), + } + } + + const resolvedActiveProps: React.HTMLAttributes = + isActive + ? (functionalUpdate(activeProps as any, {}) ?? STATIC_ACTIVE_OBJECT) + : STATIC_EMPTY_OBJECT + + const resolvedInactiveProps: React.HTMLAttributes = + isActive + ? STATIC_EMPTY_OBJECT + : (functionalUpdate(inactiveProps, {}) ?? STATIC_EMPTY_OBJECT) + + const resolvedStyle = (() => { + const baseStyle = style + const activeStyle = resolvedActiveProps.style + const inactiveStyle = resolvedInactiveProps.style + + if (!baseStyle && !activeStyle && !inactiveStyle) { + return undefined + } + + if (baseStyle && !activeStyle && !inactiveStyle) { + return baseStyle + } + + if (!baseStyle && activeStyle && !inactiveStyle) { + return activeStyle + } + + if (!baseStyle && !activeStyle && inactiveStyle) { + return inactiveStyle + } + + return { + ...baseStyle, + ...activeStyle, + ...inactiveStyle, + } + })() + + const resolvedClassName = (() => { + const baseClassName = className + const activeClassName = resolvedActiveProps.className + const inactiveClassName = resolvedInactiveProps.className + + if (!baseClassName && !activeClassName && !inactiveClassName) { + return '' + } + + let out = '' + + if (baseClassName) { + out = baseClassName + } + + if (activeClassName) { + out = out ? `${out} ${activeClassName}` : activeClassName + } + + if (inactiveClassName) { + out = out ? `${out} ${inactiveClassName}` : inactiveClassName + } + + return out + })() + + return { + ...propsSafeToSpread, + ...resolvedActiveProps, + ...resolvedInactiveProps, + href: hrefOption, + ref: innerRef as React.ComponentPropsWithRef<'a'>['ref'], + disabled: !!linkDisabled, + target, + ...(resolvedStyle && { style: resolvedStyle }), + ...(resolvedClassName && { className: resolvedClassName }), + ...(linkDisabled && STATIC_DISABLED_PROPS), + ...(isActive && STATIC_ACTIVE_PROPS), + } } // ========================================================================== @@ -204,148 +391,80 @@ 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 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: LinkRef = React.useRef(null) - // eslint-disable-next-line react-hooks/rules-of-hooks - const mergedRef = React.useCallback( - (element: Element | null) => { - innerRef.current = element - if (typeof forwardedRef === 'function') { - return forwardedRef(element) - } - if (forwardedRef) { - forwardedRef.current = element - } - return undefined - }, - [forwardedRef], - ) - - const { - activeOptions, - to, - preload: userPreload, - preloadDelay: userPreloadDelay, - disabled, - target, - onClick, - onBlur, - onFocus, - onMouseEnter, - onMouseLeave, - onTouchStart, - } = options as typeof options & { to?: string } + const isHydrated = useHydrated() // eslint-disable-next-line react-hooks/rules-of-hooks - const [stableSearch, stableParams, stableActiveOptions] = useStableValues( - options.search, - options.params, - activeOptions, - ) - // The links of a route share its location source. Links outside every - // match share one that never departs. + const stableSearch = useValueStable(options.search) // eslint-disable-next-line react-hooks/rules-of-hooks - const routeId = React.useContext(matchContext) - const scope = ((router.stores._linkScopes ??= {})[routeId!] ??= - createLinkScope(router, routeId)) - - // `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. + const stableParams = useValueStable(options.params) // eslint-disable-next-line react-hooks/rules-of-hooks - 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 - } - - 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) - - // 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 + const stableActiveOptions = useValueStable(activeOptions) + // eslint-disable-next-line react-hooks/rules-of-hooks + const _options = React.useMemo( + () => options, // 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, - ]) + [ + router, + options.from, + options._fromLocation, + options.hash, + options.to, + stableSearch, + stableParams, + options.state, + options.mask, + options.unsafeRelative, + ], + ) + + // 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. + // 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 next = router.buildLocation({ + _fromLocation: location, + ..._options, + } as any) + + // 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, router, to], + ) // eslint-disable-next-line react-hooks/rules-of-hooks - const [href, isActive] = React.useSyncExternalStore( - scope[1 /* subscribe */], - getLinkState, - getHydrationState || getLinkState, + const [href, isActive] = useStore( + router.stores.location, + selectLinkState, + compareLinkState, ) - const externalLink = isActive === undefined && href + const externalLink = isActive === undefined ? href : undefined const linkDisabled = disabled || href === undefined // eslint-disable-next-line react-hooks/rules-of-hooks @@ -358,86 +477,111 @@ export function useLinkProps< const preloadDelay = userPreloadDelay ?? router.options.defaultPreloadDelay ?? 0 - // `preloadRoute` builds the location itself and only reads the options, so - // `dest` goes through as-is. + // eslint-disable-next-line react-hooks/rules-of-hooks + const doPreload = React.useCallback(() => { + // `preloadRoute` builds the location itself; it is no longer held in render + // state. It only reads the options, so `_options` can go through as-is. + router.preloadRoute(_options as any).catch((err) => { + console.warn(err) + console.warn(preloadWarning) + }) + }, [router, _options]) + // eslint-disable-next-line react-hooks/rules-of-hooks const enqueuePreload = React.useCallback( (e?: React.MouseEvent | React.FocusEvent | IntersectionObserverEntry) => { - const isIntersecting = (e as IntersectionObserverEntry | undefined) - ?.isIntersecting - if (!(isIntersecting ?? preload === 'intent')) { - if (isIntersecting === false) { + if (!e) { + cancelPreload(innerRef) + return + } + + if ( + !( + (e as IntersectionObserverEntry).isIntersecting ?? + preload === 'intent' + ) + ) { + if ((e as IntersectionObserverEntry).isIntersecting === false) { cancelPreload(innerRef) } return } if (!preloadDelay) { - preloadLink(router, dest) + doPreload() return } - innerRef.t ??= setTimeout(() => { - innerRef.t = undefined - preloadLink(router, dest) - }, preloadDelay) + if (timeoutMap.has(innerRef)) { + return + } + + timeoutMap.set( + innerRef, + setTimeout(() => { + timeoutMap.delete(innerRef) + doPreload() + }, preloadDelay), + ) }, - [router, dest, innerRef, preload, preloadDelay], + [doPreload, innerRef, preload, preloadDelay], ) - // Preload side effects: `render` preloads once per link, `viewport` watches - // the element. The cleanup also cancels a pending intent timer. + // eslint-disable-next-line react-hooks/rules-of-hooks + useIntersectionObserver(innerRef, enqueuePreload, preload !== 'viewport') + // eslint-disable-next-line react-hooks/rules-of-hooks React.useEffect(() => { - // Disabled preloading creates neither an observer nor an intent timer. - if (!preload) { + if (hasRenderFetched.current) { return } - if (preload === 'render' && !hasRenderFetched.current) { + if (preload === 'render') { + doPreload() hasRenderFetched.current = true - preloadLink(router, dest) } - let active = true - let observer: IntersectionObserver | undefined - if ( - preload === 'viewport' && - innerRef.current && - typeof IntersectionObserver === 'function' - ) { - observer = new IntersectionObserver( - (entries) => { - // A queued observer notification can arrive after disconnect(). - if (active) { - enqueuePreload(entries.pop()) - } - }, - { rootMargin: '100px' }, - ) - observer.observe(innerRef.current) - } - return () => { - active = false - observer?.disconnect() - cancelPreload(innerRef) - } - }, [router, dest, preload, enqueuePreload, innerRef]) + }, [doPreload, preload]) - const props = collectElementProps(options, host) - props.ref = forwardedRef ? mergedRef : innerRef - // External links get no router behavior: element props pass through as given. if (externalLink) { - props.href = externalLink - return props + return { + ...propsSafeToSpread, + ref: innerRef as React.ComponentPropsWithRef<'a'>['ref'], + href: externalLink, + ...(children && { children }), + ...(target && { target }), + ...(disabled && { disabled }), + ...(style && { style }), + ...(className && { className }), + ...(onClick && { onClick }), + ...(onBlur && { onBlur }), + ...(onFocus && { onFocus }), + ...(onMouseEnter && { onMouseEnter }), + ...(onMouseLeave && { onMouseLeave }), + ...(onTouchStart && { onTouchStart }), + } } + // Only one state contributes props, so resolve and merge it once. + const resolvedStateProps: React.HTMLAttributes = + functionalUpdate(isActive ? (activeProps as any) : inactiveProps, {}) ?? + (isActive ? STATIC_ACTIVE_OBJECT : STATIC_EMPTY_OBJECT) + + const stateClassName = resolvedStateProps.className + const resolvedClassName = className + ? stateClassName + ? `${className} ${stateClassName}` + : className + : stateClassName + const stateStyle = resolvedStateProps.style + const resolvedStyle = + style && stateStyle ? { ...style, ...stateStyle } : style || stateStyle + // The click handler const handleClick = (e: React.MouseEvent) => { - // The element's own target attribute is the fallback. - const effectiveTarget = - target ?? - (e.currentTarget as HTMLAnchorElement | SVGAElement).getAttribute( - 'target', - ) + // Check actual element's target attribute as fallback + const elementTarget = ( + e.currentTarget as HTMLAnchorElement | SVGAElement + ).getAttribute('target') + const effectiveTarget = target !== undefined ? target : elementTarget if ( !linkDisabled && @@ -447,19 +591,24 @@ export function useLinkProps< e.button === 0 ) { e.preventDefault() - cancelPreload(innerRef) - // 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 }) + // 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, + }) } } const handleTouchStart = () => { - if (preload === 'intent') { - preloadLink(router, dest) - } + if (preload !== 'intent') return + doPreload() } const handleLeave = () => { @@ -468,185 +617,35 @@ export function useLinkProps< } } - props.onClick = composeHandlers(onClick, handleClick) - props.onBlur = composeHandlers(onBlur, handleLeave) - props.onFocus = composeHandlers(onFocus, enqueuePreload) - props.onMouseEnter = composeHandlers(onMouseEnter, enqueuePreload) - props.onMouseLeave = composeHandlers(onMouseLeave, handleLeave) - props.onTouchStart = composeHandlers(onTouchStart, handleTouchStart) - return applyLinkState(props, options, isActive, href, linkDisabled, host) + return { + ...propsSafeToSpread, + ...resolvedStateProps, + href, + ref: innerRef as React.ComponentPropsWithRef<'a'>['ref'], + onClick: composeHandlers(onClick, handleClick), + onBlur: composeHandlers(onBlur, handleLeave), + onFocus: composeHandlers(onFocus, enqueuePreload), + onMouseEnter: composeHandlers(onMouseEnter, enqueuePreload), + onMouseLeave: composeHandlers(onMouseLeave, handleLeave), + onTouchStart: composeHandlers(onTouchStart, handleTouchStart), + disabled: !!linkDisabled, + target, + ...(resolvedStyle && { style: resolvedStyle }), + ...(resolvedClassName && { className: resolvedClassName }), + ...(linkDisabled && STATIC_DISABLED_PROPS), + ...(isActive && STATIC_ACTIVE_PROPS), + } } const STATIC_EMPTY_OBJECT = {} const STATIC_ACTIVE_OBJECT = { className: 'active' } -// Options the router consumes; they never reach the element. Every other -// option is an element prop and passes through. -const ROUTER_OPTION_KEYS = /* @__PURE__ */ new Set([ - 'to', - 'params', - 'search', - 'hash', - 'state', - 'mask', - 'from', - 'unsafeRelative', - 'reloadDocument', - 'preload', - 'preloadDelay', - 'preloadIntentProximity', - 'hashScrollIntoView', - 'replace', - 'startTransition', - 'resetScroll', - 'viewTransition', - 'ignoreBlocker', - 'activeProps', - 'inactiveProps', - 'activeOptions', - '_asChild', -]) +const STATIC_DISABLED_PROPS = { role: 'link', 'aria-disabled': true } +const STATIC_ACTIVE_PROPS = { 'data-status': 'active', 'aria-current': 'page' } -// Copies the element props. An object rest would test every key against the -// whole exclusion list; the key set is much cheaper. `Link` hosts never render -// `type`, and an anchor has no `disabled` attribute. -function collectElementProps( - options: object, - host: 'a' | React.ElementType | undefined, -): Record { - const props: Record = {} - for (const key in options) { - if ( - ROUTER_OPTION_KEYS.has(key) || - (key === 'type' && host !== undefined) || - (key === 'disabled' && host === 'a') - ) { - continue - } - props[key] = (options as Record)[key] - } - return props -} - -// Finishes a router-controlled link: the selected state props, then the -// routing attributes. This is the one place that defines precedence: state -// props override element props, `ref` and handlers; `href`, `disabled`, -// `target` and the merged class and style always win. -function applyLinkState( - props: Record, - options: { - activeProps?: unknown - inactiveProps?: unknown - className?: string - style?: React.CSSProperties - target?: string - }, - isActive: boolean | undefined, - href: string | undefined, - linkDisabled: boolean, - host: 'a' | React.ElementType | undefined, -): React.ComponentPropsWithRef<'a'> { - const { activeProps, inactiveProps, className, style, target } = options - const stateProps: React.HTMLAttributes = - functionalUpdate((isActive ? activeProps : inactiveProps) as any, {}) ?? - (isActive ? STATIC_ACTIVE_OBJECT : STATIC_EMPTY_OBJECT) - Object.assign(props, stateProps) - props.href = href - if (host !== 'a') { - props.disabled = linkDisabled - } - props.target = target - // Merge class and style with the state's. Links without either keep their - // props as given and carry no `undefined` keys. - const stateStyle = stateProps.style - if (style || stateStyle) { - props.style = - style && stateStyle ? { ...style, ...stateStyle } : style || stateStyle - } - const stateClassName = stateProps.className - if (className || stateClassName) { - props.className = className - ? stateClassName - ? `${className} ${stateClassName}` - : className - : stateClassName - } - if (linkDisabled) { - props.role = 'link' - props['aria-disabled'] = true - } - if (isActive) { - props['data-status'] = 'active' - props['aria-current'] = 'page' - } - return props -} - -// Server render of a Link: static props only, no hooks. Only server bundles -// keep this function; the `isServer` check that calls it folds away on the client. -function getServerLinkProps( - router: AnyRouter, - options: any, - forwardedRef: React.ForwardedRef | undefined, - host: 'a' | React.ElementType | undefined, -): React.ComponentPropsWithRef<'a'> { - const { to, disabled, activeOptions } = options as { - to: string | undefined - disabled: boolean | undefined - activeOptions: ActiveOptions | undefined - } - - const directExternalLink = resolveExternalLink(to, router.protocolAllowlist) - - // Direct-scheme links need no route resolution. Blocked links still use - // the shared inactive-prop merge so their server and client markup agree. - const next = - directExternalLink === undefined ? router.buildLocation(options) : undefined - - const hrefOption = next - ? getHrefOption(next, router, disabled) - : (directExternalLink ?? undefined) - const linkDisabled = disabled || !hrefOption - - const externalLink = - directExternalLink ?? - (hrefOption && getUrlScheme(hrefOption) ? hrefOption : undefined) - - const props = collectElementProps(options, host) - props.ref = forwardedRef - if (externalLink) { - props.href = externalLink - return props - } - - const blockedLink = !disabled && !hrefOption - // 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, - ) - return applyLinkState( - props, - options, - isActive, - hrefOption, - linkDisabled, - host, - ) -} - -// 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 +const timeoutMap = new WeakMap>() +const cancelPreload = (eventTarget: object) => { + clearTimeout(timeoutMap.get(eventTarget)) + timeoutMap.delete(eventTarget) } export const composeHandlers = ( @@ -844,52 +843,29 @@ export function createLink( * @returns An anchor-like element that navigates without full page reloads. * @link https://tanstack.com/router/latest/docs/framework/react/api/router/linkComponent */ -export const Link: LinkComponent<'a'> = React.memo( - React.forwardRef((props, ref) => { - const host = props._asChild || 'a' - const linkProps = useLinkProps(props as any, ref, host) +export const Link: LinkComponent<'a'> = React.forwardRef( + (props, ref) => { + const { _asChild, ...rest } = props + // eslint-disable-next-line prefer-const -- The rest binding is reassigned below. + let { type: _type, ...linkProps } = useLinkProps(rest as any, ref) const children = - typeof props.children === 'function' - ? props.children({ + typeof rest.children === 'function' + ? rest.children({ isActive: (linkProps as any)['data-status'] === 'active', }) - : props.children + : rest.children - return React.createElement(host, linkProps, children) - }), - areLinkPropsEqual, + if (!_asChild) { + // the ReturnType of useLinkProps returns the correct type for a element, not a general component that has a disabled prop + // @ts-expect-error + const { disabled: _, ...rest } = linkProps + linkProps = rest + } + return React.createElement(_asChild || 'a', linkProps, children) + }, ) as any -// 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 -// they may hold arbitrary (even cyclic) data. -function areLinkPropsEqual( - prev: Record, - next: Record, -): boolean { - let extraKeys = 0 - for (const key in next) { - extraKeys++ - if (prev[key] === next[key]) { - continue - } - if ( - !ROUTER_OPTION_KEYS.has(key) || - !deepEqual(prev[key], next[key], false, true) - ) { - return false - } - } - for (const _key in prev) { - extraKeys-- - } - return extraKeys === 0 -} - export type LinkOptionsFnOptions< TOptions, TComp, diff --git a/packages/react-router/src/matchContext.tsx b/packages/react-router/src/matchContext.tsx index 12db4dbada..a7030847e1 100644 --- a/packages/react-router/src/matchContext.tsx +++ b/packages/react-router/src/matchContext.tsx @@ -1,70 +1,6 @@ '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/src/not-found.tsx b/packages/react-router/src/not-found.tsx index 3c5287cb2e..458a30520b 100644 --- a/packages/react-router/src/not-found.tsx +++ b/packages/react-router/src/not-found.tsx @@ -1,7 +1,7 @@ import * as React from 'react' import { isNotFound } from '@tanstack/router-core' import { isServer } from '@tanstack/router-core/isServer' -import { useSelector } from '@tanstack/react-store' +import { useStore } from '@tanstack/react-store' import { CatchBoundary } from './CatchBoundary' import { useRouter } from './useRouter' import type { ErrorInfo } from 'react' @@ -44,12 +44,12 @@ export function CatchNotFound(props: { // TODO: Some way for the user to programmatically reset the not-found boundary? // eslint-disable-next-line react-hooks/rules-of-hooks -- condition is static - const pathname = useSelector( + const pathname = useStore( router.stores.location, (location) => location.pathname, ) // eslint-disable-next-line react-hooks/rules-of-hooks -- condition is static - const status = useSelector(router.stores.status) + const status = useStore(router.stores.status, (status) => status) const resetKey = `not-found-${pathname}-${status}` return ( diff --git a/packages/react-router/src/ssr/renderRouterToStream.tsx b/packages/react-router/src/ssr/renderRouterToStream.tsx index b55fc35405..abfe36b86d 100644 --- a/packages/react-router/src/ssr/renderRouterToStream.tsx +++ b/packages/react-router/src/ssr/renderRouterToStream.tsx @@ -1,15 +1,46 @@ -import { PassThrough, Readable } from 'node:stream' +import { PassThrough } from 'node:stream' import ReactDOMServer from 'react-dom/server' import { isbot } from 'isbot' import { createSsrStreamResponse, - getSsrStatus, + transformPipeableStreamWithRouter, transformReadableStreamWithRouter, - waitForRequest, } from '@tanstack/router-core/ssr/server' import type { AnyRouter } from '@tanstack/router-core' +import type { ReadableStream } from 'node:stream/web' import type { ReactNode } from 'react' +const noop = () => {} + +// Bot responses wait for `allReady` so crawlers receive complete HTML. +// If the request disconnects during that wait, React may not settle quickly; +// unblock the wait so the response pipeline can abort and clean up. +async function waitForReadyOrAbort( + ready: Promise, + signal: AbortSignal, +) { + let cleanup = noop + try { + await Promise.race([ + ready, + new Promise((resolve) => { + const onAbort = () => resolve() + cleanup = () => signal.removeEventListener('abort', onAbort) + signal.addEventListener('abort', onAbort, { once: true }) + if (signal.aborted) resolve() + }), + ]) + } finally { + cleanup() + } +} + +// A client disconnecting mid-stream is normal operation, not a render +// failure; don't let React's onError log it as one. +const isAbortError = (request: Request, error: unknown) => + (request.signal.aborted && error === request.signal.reason) || + (error instanceof Error && error.name === 'AbortError') + export const renderRouterToStream = async ({ request, router, @@ -21,116 +52,169 @@ export const renderRouterToStream = async ({ responseHeaders: Headers children: ReactNode }) => { - const signal = request.signal - if (signal.aborted) { - router.serverSsr?.cleanup() - throw signal.reason - } - let rendererTeardown = false - const bot = isbot(request.headers.get('User-Agent')) - const onError = - ( - renderer: string, - ): ReactDOMServer.RenderToPipeableStreamOptions['onError'] => - (error, info) => { - if (!rendererTeardown && !signal.aborted) { - console.error(`Error in ${renderer}:`, error, info) - } + if (typeof ReactDOMServer.renderToReadableStream === 'function') { + const stream = await ReactDOMServer.renderToReadableStream(children, { + signal: request.signal, + nonce: router.options.ssr?.nonce, + progressiveChunkSize: Number.POSITIVE_INFINITY, + onError: (error, info) => { + if (!isAbortError(request, error)) { + console.error('Error in renderToReadableStream:', error, info) + } + }, + }) + + if (isbot(request.headers.get('User-Agent'))) { + await waitForReadyOrAbort(stream.allReady, request.signal) } - try { - if (typeof ReactDOMServer.renderToReadableStream === 'function') { - const stream = await ReactDOMServer.renderToReadableStream(children, { - signal, + const responseStream = transformReadableStreamWithRouter( + router, + stream as unknown as ReadableStream, + { + signal: request.signal, + onAbort: () => stream.cancel().catch(() => {}), + }, + ) + return createSsrStreamResponse( + router, + new Response(responseStream as any, { + status: + router._serverResult?.type === 'render' + ? router._serverResult.status + : 200, + headers: responseHeaders, + }), + ) + } + + if (typeof ReactDOMServer.renderToPipeableStream === 'function') { + const reactAppPassthrough = new PassThrough() + + let pipeable: + | ReturnType + | undefined + let responseAttached = false + let aborted = false + let endedBeforeAttach = false + let pendingAbortReason: unknown + const toError = (reason: unknown) => + reason instanceof Error + ? reason + : new Error(String(reason ?? 'SSR aborted')) + const destroyError = (reason: unknown) => + reason === undefined ? undefined : toError(reason) + const pendingDestroyError = () => + pendingAbortReason === undefined + ? toError(pendingAbortReason) + : destroyError(pendingAbortReason) + const finishPassThrough = ( + reason: unknown, + opts?: { defaultError?: boolean }, + ) => { + if (reactAppPassthrough.destroyed) return + if (responseAttached) { + reactAppPassthrough.destroy( + opts?.defaultError ? toError(reason) : destroyError(reason), + ) + } else { + endedBeforeAttach = true + // onError can fire synchronously before React returns the pipeable + // handle and before Readable.toWeb() is attached. Defer touching the + // PassThrough until after the router transform can observe the error. + } + } + const abortPipeable = ( + reason?: unknown, + opts?: { defaultError?: boolean }, + ) => { + if (aborted) return + aborted = true + pendingAbortReason = reason + const err = toError(reason) + try { + pipeable?.abort(err) + } catch { + // ignore — React may throw if already aborted/finished + } + finishPassThrough(reason, opts) + } + + // Register before attaching the router transform; the transform may + // synchronously cleanup/error, and cleanup must still remove this listener. + if (request.signal.aborted) { + abortPipeable(request.signal.reason) + } else { + const onRequestAbort = () => abortPipeable(request.signal.reason) + request.signal.addEventListener('abort', onRequestAbort, { once: true }) + router.serverSsr?.onCleanup(() => { + request.signal.removeEventListener('abort', onRequestAbort) + }) + } + + try { + pipeable = ReactDOMServer.renderToPipeableStream(children, { nonce: router.options.ssr?.nonce, progressiveChunkSize: Number.POSITIVE_INFINITY, - onError: onError('renderToReadableStream'), - }) - // The transform owns the reader and bounds bot readiness by its lifetime. - const rendererAbort = bot ? new AbortController() : undefined - const responseStream = transformReadableStreamWithRouter(router, stream, { - rendererSafePoint: 'script-close', - signal, - onAbort: (reason) => { - rendererTeardown = true - rendererAbort?.abort(reason) + ...(isbot(request.headers.get('User-Agent')) + ? { + onAllReady() { + pipeable!.pipe(reactAppPassthrough) + }, + } + : { + onShellReady() { + pipeable!.pipe(reactAppPassthrough) + }, + }), + onError: (error, info) => { + if (!isAbortError(request, error)) { + console.error('Error in renderToPipeableStream:', error, info) + } + abortPipeable(error, { defaultError: true }) }, }) - if (rendererAbort) { - await waitForRequest(stream.allReady, rendererAbort.signal) - } - return createSsrStreamResponse( - router, - new Response(responseStream, { - status: getSsrStatus(router), - headers: responseHeaders, - }), - ) + } catch (e) { + console.error('Error in renderToPipeableStream:', e) + router.serverSsr?.cleanup() + throw e } - if (typeof ReactDOMServer.renderToPipeableStream === 'function') { - const reactAppPassthrough = new PassThrough() - let pipeable: - | ReturnType - | undefined - let resolveReady!: () => void - const ready = new Promise((resolve) => { - resolveReady = resolve - }) - const rendererAbort = new AbortController() - const abortPipeable = (reason?: unknown) => { - if (rendererTeardown) { - return - } - rendererTeardown = true - rendererAbort.abort(reason) - try { - pipeable?.abort(reason) - } catch { - // ignore — React may throw if already aborted/finished - } - } - try { - pipeable = ReactDOMServer.renderToPipeableStream(children, { - nonce: router.options.ssr?.nonce, - progressiveChunkSize: Number.POSITIVE_INFINITY, - ...(bot - ? { onAllReady: resolveReady } - : { onShellReady: resolveReady }), - onError: onError('renderToPipeableStream'), - onShellError: (error) => rendererAbort.abort(error), - }) - const responseStream = transformReadableStreamWithRouter( - router, - Readable.toWeb(reactAppPassthrough), - { - rendererSafePoint: 'script-close', - signal, - onAbort: abortPipeable, - }, - ) + const responseStream = transformPipeableStreamWithRouter( + router, + reactAppPassthrough, + { signal: request.signal, onAbort: abortPipeable }, + ) + responseAttached = true - await waitForRequest(ready, rendererAbort.signal) - pipeable.pipe(reactAppPassthrough) + if (endedBeforeAttach) { + reactAppPassthrough.destroy(pendingDestroyError()) + } - return createSsrStreamResponse( - router, - new Response(responseStream, { - status: getSsrStatus(router), - headers: responseHeaders, - }), - ) - } catch (error) { - abortPipeable(error) - throw error + // React's onError may have fired synchronously inside + // renderToPipeableStream before `pipeable` was assigned. If so, + // abortPipeable ran without a pipeable handle; re-apply the abort now. + if (aborted && pipeable) { + try { + pipeable.abort(toError(pendingAbortReason)) + } catch { + // ignore — React may throw if already aborted/finished } } - throw new Error( - 'No renderToReadableStream or renderToPipeableStream found in react-dom/server. Ensure you are using a version of react-dom that supports streaming.', + return createSsrStreamResponse( + router, + new Response(responseStream as any, { + status: + router._serverResult?.type === 'render' + ? router._serverResult.status + : 200, + headers: responseHeaders, + }), ) - } catch (error) { - router.serverSsr?.cleanup() - throw error } + + throw new Error( + 'No renderToReadableStream or renderToPipeableStream found in react-dom/server. Ensure you are using a version of react-dom that supports streaming.', + ) } diff --git a/packages/react-router/src/ssr/renderRouterToString.tsx b/packages/react-router/src/ssr/renderRouterToString.tsx index 4b2faa2409..5e299cc215 100644 --- a/packages/react-router/src/ssr/renderRouterToString.tsx +++ b/packages/react-router/src/ssr/renderRouterToString.tsx @@ -1,5 +1,4 @@ import ReactDOMServer from 'react-dom/server' -import { renderSsrHtmlResponse } from '@tanstack/router-core/ssr/server' import type { ReactNode } from 'react' import type { AnyRouter } from '@tanstack/router-core' @@ -12,9 +11,29 @@ export const renderRouterToString = async ({ responseHeaders: Headers children: ReactNode }) => { - return renderSsrHtmlResponse({ - router, - responseHeaders, - render: () => ReactDOMServer.renderToString(children), - }) + try { + let html = ReactDOMServer.renderToString(children) + router.serverSsr!.setRenderFinished() + + const injectedHtml = router.serverSsr!.takeBufferedHtml() + if (injectedHtml) { + html = html.replace(``, () => `${injectedHtml}`) + } + + return new Response(`${html}`, { + status: + router._serverResult?.type === 'render' + ? router._serverResult.status + : 200, + headers: responseHeaders, + }) + } catch (error) { + console.error('Render to string error:', error) + return new Response('Internal Server Error', { + status: 500, + headers: responseHeaders, + }) + } finally { + router.serverSsr?.cleanup() + } } diff --git a/packages/react-router/src/useCanGoBack.ts b/packages/react-router/src/useCanGoBack.ts index 2a8ce612b1..a20f947f43 100644 --- a/packages/react-router/src/useCanGoBack.ts +++ b/packages/react-router/src/useCanGoBack.ts @@ -1,4 +1,4 @@ -import { useSelector } from '@tanstack/react-store' +import { useStore } from '@tanstack/react-store' import { isServer } from '@tanstack/router-core/isServer' import { useRouter } from './useRouter' @@ -10,7 +10,7 @@ export function useCanGoBack() { } // eslint-disable-next-line react-hooks/rules-of-hooks -- condition is static - return useSelector( + return useStore( router.stores.location, (location) => location.state.__TSR_index !== 0, ) diff --git a/packages/react-router/src/useLocation.tsx b/packages/react-router/src/useLocation.tsx index 5fa39fa92e..5c8c7c8d7e 100644 --- a/packages/react-router/src/useLocation.tsx +++ b/packages/react-router/src/useLocation.tsx @@ -1,6 +1,6 @@ 'use client' -import { useSelector } from '@tanstack/react-store' +import { useStore } from '@tanstack/react-store' import { isServer } from '@tanstack/router-core/isServer' import { useRouter } from './useRouter' import { useStructuralSharing } from './useMatch' @@ -60,7 +60,7 @@ export function useLocation< } // eslint-disable-next-line react-hooks/rules-of-hooks -- condition is static - return useSelector( + return useStore( router.stores.location, // eslint-disable-next-line react-hooks/rules-of-hooks -- condition is static useStructuralSharing(opts, router), diff --git a/packages/react-router/src/useMatch.tsx b/packages/react-router/src/useMatch.tsx index 95a4aaa286..d66a69f640 100644 --- a/packages/react-router/src/useMatch.tsx +++ b/packages/react-router/src/useMatch.tsx @@ -1,7 +1,7 @@ 'use client' import * as React from 'react' -import { useSelector } from '@tanstack/react-store' +import { useStore } from '@tanstack/react-store' import { invariant, replaceEqualDeep } from '@tanstack/router-core' import { isServer } from '@tanstack/router-core/isServer' import { dummyMatchContext, matchContext } from './matchContext' @@ -174,7 +174,7 @@ export function useMatch< useStructuralSharing(opts, router) // eslint-disable-next-line react-hooks/rules-of-hooks -- condition is static - const matchSelection = useSelector(matchStore, (match) => + const matchSelection = useStore(matchStore, (match) => match ? selector(match as any) : dummyMatch, ) diff --git a/packages/react-router/src/useRouter.tsx b/packages/react-router/src/useRouter.tsx index 6708274c11..925cba411e 100644 --- a/packages/react-router/src/useRouter.tsx +++ b/packages/react-router/src/useRouter.tsx @@ -18,18 +18,12 @@ export function useRouter(opts?: { warn?: boolean }): TRouter { const value = React.useContext(routerContext) - if (!value) { - warnMissingRouter(opts) + if (process.env.NODE_ENV !== 'production') { + if ((opts?.warn ?? true) && !value) { + console.warn( + 'Warning: useRouter must be used inside a component!', + ) + } } return value as any } - -// Kept out of the hook body: this dev-only branch runs for every Link and -// route hook, and on the server each `process.env` read is a native call. -function warnMissingRouter(opts?: { warn?: boolean }) { - if (process.env.NODE_ENV !== 'production' && (opts?.warn ?? true)) { - console.warn( - 'Warning: useRouter must be used inside a component!', - ) - } -} diff --git a/packages/react-router/src/useRouterState.tsx b/packages/react-router/src/useRouterState.tsx index fa17ee9f59..f3fbb2ad6e 100644 --- a/packages/react-router/src/useRouterState.tsx +++ b/packages/react-router/src/useRouterState.tsx @@ -1,6 +1,6 @@ 'use client' -import { useSelector } from '@tanstack/react-store' +import { useStore } from '@tanstack/react-store' import { isServer } from '@tanstack/router-core/isServer' import { useRouter } from './useRouter' import { useStructuralSharing } from './useMatch' @@ -69,7 +69,7 @@ export function useRouterState< } // eslint-disable-next-line react-hooks/rules-of-hooks -- condition is static - return useSelector( + return useStore( router.stores.__store, // eslint-disable-next-line react-hooks/rules-of-hooks -- condition is static useStructuralSharing(opts, router), diff --git a/packages/react-router/src/utils.ts b/packages/react-router/src/utils.ts index 7887761993..b650e34388 100644 --- a/packages/react-router/src/utils.ts +++ b/packages/react-router/src/utils.ts @@ -57,3 +57,75 @@ export function usePrevious(value: T): T | null { // return the previous value only return ref.current.prev } + +/** + * React hook to wrap `IntersectionObserver`. + * + * This hook will create an `IntersectionObserver` and observe the ref passed to it. + * + * When the intersection changes, the callback will be called with the `IntersectionObserverEntry`. + * + * @param ref - The ref to observe + * @param callback - The callback to call when the intersection changes + * @param disabled - Whether observation is disabled + * @returns The IntersectionObserver instance + * @example + * ```tsx + * const MyComponent = () => { + * const ref = React.useRef(null) + * useIntersectionObserver( + * ref, + * (entry) => { doSomething(entry) }, + * false + * ) + * return
+ * ``` + */ +export function useIntersectionObserver( + ref: React.RefObject, + callback: (entry?: IntersectionObserverEntry) => void, + disabled?: boolean, +) { + React.useEffect(() => { + if ( + !ref.current || + disabled || + typeof IntersectionObserver !== 'function' + ) { + return () => callback() + } + + const observer = new IntersectionObserver( + (entries) => { + callback(entries.pop()) + }, + { rootMargin: '100px' }, + ) + + observer.observe(ref.current) + + return () => { + observer.disconnect() + callback() + } + }, [callback, disabled, ref]) +} + +/** + * React hook to take a `React.ForwardedRef` and returns a `ref` that can be used on a DOM element. + * + * @param ref - The forwarded ref + * @returns The inner ref returned by `useRef` + * @example + * ```tsx + * const MyComponent = React.forwardRef((props, ref) => { + * const innerRef = useForwardedRef(ref) + * return
+ * }) + * ``` + */ +export function useForwardedRef(ref?: React.ForwardedRef) { + const innerRef = React.useRef(null) + React.useImperativeHandle(ref, () => innerRef.current!, []) + return innerRef +} diff --git a/packages/react-router/tests/Scripts.test.tsx b/packages/react-router/tests/Scripts.test.tsx index 976410cba5..893cef01bc 100644 --- a/packages/react-router/tests/Scripts.test.tsx +++ b/packages/react-router/tests/Scripts.test.tsx @@ -547,35 +547,6 @@ 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' @@ -774,7 +745,7 @@ describe('ssr HeadContent', () => { ).toBe('.runtime{color:red}') }) - test('renders iife manifest preloads as low priority script links', async () => { + test('renders preload as script links for iife manifest preloads', async () => { const history = createTestBrowserHistory() const preloadHref = '/iife-preload.js' @@ -824,13 +795,6 @@ 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 3ed3c3039e..60d1e8a821 100644 --- a/packages/react-router/tests/blocker.test.tsx +++ b/packages/react-router/tests/blocker.test.tsx @@ -1,4 +1,5 @@ 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/errorComponent.test.tsx b/packages/react-router/tests/errorComponent.test.tsx index 441610a2e7..442a94bc10 100644 --- a/packages/react-router/tests/errorComponent.test.tsx +++ b/packages/react-router/tests/errorComponent.test.tsx @@ -8,7 +8,6 @@ import { Link, Outlet, RouterProvider, - Scripts, createBrowserHistory, createControlledPromise, createLazyRoute, @@ -529,16 +528,6 @@ test.each(['beforeLoad', 'loader'] as const)( test('SSR errorComponent receives primitive errors thrown from beforeLoad', async () => { const rootRoute = createRootRoute({ - shellComponent: function RootDocument({ children }) { - return ( - - - {children} - - - - ) - }, component: function Root() { return }, @@ -728,19 +717,7 @@ test('SSR renders a later fresh ancestor loader failure', async () => { const parentGate = createControlledPromise() const childGate = createControlledPromise() const childSettled = createControlledPromise() - const rootRoute = createRootRoute({ - shellComponent: function RootDocument({ children }) { - return ( - - - {children} - - - - ) - }, - component: Outlet, - }) + const rootRoute = createRootRoute({ component: Outlet }) const parentRoute = createRoute({ getParentRoute: () => rootRoute, path: '/parent', @@ -805,10 +782,7 @@ test('#4684: SSR renders head content when beforeLoad throws', async () => { - - {children} - - + {children} ) }, diff --git a/packages/react-router/tests/issue-2072-context-invalidate.test.tsx b/packages/react-router/tests/issue-2072-context-invalidate.test.tsx deleted file mode 100644 index 41b2c11608..0000000000 --- a/packages/react-router/tests/issue-2072-context-invalidate.test.tsx +++ /dev/null @@ -1,157 +0,0 @@ -import * as React from 'react' -import { cleanup, fireEvent, render, screen } from '@testing-library/react' -import { afterEach, expect, test } from 'vitest' -import { - RouterProvider, - createMemoryHistory, - createRootRouteWithContext, - createRoute, - createRouter, - redirect, -} from '../src' - -afterEach(cleanup) - -// https://github.com/TanStack/router/issues/2072 -// Router context updates supplied through `RouterProvider` must be observable -// by `beforeLoad` on the very next `router.invalidate()` call, even when the -// context state and `invalidate()` change in the same event handler. -test('#2072: logout invalidates the router with the fresh auth context', async () => { - const seen: Array = [] - const rootRoute = createRootRouteWithContext<{ - auth: { isAuthenticated: boolean } - }>()() - const loginRoute = createRoute({ - getParentRoute: () => rootRoute, - path: '/login', - beforeLoad: ({ context }) => { - if (context.auth.isAuthenticated) { - throw redirect({ to: '/private' }) - } - }, - component: () =>
Login page
, - }) - const authenticatedRoute = createRoute({ - getParentRoute: () => rootRoute, - id: '_authenticated', - beforeLoad: ({ context }) => { - seen.push(context.auth.isAuthenticated) - if (!context.auth.isAuthenticated) { - throw redirect({ to: '/login' }) - } - }, - }) - const privateRoute = createRoute({ - getParentRoute: () => authenticatedRoute, - path: '/private', - component: () =>
Private page
, - }) - const router = createRouter({ - routeTree: rootRoute.addChildren([ - loginRoute, - authenticatedRoute.addChildren([privateRoute]), - ]), - history: createMemoryHistory({ initialEntries: ['/private'] }), - context: { auth: { isAuthenticated: true } }, - }) - - function App() { - const [isAuthenticated, setIsAuthenticated] = React.useState(true) - return ( - <> - - - - ) - } - - render() - expect(await screen.findByText('Private page')).toBeInTheDocument() - expect(seen).toEqual([true]) - - fireEvent.click(screen.getByRole('button', { name: 'Logout' })) - - expect(await screen.findByText('Login page')).toBeInTheDocument() - expect(seen).toEqual([true, false]) -}) - -// The inverse transition: becoming authenticated must let the login route's -// `beforeLoad` observe the new context and redirect to the private route. -test('#2072: login invalidates the router with the fresh auth context', async () => { - const seen: Array = [] - const rootRoute = createRootRouteWithContext<{ - auth: { isAuthenticated: boolean } - }>()() - const loginRoute = createRoute({ - getParentRoute: () => rootRoute, - path: '/login', - beforeLoad: ({ context }) => { - if (context.auth.isAuthenticated) { - throw redirect({ to: '/private' }) - } - }, - component: () =>
Login page
, - }) - const authenticatedRoute = createRoute({ - getParentRoute: () => rootRoute, - id: '_authenticated', - beforeLoad: ({ context }) => { - seen.push(context.auth.isAuthenticated) - if (!context.auth.isAuthenticated) { - throw redirect({ to: '/login' }) - } - }, - }) - const privateRoute = createRoute({ - getParentRoute: () => authenticatedRoute, - path: '/private', - component: () =>
Private page
, - }) - const router = createRouter({ - routeTree: rootRoute.addChildren([ - loginRoute, - authenticatedRoute.addChildren([privateRoute]), - ]), - history: createMemoryHistory({ initialEntries: ['/login'] }), - context: { auth: { isAuthenticated: false } }, - }) - - function App() { - const [isAuthenticated, setIsAuthenticated] = React.useState(false) - return ( - <> - - - - ) - } - - render() - expect(await screen.findByText('Login page')).toBeInTheDocument() - expect(seen).toEqual([]) - - fireEvent.click(screen.getByRole('button', { name: 'Login' })) - - expect(await screen.findByText('Private page')).toBeInTheDocument() - expect(seen).toEqual([true]) -}) diff --git a/packages/react-router/tests/jest-dom.setup.ts b/packages/react-router/tests/jest-dom.setup.ts deleted file mode 100644 index 8f7cbf15be..0000000000 --- a/packages/react-router/tests/jest-dom.setup.ts +++ /dev/null @@ -1,18 +0,0 @@ -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 deleted file mode 100644 index 04d0c3f32d..0000000000 --- a/packages/react-router/tests/link-departing-scope.test.tsx +++ /dev/null @@ -1,1122 +0,0 @@ -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 deleted file mode 100644 index 31daa6d551..0000000000 --- a/packages/react-router/tests/link-destination.test.tsx +++ /dev/null @@ -1,498 +0,0 @@ -import React from 'react' -import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest' -import { act, cleanup, fireEvent, render, screen } from '@testing-library/react' -import { - Link, - Outlet, - RouterContextProvider, - RouterProvider, - createMemoryHistory, - createRootRoute, - createRoute, - createRouter, - retainSearchParams, -} from '../src' - -describe('Link destination updates', () => { - beforeEach(() => vi.stubEnv('NODE_ENV', 'production')) - afterEach(() => { - cleanup() - vi.unstubAllEnvs() - }) - - function setupFixedLink( - params = { id: 'fixed' }, - stringify?: (params: Record) => { id: string }, - ) { - const rootRoute = createRootRoute({ - component: () => ( - <> - - Target - - - - ), - }) - const itemsRoute = createRoute({ - getParentRoute: () => rootRoute, - path: '/items/$source', - }) - const targetRoute = createRoute({ - getParentRoute: () => rootRoute, - path: '/target/$id', - params: { stringify }, - }) - const routeTree = rootRoute.addChildren([itemsRoute, targetRoute]) - const router = createRouter({ - routeTree, - history: createMemoryHistory({ initialEntries: ['/items/one'] }), - }) - return { router, rootRoute } - } - - test('preserves a fixed destination when unrelated location inputs change', async () => { - const { router } = setupFixedLink() - render() - - const link = await screen.findByTestId('fixed-link') - expect(link).toHaveAttribute('href', '/target/fixed#details') - expect(link).not.toHaveAttribute('data-status') - - await act(() => - router.navigate({ - to: '/items/$source', - params: { source: 'two' }, - search: { tab: 'other' }, - hash: 'other', - }), - ) - - expect(link).toHaveAttribute('href', '/target/fixed#details') - expect(link).not.toHaveAttribute('data-status') - - await act(() => - router.navigate({ - to: '/target/$id', - params: { id: 'fixed' }, - }), - ) - expect(link).toHaveAttribute('data-status', 'active') - expect(link).toHaveAttribute('href', '/target/fixed#details') - }) - - test('updates the destination when router options change', async () => { - const { router } = setupFixedLink() - render() - - const link = await screen.findByTestId('fixed-link') - expect(link).toHaveAttribute('href', '/target/fixed#details') - - router.update({ trailingSlash: 'always' }) - await act(() => - router.navigate({ to: '/items/$source', params: { source: 'two' } }), - ) - expect(link).toHaveAttribute('href', '/target/fixed/#details') - - router.update({ trailingSlash: 'never' }) - await act(() => - router.navigate({ to: '/items/$source', params: { source: 'three' } }), - ) - expect(link).toHaveAttribute('href', '/target/fixed#details') - }) - - test('evaluates param stringifiers before reusing pathnames', async () => { - const stringify = vi.fn((params: Record) => ({ - id: `${params.source}-${params.id}`, - })) - const { router } = setupFixedLink({ id: 'fixed' }, stringify) - render() - - const link = await screen.findByTestId('fixed-link') - expect(link).toHaveAttribute('href', '/target/one-fixed#details') - - await act(() => - router.navigate({ to: '/items/$source', params: { source: 'two' } }), - ) - expect(link).toHaveAttribute('href', '/target/two-fixed#details') - - stringify.mockClear() - await act(() => - router.navigate({ to: '/items/$source', params: { source: 'one' } }), - ) - expect(link).toHaveAttribute('href', '/target/one-fixed#details') - expect(stringify).toHaveBeenCalled() - }) - - test('updates when the route tree is rebuilt after route options change', async () => { - const { router, rootRoute } = setupFixedLink() - render() - - const link = await screen.findByTestId('fixed-link') - expect(link).toHaveAttribute('href', '/target/fixed#details') - - // HMR updates the live route in place, then rebuilds the route tree. - rootRoute.update({ - search: { middlewares: [retainSearchParams(true)] }, - }) - router.setRoutes(router.buildRouteTree()) - await act(() => - router.navigate({ - to: '/items/$source', - params: { source: 'two' }, - search: { retained: 'value' }, - }), - ) - expect(link).toHaveAttribute('href', '/target/fixed?retained=value#details') - - rootRoute.update({ search: undefined }) - router.setRoutes(router.buildRouteTree()) - await act(() => - router.navigate({ - to: '/items/$source', - params: { source: 'three' }, - search: { retained: 'value' }, - }), - ) - expect(link).toHaveAttribute('href', '/target/fixed#details') - }) - - test('reuses the location for equal inline literals and rebuilds on nested changes', async () => { - const rootRoute = createRootRoute({ - component: function Root() { - const [page, setPage] = React.useState(1) - const [, rerender] = React.useState(0) - return ( - <> - - - - Items - - - - ) - }, - }) - const itemsRoute = createRoute({ - getParentRoute: () => rootRoute, - path: '/items/$source', - }) - const router = createRouter({ - routeTree: rootRoute.addChildren([itemsRoute]), - history: createMemoryHistory({ initialEntries: ['/'] }), - }) - const buildLocation = vi.spyOn(router, 'buildLocation') - render() - - const link = await screen.findByTestId('nested-link') - expect(link).toHaveAttribute( - 'href', - '/items/one?filters=%7B%22page%22%3A1%7D&tags=%5B%22a%22%5D', - ) - - // Fresh literals with equal contents must not produce a new options - // object, otherwise the router could never reuse the built location. - const builds = buildLocation.mock.calls.length - expect(builds).toBeGreaterThan(0) - fireEvent.click(screen.getByRole('button', { name: 'Rerender' })) - fireEvent.click(screen.getByRole('button', { name: 'Rerender' })) - expect(buildLocation).toHaveBeenCalledTimes(builds) - expect(link).toHaveAttribute( - 'href', - '/items/one?filters=%7B%22page%22%3A1%7D&tags=%5B%22a%22%5D', - ) - - // A nested value that changes through React state is a new object, so - // the cached location for the previous contents must not be served. - fireEvent.click(screen.getByRole('button', { name: 'Next page' })) - expect(link).toHaveAttribute( - 'href', - '/items/one?filters=%7B%22page%22%3A2%7D&tags=%5B%22a%22%5D', - ) - - await act(() => - router.navigate({ to: '/items/$source', params: { source: 'two' } }), - ) - expect(link).toHaveAttribute( - 'href', - '/items/one?filters=%7B%22page%22%3A2%7D&tags=%5B%22a%22%5D', - ) - buildLocation.mockRestore() - }) - - test('updates fixed params and hash when Link props change', async () => { - const rootRoute = createRootRoute({ - component: function Root() { - const [value, setValue] = React.useState('one') - return ( - <> - - - Item - - - - ) - }, - }) - const itemsRoute = createRoute({ - getParentRoute: () => rootRoute, - path: '/items/$id', - }) - const router = createRouter({ - routeTree: rootRoute.addChildren([itemsRoute]), - history: createMemoryHistory({ initialEntries: ['/items/one'] }), - }) - render() - - const link = await screen.findByTestId('changing-link') - expect(link).toHaveAttribute('href', '/items/one#one') - expect(link).toHaveAttribute('data-status', 'active') - - fireEvent.click(screen.getByRole('button', { name: 'Change target' })) - - expect(link).toHaveAttribute('href', '/items/two#two') - expect(link).not.toHaveAttribute('data-status') - }) - - test('updates inherited params and active state together', async () => { - const rootRoute = createRootRoute({ - component: () => ( - <> - - {({ isActive }) => (isActive ? 'Current item' : 'Another item')} - - - - ), - }) - const itemsRoute = createRoute({ - getParentRoute: () => rootRoute, - path: '/items/$id', - }) - const router = createRouter({ - routeTree: rootRoute.addChildren([itemsRoute]), - history: createMemoryHistory({ initialEntries: ['/items/one'] }), - }) - render() - - const link = await screen.findByTestId('inherited-link') - expect(link).toHaveAttribute('href', '/items/one') - expect(link).toHaveTextContent('Current item') - - await act(() => - router.navigate({ to: '/items/$id', params: { id: 'two' } }), - ) - - expect(link).toHaveAttribute('href', '/items/two') - 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-hydration.test.tsx b/packages/react-router/tests/link-hydration.test.tsx deleted file mode 100644 index 497464b3f8..0000000000 --- a/packages/react-router/tests/link-hydration.test.tsx +++ /dev/null @@ -1,203 +0,0 @@ -import React from 'react' -import { renderToString } from 'react-dom/server' -import { hydrateRoot } from 'react-dom/client' -import { act } from '@testing-library/react' -import { expect, test, vi } from 'vitest' -import { - Link, - RouterContextProvider, - createMemoryHistory, - createRootRoute, - createRoute, - createRouter, -} from '../src' - -test('only hash-sensitive links need a second hydration render', async () => { - const rootRoute = createRootRoute() - const router = createRouter({ - routeTree: rootRoute.addChildren([ - createRoute({ getParentRoute: () => rootRoute, path: '/target' }), - ]), - history: createMemoryHistory({ initialEntries: ['/target#section'] }), - }) - await router.load() - const serverRouter = createRouter({ - routeTree: router.routeTree, - history: createMemoryHistory({ initialEntries: ['/target'] }), - isServer: true, - }) - await serverRouter.load() - const ordinary = vi.fn(({ isActive }: { isActive: boolean }) => - String(isActive), - ) - const hashSensitive = vi.fn(({ isActive }: { isActive: boolean }) => - String(isActive), - ) - const tree = (includeHash = false, contextRouter = router) => ( - - - {ordinary} - - - {hashSensitive} - - - ) - const container = document.createElement('div') - document.body.append(container) - container.innerHTML = renderToString(tree(false, serverRouter)) - expect(container.querySelector('[data-testid="ordinary"]')?.textContent).toBe( - 'true', - ) - expect(container.querySelector('[data-testid="hash"]')?.textContent).toBe( - 'false', - ) - ordinary.mockClear() - hashSensitive.mockClear() - const onRecoverableError = vi.fn() - const diagnostics = vi.spyOn(console, 'error').mockImplementation(() => {}) - const serverAnchor = container.querySelector('[data-testid="ordinary"]') - let root: ReturnType | undefined - try { - await act(() => { - root = hydrateRoot(container, tree(), { onRecoverableError }) - }) - expect(ordinary).toHaveBeenCalledTimes(1) - expect(container.querySelector('[data-testid="ordinary"]')).toBe( - serverAnchor, - ) - expect(hashSensitive.mock.calls.map(([state]) => state.isActive)).toEqual([ - false, - true, - ]) - expect(container.querySelector('[data-testid="hash"]')).toHaveAttribute( - 'aria-current', - 'page', - ) - expect(container.querySelector('[data-testid="hash"]')).toHaveAttribute( - 'title', - 'active', - ) - await act(() => root!.render(tree(true))) - expect( - container.querySelector('[data-testid="ordinary"]'), - ).not.toHaveAttribute('aria-current') - expect(container.querySelector('[data-testid="ordinary"]')).toHaveAttribute( - 'title', - 'inactive', - ) - await act(() => root!.render(tree(false))) - expect(container.querySelector('[data-testid="ordinary"]')).toHaveAttribute( - 'aria-current', - 'page', - ) - expect(onRecoverableError).not.toHaveBeenCalled() - expect(diagnostics).not.toHaveBeenCalled() - } finally { - await act(() => root?.unmount()) - router.history.destroy() - serverRouter.history.destroy() - diagnostics.mockRestore() - container.remove() - } -}) - -test('hash-sensitive links retain the server snapshot in a delayed hydration boundary', async () => { - const rootRoute = createRootRoute() - const routeTree = rootRoute.addChildren([ - createRoute({ getParentRoute: () => rootRoute, path: '/target' }), - ]) - const serverRouter = createRouter({ - routeTree, - history: createMemoryHistory({ initialEntries: ['/target'] }), - isServer: true, - }) - const clientRouter = createRouter({ - routeTree, - history: createMemoryHistory({ initialEntries: ['/target#section'] }), - }) - await Promise.all([serverRouter.load(), clientRouter.load()]) - let ready = true - let resolve!: () => void - const pending = new Promise((done) => { - resolve = done - }) - const ordinary = vi.fn(() => 'ordinary') - const hashSensitive = vi.fn(({ isActive }: { isActive: boolean }) => - String(isActive), - ) - function DeferredLinks() { - if (!ready) { - throw pending - } - return ( - <> - {ordinary} - - {hashSensitive} - - - ) - } - const tree = (router: typeof clientRouter) => ( - - Loading

}> - -
-
- ) - const container = document.createElement('div') - document.body.append(container) - container.innerHTML = renderToString(tree(serverRouter)) - const serverAnchor = container.querySelector('a') - ordinary.mockClear() - hashSensitive.mockClear() - ready = false - const onRecoverableError = vi.fn() - const diagnostics = vi.spyOn(console, 'error').mockImplementation(() => {}) - let root: ReturnType | undefined - try { - await act(() => { - root = hydrateRoot(container, tree(clientRouter), { onRecoverableError }) - }) - expect(ordinary).not.toHaveBeenCalled() - expect(hashSensitive).not.toHaveBeenCalled() - await act(async () => { - ready = true - resolve() - await pending - }) - expect(ordinary).toHaveBeenCalledTimes(1) - expect(hashSensitive.mock.calls.map(([state]) => state.isActive)).toEqual([ - false, - true, - ]) - expect(container.querySelector('a')).toBe(serverAnchor) - expect(container.querySelectorAll('a')[1]).toHaveAttribute( - 'aria-current', - 'page', - ) - expect(onRecoverableError).not.toHaveBeenCalled() - expect(diagnostics).not.toHaveBeenCalled() - } finally { - await act(() => root?.unmount()) - serverRouter.history.destroy() - clientRouter.history.destroy() - diagnostics.mockRestore() - container.remove() - } -}) diff --git a/packages/react-router/tests/link-memo.test.tsx b/packages/react-router/tests/link-memo.test.tsx deleted file mode 100644 index 873bbf9e7a..0000000000 --- a/packages/react-router/tests/link-memo.test.tsx +++ /dev/null @@ -1,175 +0,0 @@ -import React from 'react' -import { act, cleanup, render } from '@testing-library/react' -import { afterEach, expect, test, vi } from 'vitest' -import { - Link, - RouterContextProvider, - createLink, - createMemoryHistory, - createRootRoute, - createRoute, - createRouter, -} from '../src' - -afterEach(cleanup) - -async function createPostsRouter() { - const root = createRootRoute() - const router = createRouter({ - routeTree: root.addChildren([ - createRoute({ getParentRoute: () => root, path: '/posts/$postId' }), - ]), - history: createMemoryHistory({ initialEntries: ['/posts/1'] }), - }) - await router.load() - return router -} - -test('a parent re-render with equal props does not re-render the Link', async () => { - let hostRenders = 0 - const Host = React.forwardRef>( - (props, ref) => { - hostRenders++ - return
- }, - ) - const CustomLink = createLink(Host) - const router = await createPostsRouter() - - let rerender = () => {} - let setPostId: React.Dispatch> = () => {} - function Parent() { - const [, setTick] = React.useState(0) - const [postId, set] = React.useState(1) - rerender = () => setTick((tick) => tick + 1) - setPostId = set - return ( - - - Post - - - ) - } - const view = render() - const anchor = view.getByText('Post') - expect(anchor).toHaveAttribute('href', '/posts/1') - expect(anchor).toHaveClass('current') - const rendersAfterMount = hostRenders - - // Same props, new inline objects: the memoized Link is skipped. - act(() => rerender()) - expect(hostRenders).toBe(rendersAfterMount) - - // A changed destination renders again. - act(() => setPostId(2)) - expect(hostRenders).toBe(rendersAfterMount + 1) - expect(anchor).toHaveAttribute('href', '/posts/2') - expect(anchor).not.toHaveClass('current') -}) - -test('element props are compared by reference: new children re-render, a cyclic prop does not throw', async () => { - let hostRenders = 0 - const Host = React.forwardRef< - HTMLAnchorElement, - React.ComponentProps<'a'> & { payload?: object } - >(({ payload: _payload, ...props }, ref) => { - hostRenders++ - return - }) - const CustomLink = createLink(Host) - const router = await createPostsRouter() - - let rerender = () => {} - function Parent() { - const [, setTick] = React.useState(0) - rerender = () => setTick((tick) => tick + 1) - // A new cyclic object per render: deep-comparing it would never return. - const cyclic: Record = {} - cyclic.self = cyclic - return ( - - - Post - - - ) - } - render() - expect(hostRenders).toBe(1) - - // Equal router options, but `children` is a new element and `payload` a - // new object, so the Link renders again instead of comparing them deeply. - act(() => rerender()) - expect(hostRenders).toBe(2) -}) - -test('a forwarded callback ref is notified once per element, not per Link render', async () => { - const router = await createPostsRouter() - const ref = vi.fn<(element: HTMLAnchorElement | null) => void>() - - const view = render( - - - Post - - , - ) - const anchor = view.getByText('Post') - expect(ref.mock.calls).toEqual([[anchor]]) - expect(anchor).toHaveAttribute('data-status', 'active') - - // A location change re-renders the Link (it is no longer active) without - // detaching and re-attaching the consumer's ref. - await act(() => - router.navigate({ to: '/posts/$postId', params: { postId: '2' } }), - ) - expect(anchor).not.toHaveAttribute('data-status') - expect(ref).toHaveBeenCalledTimes(1) - - // A different ref is attached to the same element; the old one is released. - const next = vi.fn<(element: HTMLAnchorElement | null) => void>() - view.rerender( - - - Post - - , - ) - expect(ref.mock.calls).toEqual([[anchor], [null]]) - expect(next.mock.calls).toEqual([[anchor]]) - - view.unmount() - expect(next.mock.calls).toEqual([[anchor], [null]]) -}) - -test('a cleanup returned by a forwarded callback ref runs on unmount', async () => { - const router = await createPostsRouter() - const cleanup = vi.fn() - const ref = vi.fn((_element: HTMLAnchorElement | null) => cleanup) - - const view = render( - - - Post - - , - ) - const anchor = view.getByText('Post') - expect(ref.mock.calls).toEqual([[anchor]]) - expect(cleanup).not.toHaveBeenCalled() - - view.unmount() - // React runs the cleanup instead of calling the ref with `null`. - expect(cleanup).toHaveBeenCalledTimes(1) - expect(ref).toHaveBeenCalledTimes(1) -}) diff --git a/packages/react-router/tests/link-selector.test.tsx b/packages/react-router/tests/link-selector.test.tsx deleted file mode 100644 index eee6906265..0000000000 --- a/packages/react-router/tests/link-selector.test.tsx +++ /dev/null @@ -1,192 +0,0 @@ -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-state-props.test.tsx b/packages/react-router/tests/link-state-props.test.tsx index ea45a5e974..6f205b2020 100644 --- a/packages/react-router/tests/link-state-props.test.tsx +++ b/packages/react-router/tests/link-state-props.test.tsx @@ -1,100 +1,21 @@ import React from 'react' import { renderToString } from 'react-dom/server' import { hydrateRoot } from 'react-dom/client' -import { act, cleanup, fireEvent, render, screen } from '@testing-library/react' +import { act, cleanup, render } from '@testing-library/react' import { afterEach, expect, test, vi } from 'vitest' import { Link, RouterContextProvider, - RouterProvider, createLink, createMemoryHistory, createRootRoute, createRoute, createRouter, - useLinkProps, } from '../src' -const disposers: Array<() => void> = [] -afterEach(() => { - cleanup() - for (const dispose of disposers.splice(0)) { - dispose() - } -}) +afterEach(cleanup) -test.each([false, true])( - 'filters native and custom props without changing the hook result (server: %s)', - async (server) => { - type AnchorProps = React.ComponentPropsWithoutRef<'a'> & { - disabled?: boolean - } - let customProps: AnchorProps | undefined - let hookProps: React.ComponentPropsWithRef<'a'> | undefined - const customRef = React.createRef() - const nativeRef = React.createRef() - const CustomLink = createLink( - React.forwardRef((props, ref) => { - customProps = props - return ( - - {props.children} - - ) - }), - ) - function Probe() { - hookProps = useLinkProps({ - to: '/target', - type: 'text/custom', - disabled: true, - }) - return null - } - const root = createRootRoute() - const router = createRouter({ - routeTree: root.addChildren([ - createRoute({ getParentRoute: () => root, path: '/target' }), - ]), - history: createMemoryHistory({ initialEntries: ['/target'] }), - isServer: server, - }) - disposers.push(router.history.destroy) - await router.load() - const tree = ( - - - Native - - - {({ isActive }) => (isActive ? 'Active custom' : 'Inactive custom')} - - - - ) - const container = server - ? document.createElement('div') - : render(tree).container - if (server) { - container.innerHTML = renderToString(tree) - } - const native = container.querySelector('a')! - const custom = container.querySelector('[data-testid="custom"]') - expect(native).not.toHaveAttribute('type') - expect(native).not.toHaveAttribute('disabled') - expect(native).toHaveAttribute('aria-disabled', 'true') - expect(custom).toHaveTextContent('Active custom') - expect(customProps).toMatchObject({ disabled: true }) - expect(customProps).not.toHaveProperty('type') - expect(hookProps).toMatchObject({ type: 'text/custom', disabled: true }) - if (!server) { - expect(nativeRef.current).toBe(native) - expect(customRef.current).toBe(custom) - } - }, -) - -test('blocked custom links keep the validated routing props and apply state props like any inactive link', () => { +test('blocked custom links keep the validated props and forwarded ref', () => { const CustomLink = createLink( React.forwardRef< HTMLAnchorElement, @@ -108,17 +29,13 @@ test('blocked custom links keep the validated routing props and apply state prop history: createMemoryHistory(), }) const ref = React.createRef() - const stateRef = vi.fn() - const stateClick = vi.fn() - const baseClick = vi.fn() + const unwantedRef = vi.fn() const search = vi.fn(() => ({})) const buildLocation = vi.spyOn(router, 'buildLocation') const inactiveProps = vi.fn(() => ({ href: 'javascript:override()', disabled: false, - target: '_blank', - ref: stateRef, - onClick: stateClick, + ref: unwantedRef, className: 'inactive-state', title: 'Inactive', })) @@ -128,7 +45,6 @@ test('blocked custom links keep the validated routing props and apply state prop to="javascript:blocked()" ref={ref} search={search} - onClick={baseClick} inactiveProps={inactiveProps} > Target @@ -141,24 +57,15 @@ test('blocked custom links keep the validated routing props and apply state prop const html = renderToString(tree) expect(html).toContain('data-disabled="true"') expect(html).toContain('class="inactive-state"') - expect(html).toContain('title="Inactive"') expect(html).not.toContain('href=') - expect(html).not.toContain('target=') router.isServer = false const anchor = render(tree).getByText('Target') expect(anchor).toHaveAttribute('data-disabled', 'true') expect(anchor).not.toHaveAttribute('href') - expect(anchor).not.toHaveAttribute('target') expect(anchor).toHaveClass('inactive-state') - expect(anchor).toHaveAttribute('title', 'Inactive') - // The selected state props win over the forwarded ref and base handlers, - // exactly as they do on any other inactive link. - expect(stateRef).toHaveBeenCalledWith(anchor) - expect(ref.current).toBeNull() - fireEvent.click(anchor) - expect(stateClick).toHaveBeenCalledOnce() - expect(baseClick).not.toHaveBeenCalled() + expect(ref.current).toBe(anchor) expect(inactiveProps).toHaveBeenCalled() + expect(unwantedRef).not.toHaveBeenCalled() expect(buildLocation).not.toHaveBeenCalled() expect(search).not.toHaveBeenCalled() } finally { @@ -339,36 +246,20 @@ test('external destinations skip state props across mounted link transitions', a } }) -test.each([ - { active: true, masked: false, server: false }, - { active: true, masked: true, server: false }, - { active: false, masked: false, server: false }, - { active: false, masked: true, server: false }, - { active: true, masked: false, server: true }, - { active: true, masked: true, server: true }, - { active: false, masked: false, server: true }, - { active: false, masked: true, server: true }, -])( - 'state props preserve routing while disabled changes (active: $active, masked: $masked, server: $server)', - async ({ active, masked, server }) => { +test.each([false, true])( + 'active links preserve styling while disabled changes (masked=%s)', + async (masked) => { const root = createRootRoute() const router = createRouter({ routeTree: root.addChildren([ createRoute({ getParentRoute: () => root, path: '/active' }), - createRoute({ getParentRoute: () => root, path: '/inactive' }), ]), - history: createMemoryHistory({ - initialEntries: [active ? '/active' : '/inactive'], - }), - isServer: server, + history: createMemoryHistory({ initialEntries: ['/active'] }), }) - disposers.push(router.history.destroy) await router.load() - const stateProps = { - className: 'state-class', + const activeProps = { + className: 'active-state', href: 'javascript:active()', - target: '_self', - disabled: false, } const content = (disabled: boolean) => ( @@ -376,37 +267,18 @@ test.each([ to="/active" mask={masked ? { to: '/masked' } : undefined} disabled={disabled} - target="_blank" - activeProps={stateProps} - inactiveProps={stateProps} + activeProps={activeProps} > Target ) - const view = server ? undefined : render(content(false)) + const view = render(content(false)) for (const disabled of [false, true, false]) { - let anchor: HTMLElement - if (view) { - view.rerender(content(disabled)) - anchor = view.getByText('Target') - } else { - const container = document.createElement('div') - container.innerHTML = renderToString(content(disabled)) - const link = container.querySelector('a') - expect(link).not.toBeNull() - if (!link) { - throw new Error('Expected the server-rendered Link') - } - anchor = link - } - expect(anchor).toHaveClass('state-class') - expect(anchor).toHaveAttribute('target', '_blank') - if (active) { - expect(anchor).toHaveAttribute('aria-current', 'page') - } else { - expect(anchor).not.toHaveAttribute('aria-current') - } + view.rerender(content(disabled)) + const anchor = view.getByText('Target') + expect(anchor).toHaveClass('active-state') + expect(anchor).toHaveAttribute('aria-current', 'page') if (disabled) { expect(anchor).not.toHaveAttribute('href') expect(anchor).toHaveAttribute('aria-disabled', 'true') @@ -481,82 +353,3 @@ test('functional state props preserve styling and href precedence across transit warn.mockRestore() } }) - -test.each([ - { active: true, server: false }, - { active: false, server: false }, - { active: true, server: true }, - { active: false, server: true }, -])( - 'selected state props override base props (active: $active, server: $server)', - async ({ active, server }) => { - const baseClick = vi.fn() - const selectedClick = vi.fn((event: React.MouseEvent) => - event.preventDefault(), - ) - const unusedClick = vi.fn() - const stateRef = React.createRef() - let resolvedRef: React.Ref | undefined - const stateProps = { - ref: stateRef, - title: 'state title', - onClick: selectedClick, - className: 'state-class', - style: { color: 'blue' }, - } - const history = createMemoryHistory({ initialEntries: ['/target'] }) - disposers.push(history.destroy) - function TestLink() { - const props = useLinkProps({ - to: active ? '/target' : '/', - target: '_blank', - title: 'base title', - onClick: baseClick, - className: 'base', - style: { color: 'red', marginTop: 2 }, - activeProps: active ? stateProps : { onClick: unusedClick }, - inactiveProps: active ? { onClick: unusedClick } : stateProps, - preload: false, - }) - resolvedRef = props.ref - return Override - } - const root = createRootRoute({ component: TestLink }) - const router = createRouter({ - routeTree: root.addChildren([ - createRoute({ getParentRoute: () => root, path: '/' }), - createRoute({ getParentRoute: () => root, path: '/target' }), - ]), - history, - isServer: server, - scrollRestoration: false, - }) - - let link: HTMLElement - if (server) { - await router.load() - const container = document.createElement('div') - container.innerHTML = renderToString() - const anchor = container.querySelector('a') - expect(anchor).not.toBeNull() - if (!anchor) { - throw new Error('Expected the server-rendered Link') - } - link = anchor - } else { - render() - link = await screen.findByRole('link', { name: 'Override' }) - } - - expect(resolvedRef).toBe(stateRef) - expect(link).toHaveAttribute('title', 'state title') - expect(link).toHaveClass('base', 'state-class') - expect(link.style).toMatchObject({ color: 'blue', marginTop: '2px' }) - if (!server) { - fireEvent.click(link) - expect(selectedClick).toHaveBeenCalledOnce() - expect(baseClick).not.toHaveBeenCalled() - expect(unusedClick).not.toHaveBeenCalled() - } - }, -) diff --git a/packages/react-router/tests/link.bench.tsx b/packages/react-router/tests/link.bench.tsx index 6871afc8a4..a04149ed61 100644 --- a/packages/react-router/tests/link.bench.tsx +++ b/packages/react-router/tests/link.bench.tsx @@ -1,6 +1,5 @@ import { render } from '@testing-library/react' -import { describe, test } from 'vitest' -import { getRouteSegments } from '@tanstack/router-core' +import { bench, describe } from 'vitest' import { Link, RouterProvider, @@ -38,16 +37,8 @@ const InterpolatePathLink = ({ to, params, children, -}: React.PropsWithChildren<{ - to: string - params: Record -}>) => { - const router = useRouter() - const href = interpolatePath( - to, - getRouteSegments(router.routesByPath[to])!, - params, - ) +}: React.PropsWithChildren) => { + const href = interpolatePath({ path: to, params }).interpolatedPath return {children} } @@ -82,8 +73,9 @@ describe.each([ ])('$name', ({ numberOfRoutes, numberOfLinks, matchedParamId }) => { const renderRouter = createRouterRenderer(numberOfRoutes) - test('hardcoded href', async ({ bench }) => { - await bench('hardcoded href', () => { + bench( + 'hardcoded href', + () => { const router = renderRouter( Array.from({ length: numberOfLinks }).map((_, i) => ( @@ -92,13 +84,13 @@ describe.each([ )), ) render() - }).run({ - warmupIterations: 1, - }) - }) + }, + { warmupIterations: 1 }, + ) - test('interpolate path', async ({ bench }) => { - await bench('interpolate path', () => { + bench( + 'interpolate path', + () => { const router = renderRouter( Array.from({ length: numberOfLinks }).map((_, i) => ( ) - }).run({ - warmupIterations: 1, - }) - }) + }, + { warmupIterations: 1 }, + ) - test('build location', async ({ bench }) => { - await bench('build location', () => { + bench( + 'build location', + () => { const router = renderRouter( Array.from({ length: numberOfLinks }).map((_, i) => ( ) - }).run({ - warmupIterations: 1, - }) - }) + }, + { warmupIterations: 1 }, + ) - test('link to absolute path', async ({ bench }) => { - await bench('link to absolute path', () => { + bench( + 'link to absolute path', + () => { const router = renderRouter( Array.from({ length: numberOfLinks }).map((_, i) => ( ) - }).run({ - warmupIterations: 1, - }) - }) + }, + { warmupIterations: 1 }, + ) - test('link to relative path', async ({ bench }) => { - await bench('link to relative path', () => { + bench( + 'link to relative path', + () => { const router = renderRouter( Array.from({ length: numberOfLinks }).map((_, i) => { const to = `./params/$param${Math.min(i, matchedParamId)}` @@ -173,13 +165,13 @@ describe.each([ }), ) render() - }).run({ - warmupIterations: 1, - }) - }) + }, + { warmupIterations: 1 }, + ) - test('link to current path', async ({ bench }) => { - await bench('link to current path', () => { + bench( + 'link to current path', + () => { const router = renderRouter( Array.from({ length: numberOfLinks }).map((_, i) => ( @@ -188,8 +180,7 @@ describe.each([ )), ) render() - }).run({ - warmupIterations: 1, - }) - }) + }, + { warmupIterations: 1 }, + ) }) diff --git a/packages/react-router/tests/link.test.tsx b/packages/react-router/tests/link.test.tsx index 56c4ece9db..897b6d9414 100644 --- a/packages/react-router/tests/link.test.tsx +++ b/packages/react-router/tests/link.test.tsx @@ -1151,13 +1151,10 @@ describe('Link', () => { expect(indexLink).not.toHaveAttribute('data-status', 'active') expect(indexLink).toHaveAttribute('href', '/') - // 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') + expect(postsLink).toHaveAttribute('data-status', 'active') + expect(postsLink).toHaveAttribute('aria-current', 'page') + expect(postsLink).toHaveClass('active') + expect(postsLink).toHaveAttribute('href', '/posts') }) test('when navigating to /posts with a base url', async () => { @@ -1214,13 +1211,10 @@ describe('Link', () => { expect(indexLink).not.toHaveAttribute('data-status', 'active') expect(indexLink).toHaveAttribute('href', '/app/') - // 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') + expect(postsLink).toHaveAttribute('data-status', 'active') + expect(postsLink).toHaveAttribute('aria-current', 'page') + expect(postsLink).toHaveClass('active') + expect(postsLink).toHaveAttribute('href', '/app/posts') }) test('when navigating to /posts with search', async () => { @@ -5432,35 +5426,6 @@ describe('Link', () => { fireEvent.mouseLeave(viewportLink) await vi.advanceTimersByTimeAsync(50) expect(preloadRouteSpy).not.toHaveBeenCalled() - - // An effect with preloading disabled owns no resources. Re-enabling it - // must still install cancellation for a newly scheduled intent timer. - fireEvent.click(screen.getByRole('button', { name: 'Use intent' })) - fireEvent.mouseEnter(viewportLink) - await vi.advanceTimersByTimeAsync(49) - expect(preloadRouteSpy).not.toHaveBeenCalled() - fireEvent.click(screen.getByRole('button', { name: 'Disable preload' })) - await vi.advanceTimersByTimeAsync(1) - expect(preloadRouteSpy).not.toHaveBeenCalled() - - fireEvent.click(screen.getByRole('button', { name: 'Use intent' })) - fireEvent.mouseEnter(viewportLink) - await vi.advanceTimersByTimeAsync(50) - expect(preloadRouteSpy).toHaveBeenCalledTimes(1) - - preloadRouteSpy.mockClear() - fireEvent.click(screen.getByRole('button', { name: 'Disable preload' })) - initialIoCallback( - [ - { - isIntersecting: true, - target: viewportLink, - } as unknown as IntersectionObserverEntry, - ], - {} as IntersectionObserver, - ) - await vi.advanceTimersByTimeAsync(50) - expect(preloadRouteSpy).not.toHaveBeenCalled() }) test("Router.preload='render', should trigger the route loader on render", async () => { @@ -6809,12 +6774,14 @@ describe('splat routes with empty splat', () => { async (trailingSlash) => { const tail = trailingSlash === 'always' ? '/' : '' - // The links stay mounted across the navigation so they can turn active. - const rootRoute = createRootRoute({ + const rootRoute = createRootRoute() + const indexRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/', 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 deleted file mode 100644 index bc947fff05..0000000000 --- a/packages/react-router/tests/match-provider.test.tsx +++ /dev/null @@ -1,90 +0,0 @@ -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/not-found.test.tsx b/packages/react-router/tests/not-found.test.tsx index 436c386694..f27057c7ab 100644 --- a/packages/react-router/tests/not-found.test.tsx +++ b/packages/react-router/tests/not-found.test.tsx @@ -5,7 +5,6 @@ import { Link, Outlet, RouterProvider, - Scripts, createBrowserHistory, createControlledPromise, createLazyRoute, @@ -112,13 +111,6 @@ test('a lazy route notFoundComponent handles an eager beforeLoad failure', async test('SSR uses a lazy route notFoundComponent for an eager beforeLoad failure', async () => { const rootRoute = createRootRoute({ - // Streaming SSR requires the boundary in the shell. - shellComponent: ({ children }) => ( - <> - {children} - - - ), component: Outlet, notFoundComponent: () =>
Root not found
, }) @@ -162,14 +154,6 @@ test.each(['client', 'server'] as const)( 'a lazy child boundary handles a fuzzy URL miss on the %s', async (environment) => { const rootRoute = createRootRoute({ - // Streaming SSR requires the boundary in the shell; the - // client render outputs no scripts here. - shellComponent: ({ children }) => ( - <> - {children} - - - ), component: Outlet, notFoundComponent: () =>
Root fuzzy boundary
, }) diff --git a/packages/react-router/tests/renderRouterToStream.react19.test.tsx b/packages/react-router/tests/renderRouterToStream.react19.test.tsx deleted file mode 100644 index 426996d60e..0000000000 --- a/packages/react-router/tests/renderRouterToStream.react19.test.tsx +++ /dev/null @@ -1,227 +0,0 @@ -import { Suspense } from 'react' -import { afterEach, describe, expect, test, vi } from 'vitest' -import { attachRouterServerSsrUtils } from '@tanstack/router-core/ssr/server' -import { - RouterContextProvider, - Scripts, - createMemoryHistory, - createRootRoute, - createRouter, -} from '../src' -import type * as ReactDOMServer from 'react-dom/server' -import type { AnyRouter } from '@tanstack/router-core' - -/** - * Load the adapter against the real React 19 renderer. Node's `react-dom` - * exports both entry points; hiding `renderToReadableStream` exercises the - * pipeable path that every Node user on React < 19.2 runs. - */ -async function loadRenderRouterToStream(path: 'readable' | 'pipeable') { - vi.resetModules() - if (path === 'pipeable') { - vi.doMock('react-dom/server', async (importOriginal) => { - // The runtime module is CommonJS, so its interop `default` is the namespace. - const actual = await importOriginal<{ default: typeof ReactDOMServer }>() - return { - ...actual, - default: { ...actual.default, renderToReadableStream: undefined }, - } - }) - } else { - vi.doUnmock('react-dom/server') - } - const reactDomServer = (await import('react-dom/server')).default - const renderToPipeableStream = vi.spyOn( - reactDomServer, - 'renderToPipeableStream', - ) - const { renderRouterToStream } = - await import('../src/ssr/renderRouterToStream') - return { renderRouterToStream, renderToPipeableStream } -} - -const activeRouters: Array = [] - -afterEach(() => { - for (const router of activeRouters.splice(0)) { - router.serverSsr?.cleanup() - } -}) - -async function buildRouter(dehydratedData: { routerData: Promise }) { - const rootRoute = createRootRoute({ component: () => null }) - const router = createRouter({ - history: createMemoryHistory({ initialEntries: ['/'] }), - routeTree: rootRoute, - dehydrate: () => dehydratedData, - }) - activeRouters.push(router) - router.isServer = true - attachRouterServerSsrUtils({ router, manifest: undefined }) - await router.load() - await router.serverSsr!.dehydrate() - return router -} - -function createSuspendingComponent(id: string, text: string) { - let ready = false - let resolve!: () => void - const pending = new Promise((done) => { - resolve = () => { - ready = true - done() - } - }) - - return { - Component() { - if (!ready) { - throw pending - } - return
{text}
- }, - resolve, - } -} - -async function readWithTimeout( - reader: ReadableStreamDefaultReader, -) { - let timeout: ReturnType | undefined - try { - return await Promise.race([ - reader.read(), - new Promise((_resolve, reject) => { - timeout = setTimeout( - () => reject(new Error('Timed out waiting for React SSR output')), - 2000, - ) - }), - ]) - } finally { - if (timeout) { - clearTimeout(timeout) - } - } -} - -async function readUntil( - reader: ReadableStreamDefaultReader, - decoder: TextDecoder, - state: { html: string }, - condition: (html: string) => boolean, -) { - while (!condition(state.html)) { - const { done, value } = await readWithTimeout(reader) - if (done) { - throw new Error('React SSR response ended before the expected output') - } - state.html += decoder.decode(value, { stream: true }) - } -} - -describe.each(['readable', 'pipeable'] as const)( - 'renderRouterToStream - real React 19 renderer (%s)', - (path) => { - test('emits router data after a real Suspense patch while React is still rendering', async () => { - const { renderRouterToStream, renderToPipeableStream } = - await loadRenderRouterToStream(path) - let resolveRouterData!: (value: string) => void - const routerData = new Promise((resolve) => { - resolveRouterData = resolve - }) - const router = await buildRouter({ routerData }) - const first = createSuspendingComponent('first-result', 'first-resolved') - const second = createSuspendingComponent( - 'second-result', - 'second-resolved', - ) - const requestController = new AbortController() - - const { response } = await renderRouterToStream({ - request: new Request('http://localhost/', { - signal: requestController.signal, - }), - router, - responseHeaders: new Headers(), - children: ( - - - - first-fallback

}> - -
- second-fallback

}> - -
- -
- - - ), - }) - const reader = response.body!.getReader() - const decoder = new TextDecoder() - const state = { html: '' } - - try { - // The shell ends with , whose last child is the boundary. - await readUntil(reader, decoder, state, (html) => { - const shell = html.indexOf('second-fallback') - return shell >= 0 && html.indexOf('', shell) >= 0 - }) - expect(state.html).toContain('first-fallback') - - first.resolve() - await readUntil(reader, decoder, state, (html) => { - const result = html.indexOf('first-resolved') - return result >= 0 && html.indexOf('', result) >= 0 - }) - - const firstResult = state.html.indexOf('first-resolved') - const reactPatchEnd = - state.html.indexOf('', firstResult) + ''.length - const reactPatch = state.html.slice(firstResult, reactPatchEnd) - expect(reactPatch).toContain('')).toBe(true) - expect(state.html).not.toContain('second-resolved') - expect(state.html).not.toContain('') - - resolveRouterData('late-react19-router-value') - await readUntil(reader, decoder, state, (html) => - html.includes('late-react19-router-value'), - ) - - // The second Suspense boundary still keeps React's renderer open. The - // router batch can therefore only have used React's completed patch - // script as its insertion point. - const routerValue = state.html.indexOf('late-react19-router-value') - expect(routerValue).toBeGreaterThan(reactPatchEnd) - expect(state.html).not.toContain('second-resolved') - expect(state.html).not.toContain('') - - second.resolve() - for (;;) { - const { done, value } = await readWithTimeout(reader) - if (done) { - break - } - state.html += decoder.decode(value, { stream: true }) - } - state.html += decoder.decode() - - expect(state.html).toContain('second-resolved') - expect(state.html.endsWith('')).toBe(true) - expect(router.serverSsr).toBeUndefined() - expect(renderToPipeableStream).toHaveBeenCalledTimes( - path === 'pipeable' ? 1 : 0, - ) - } finally { - first.resolve() - second.resolve() - requestController.abort(new Error('test-complete')) - await reader.cancel().catch(() => {}) - } - }) - }, -) diff --git a/packages/react-router/tests/renderRouterToStream.test.tsx b/packages/react-router/tests/renderRouterToStream.test.tsx index cde31d0b6a..f42456b7be 100644 --- a/packages/react-router/tests/renderRouterToStream.test.tsx +++ b/packages/react-router/tests/renderRouterToStream.test.tsx @@ -1,63 +1,30 @@ -import { afterEach, describe, expect, test, vi } from 'vitest' +import { afterEach, describe, expect, onTestFinished, test, vi } from 'vitest' import { attachRouterServerSsrUtils } from '@tanstack/router-core/ssr/server' import { createMemoryHistory, createRootRoute, createRouter } from '../src' -import type { RouterManagedTag } from '@tanstack/router-core' -import type * as RouterSsrServer from '@tanstack/router-core/ssr/server' -import type * as ReactDomServer from 'react-dom/server' - -type ReadableRenderOptions = NonNullable< - Parameters[1] -> const reactDomServerMocks = vi.hoisted(() => ({ - renderToReadableStream: undefined as - | undefined - | ((children: unknown, options: ReadableRenderOptions) => unknown), + renderToReadableStream: undefined as undefined | (() => unknown), renderToPipeableStream: vi.fn(), })) -const routerTransformMocks = vi.hoisted(() => ({ - readableOptions: vi.fn(), -})) - -vi.mock('@tanstack/router-core/ssr/server', async (importOriginal) => { - const actual = await importOriginal() - return { - ...actual, - transformReadableStreamWithRouter: ( - ...args: Parameters - ) => { - routerTransformMocks.readableOptions(args[2]) - return actual.transformReadableStreamWithRouter(...args) - }, - } -}) vi.mock('react-dom/server', () => ({ default: reactDomServerMocks, ...reactDomServerMocks, })) -const actualReactDomServer = await vi.importActual( - 'react-dom/server.node', -) - const { renderRouterToStream } = await import('../src/ssr/renderRouterToStream') afterEach(() => { reactDomServerMocks.renderToReadableStream = undefined reactDomServerMocks.renderToPipeableStream.mockReset() - routerTransformMocks.readableOptions.mockReset() vi.restoreAllMocks() }) -async function buildRouter(dehydratedData?: { lateData: Promise }) { +async function buildRouter() { const rootRoute = createRootRoute({ component: () => null }) const router = createRouter({ history: createMemoryHistory({ initialEntries: ['/'] }), routeTree: rootRoute, - ...(dehydratedData === undefined - ? {} - : { dehydrate: () => dehydratedData }), }) router.isServer = true attachRouterServerSsrUtils({ router, manifest: undefined }) @@ -67,7 +34,15 @@ async function buildRouter(dehydratedData?: { lateData: Promise }) { } async function expectBodyRejects(response: Response, message: string) { - await expect(response.text()).rejects.toThrow(message) + const reader = response.body!.getReader() + await expect( + (async () => { + for (;;) { + const { done } = await reader.read() + if (done) return + } + })(), + ).rejects.toThrow(message) } function unwrapResponse( @@ -76,686 +51,47 @@ function unwrapResponse( return result.response } -function renderScript(tag: RouterManagedTag) { - const attrs = tag.attrs ?? {} - const id = attrs.id ? ` id="${attrs.id}"` : '' - const nonce = attrs.nonce ? ` nonce="${attrs.nonce}"` : '' - const streamPart = - 'data-tsr-stream-part' in attrs ? ' data-tsr-stream-part=""' : '' - return `${tag.children ?? ''}` -} - -function takeInitialScriptHtml( - router: Awaited>, -) { - const scripts = router.serverSsr!.takeInitialHydrationScriptTags()! - return [...scripts.before, scripts.boundary].map(renderScript).join('') -} - -async function readWithTimeout( - reader: ReadableStreamDefaultReader, -) { - let timeout: ReturnType | undefined - try { - return await Promise.race([ - reader.read(), - new Promise((_resolve, reject) => { - timeout = setTimeout( - () => reject(new Error('Timed out waiting for streamed HTML')), - 2000, - ) - }), - ]) - } finally { - if (timeout) { - clearTimeout(timeout) - } - } -} - -async function readUntil( - reader: ReadableStreamDefaultReader, - decoder: TextDecoder, - state: { html: string }, - needle: string, -) { - while (!state.html.includes(needle)) { - const { done, value } = await readWithTimeout(reader) - if (done) { - throw new Error(`Response ended before it contained ${needle}`) - } - state.html += decoder.decode(value, { stream: true }) - } -} - -describe('renderRouterToStream - renderer selection and pipeable errors', () => { - test('already-aborted requests do not start the readable renderer', async () => { - const readable = vi.fn() - reactDomServerMocks.renderToReadableStream = readable - const controller = new AbortController() - controller.abort(new Error('already-gone-readable')) - const router = await buildRouter() - - try { - await expect( - renderRouterToStream({ - request: new Request('http://localhost/', { - signal: controller.signal, - }), - router, - responseHeaders: new Headers(), - children: null, - }), - ).rejects.toThrow('already-gone-readable') - - expect(readable).not.toHaveBeenCalled() - expect(reactDomServerMocks.renderToPipeableStream).not.toHaveBeenCalled() - expect(router.serverSsr).toBeUndefined() - } finally { - router.serverSsr?.cleanup() - } - }) - - test('already-aborted requests do not start the pipeable renderer', async () => { - const controller = new AbortController() - controller.abort(new Error('already-gone-pipeable')) - const router = await buildRouter() - - try { - await expect( - renderRouterToStream({ - request: new Request('http://localhost/', { - signal: controller.signal, - }), - router, - responseHeaders: new Headers(), - children: null, - }), - ).rejects.toThrow('already-gone-pipeable') - - expect(reactDomServerMocks.renderToPipeableStream).not.toHaveBeenCalled() - expect(router.serverSsr).toBeUndefined() - } finally { - router.serverSsr?.cleanup() - } - }) - - test('disables React progressive chunking for the readable renderer', async () => { - const router = await buildRouter() - const renderedScripts = takeInitialScriptHtml(router) - const rendererStream = Object.assign( - new ReadableStream({ - start(controller) { - controller.enqueue(new TextEncoder().encode(renderedScripts)) - controller.close() - }, - }), - { allReady: Promise.resolve() }, - ) - const renderToReadableStream = vi.fn(() => Promise.resolve(rendererStream)) - reactDomServerMocks.renderToReadableStream = renderToReadableStream - - try { - const response = unwrapResponse( - await renderRouterToStream({ - request: new Request('http://localhost/'), - router, - responseHeaders: new Headers(), - children: null, - }), - ) - await response.text() - - expect(renderToReadableStream).toHaveBeenCalledWith( - null, - expect.objectContaining({ - progressiveChunkSize: Number.POSITIVE_INFINITY, - }), - ) - } finally { - router.serverSsr?.cleanup() - } - }) - - test('disables React progressive chunking for the pipeable renderer', async () => { - const router = await buildRouter() - const renderedScripts = takeInitialScriptHtml(router) - reactDomServerMocks.renderToPipeableStream.mockImplementationOnce( - (_children, options) => { - queueMicrotask(options.onShellReady) - return { - abort: vi.fn(), - pipe(destination: NodeJS.WritableStream) { - destination.write(renderedScripts) - destination.end() - }, - } - }, - ) - - try { - const response = unwrapResponse( - await renderRouterToStream({ - request: new Request('http://localhost/'), - router, - responseHeaders: new Headers(), - children: null, - }), - ) - await response.text() - - expect( - reactDomServerMocks.renderToPipeableStream.mock.calls[0]![1], - ).toEqual( - expect.objectContaining({ - progressiveChunkSize: Number.POSITIVE_INFINITY, - }), - ) - } finally { - router.serverSsr?.cleanup() - } - }) - - test('emits late router data after a complete React patch while rendering is still open', async () => { - let resolveLateData!: (value: string) => void - const lateData = new Promise((resolve) => { - resolveLateData = resolve +describe('renderRouterToStream - pipeable sync errors', () => { + test('request abort cancels readable rendering without consuming the response body', async () => { + const cancel = vi.fn() + const stream = Object.assign(new ReadableStream({ cancel }), { + allReady: Promise.resolve(), }) - const router = await buildRouter({ lateData }) - const renderedScripts = takeInitialScriptHtml(router) + reactDomServerMocks.renderToReadableStream = vi.fn(() => stream) - let rendererController!: ReadableStreamDefaultController - let rendererClosed = false - const rendererStream = Object.assign( - new ReadableStream({ - start(controller) { - rendererController = controller - }, - }), - { allReady: new Promise(() => {}) }, - ) - reactDomServerMocks.renderToReadableStream = vi.fn(() => - Promise.resolve(rendererStream), - ) + const router = await buildRouter() + const controller = new AbortController() + onTestFinished(() => { + router.serverSsr?.cleanup() + }) - const patch = - '' + - '' const response = unwrapResponse( await renderRouterToStream({ - request: new Request('http://localhost/'), - router, - responseHeaders: new Headers(), - children: null, - }), - ) - const reader = response.body!.getReader() - const decoder = new TextDecoder() - const state = { html: '' } - - try { - rendererController.enqueue( - new TextEncoder().encode( - `${renderedScripts}${patch}`, - ), - ) - await readUntil(reader, decoder, state, patch) - - resolveLateData('late-react-router-value') - await readUntil(reader, decoder, state, 'late-react-router-value') - - // Close React only after its patch allowed the late router value through. - rendererClosed = true - rendererController.close() - for (;;) { - const { done, value } = await readWithTimeout(reader) - if (done) { - break - } - state.html += decoder.decode(value, { stream: true }) - } - state.html += decoder.decode() - - expect(state.html.indexOf(patch)).toBeLessThan( - state.html.indexOf('late-react-router-value'), - ) - expect(state.html.indexOf('late-react-router-value')).toBeLessThan( - state.html.indexOf(''), - ) - expect(routerTransformMocks.readableOptions).toHaveBeenCalledWith( - expect.objectContaining({ rendererSafePoint: 'script-close' }), - ) - } finally { - if (!rendererClosed) { - try { - rendererController.close() - } catch { - // The response may already have cancelled the renderer. - } - } - router.serverSsr?.cleanup() - } - }) - - test('prefers the readable renderer when both APIs exist', async () => { - const cancelReadable = vi.fn() - const readableStream = Object.assign( - new ReadableStream({ - cancel: cancelReadable, - }), - { allReady: Promise.resolve() }, - ) - const readable = vi.fn(() => Promise.resolve(readableStream)) - reactDomServerMocks.renderToReadableStream = readable - - const router = await buildRouter() - const requestController = new AbortController() - try { - const response = unwrapResponse( - await renderRouterToStream({ - request: new Request('http://localhost/', { - signal: requestController.signal, - }), - router, - responseHeaders: new Headers(), - children: null, - }), - ) - - expect(readable).toHaveBeenCalledOnce() - expect(reactDomServerMocks.renderToPipeableStream).not.toHaveBeenCalled() - expect(routerTransformMocks.readableOptions).toHaveBeenCalledWith( - expect.objectContaining({ rendererSafePoint: 'script-close' }), - ) - - requestController.abort(new Error('test-complete')) - await expectBodyRejects(response, 'test-complete') - expect(cancelReadable).toHaveBeenCalledOnce() - } finally { - router.serverSsr?.cleanup() - } - }) - - test('readable renderer cancellation does not log a render error', async () => { - const cancelReadable = vi.fn() - reactDomServerMocks.renderToReadableStream = vi.fn((_children, options) => { - const readableStream = Object.assign( - new ReadableStream({ - cancel(reason) { - cancelReadable(reason) - options.onError?.(reason, { componentStack: '' }) - }, - }), - { allReady: Promise.resolve() }, - ) - return Promise.resolve(readableStream) - }) - - const router = await buildRouter() - const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) - const reason = new Error('readable-consumer-gone') - try { - const response = unwrapResponse( - await renderRouterToStream({ - request: new Request('http://localhost/'), - router, - responseHeaders: new Headers(), - children: null, - }), - ) - - await response.body!.cancel(reason) - expect(cancelReadable).toHaveBeenCalledWith(reason) - expect(errorSpy).not.toHaveBeenCalled() - } finally { - errorSpy.mockRestore() - router.serverSsr?.cleanup() - } - }) - - test('request abort does not log a renderer cancellation error', async () => { - const controller = new AbortController() - const renderError = new Error('renderer cancellation') - reactDomServerMocks.renderToReadableStream = vi.fn((_children, options) => { - controller.signal.addEventListener( - 'abort', - () => options.onError?.(renderError, { componentStack: '' }), - { once: true }, - ) - return Promise.resolve( - Object.assign(new ReadableStream(), { - allReady: Promise.resolve(), - }), - ) - }) - - const router = await buildRouter() - const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) - try { - const response = unwrapResponse( - await renderRouterToStream({ - request: new Request('http://localhost/', { - signal: controller.signal, - }), - router, - responseHeaders: new Headers(), - children: null, - }), - ) - - controller.abort(new Error('request-gone')) - await expectBodyRejects(response, 'request-gone') - expect(errorSpy).not.toHaveBeenCalled() - } finally { - errorSpy.mockRestore() - router.serverSsr?.cleanup() - } - }) - - test('request abort unblocks the readable renderer bot wait', async () => { - let resolveCancel!: () => void - let markCancelStarted!: () => void - const cancelStarted = new Promise((resolve) => { - markCancelStarted = resolve - }) - const cancelReadable = vi.fn( - () => - new Promise((resolve) => { - resolveCancel = resolve - markCancelStarted() - }), - ) - const readableStream = Object.assign( - new ReadableStream({ - cancel: cancelReadable, - }), - { allReady: new Promise(() => {}) }, - ) - reactDomServerMocks.renderToReadableStream = vi.fn(() => - Promise.resolve(readableStream), - ) - - const router = await buildRouter() - const cleanup = vi.spyOn(router.serverSsr!, 'cleanup') - const originalServerSsr = router.serverSsr! - const controller = new AbortController() - const reason = new Error('readable-bot-gone') - try { - const responsePromise = renderRouterToStream({ request: new Request('http://localhost/', { - headers: { 'User-Agent': 'Googlebot' }, signal: controller.signal, }), router, responseHeaders: new Headers(), children: null, - }) - - await Promise.resolve() - controller.abort(reason) - - await cancelStarted - expect(cleanup).toHaveBeenCalledOnce() - expect(router.serverSsr).toBeUndefined() - resolveCancel() - await expect(responsePromise).rejects.toBe(reason) - expect(cancelReadable).toHaveBeenCalledOnce() - } finally { - resolveCancel?.() - originalServerSsr.cleanup() - } - }) - - test('stream lifetime rejects the readable bot wait while readiness and cancellation stay pending', async () => { - let resolveReady!: () => void - const allReady = new Promise((resolve) => { - resolveReady = resolve - }) - const cancelReadable = vi.fn(() => new Promise(() => {})) - const readableStream = Object.assign( - new ReadableStream({ cancel: cancelReadable }), - { allReady }, - ) - reactDomServerMocks.renderToReadableStream = vi.fn(() => - Promise.resolve(readableStream), + }), ) - const router = await buildRouter() - const owner = router.serverSsr! - const cleanup = vi.fn() - owner.onCleanup(cleanup) - const request = new Request('http://localhost/', { - headers: { 'User-Agent': 'Googlebot' }, - }) - const resolved = vi.fn() - const rejected = vi.fn() - const warn = vi.spyOn(console, 'warn').mockImplementation(() => {}) - vi.useFakeTimers() - const pending = renderRouterToStream({ - request, - router, - responseHeaders: new Headers(), - children: null, - }).then(resolved, rejected) - - try { - await Promise.resolve() - expect(routerTransformMocks.readableOptions).toHaveBeenCalledOnce() - expect(rejected).not.toHaveBeenCalled() - await vi.advanceTimersByTimeAsync(120_000) - - const expectedError = expect.objectContaining({ - message: 'Stream lifetime exceeded', - }) - expect(rejected).toHaveBeenCalledExactlyOnceWith(expectedError) - expect(cancelReadable).toHaveBeenCalledExactlyOnceWith(expectedError) - expect(readableStream.locked).toBe(false) - expect(request.signal.aborted).toBe(false) - expect(cleanup).toHaveBeenCalledOnce() - expect(router.serverSsr).toBeUndefined() - - resolveReady() - await vi.advanceTimersByTimeAsync(0) - expect(resolved).not.toHaveBeenCalled() - } finally { - resolveReady() - await pending - owner.cleanup() - vi.useRealTimers() - warn.mockRestore() - } + expect(response.body).not.toBeNull() + controller.abort(new Error('request-gone')) + await vi.waitFor(() => expect(cancel).toHaveBeenCalledOnce()) }) - test('fatal shell errors reject before a response is created', async () => { - const shellError = new Error('fatal-react-shell-error') - reactDomServerMocks.renderToPipeableStream.mockImplementationOnce( - actualReactDomServer.renderToPipeableStream, - ) - const Fatal = () => { - throw shellError - } - - const router = await buildRouter() - const cleanup = vi.spyOn(router.serverSsr!, 'cleanup') - const originalServerSsr = router.serverSsr! - const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) - try { - await expect( - renderRouterToStream({ - request: new Request('http://localhost/'), - router, - responseHeaders: new Headers(), - children: , - }), - ).rejects.toBe(shellError) - - expect(routerTransformMocks.readableOptions).toHaveBeenCalledOnce() - expect(cleanup).toHaveBeenCalled() - expect(router.serverSsr).toBeUndefined() - } finally { - errorSpy.mockRestore() - originalServerSsr.cleanup() - } - }) - - test('transform abort wins after shell readiness resolves before continuation', async () => { - const reason = new Error('transform-aborted-after-ready') + test('sync onError before pipeable is assigned still aborts pipeable', async () => { const abort = vi.fn() - const pipe = vi.fn() - reactDomServerMocks.renderToPipeableStream.mockImplementationOnce( - (_children, options) => { - options.onShellReady() - return { abort, pipe } - }, - ) - routerTransformMocks.readableOptions.mockImplementationOnce((options) => { - options?.onAbort?.(reason) - }) - - const router = await buildRouter() - const cleanup = vi.spyOn(router.serverSsr!, 'cleanup') - const originalServerSsr = router.serverSsr! - try { - await expect( - renderRouterToStream({ - request: new Request('http://localhost/'), - router, - responseHeaders: new Headers(), - children: null, - }), - ).rejects.toBe(reason) - - expect(abort).toHaveBeenCalledWith(reason) - expect(pipe).not.toHaveBeenCalled() - expect(cleanup).toHaveBeenCalled() - expect(router.serverSsr).toBeUndefined() - } finally { - originalServerSsr.cleanup() - } - }) - - test('synchronous renderer and transform setup failures do not orphan shell errors', async () => { - const rendererShellError = new Error('renderer-sync-shell-error') - const rendererSetupError = new Error('renderer-sync-setup-error') - const transformShellError = new Error('transform-sync-shell-error') - const transformSetupError = new Error('transform-sync-setup-error') - const unhandled: Array = [] - const onUnhandled = (error: unknown) => { - unhandled.push(error) - } - reactDomServerMocks.renderToPipeableStream - .mockImplementationOnce((_children, options) => { - options.onShellError(rendererShellError) - throw rendererSetupError - }) - .mockImplementationOnce((_children, options) => { - options.onShellError(transformShellError) - return { abort: vi.fn(), pipe: vi.fn() } - }) - routerTransformMocks.readableOptions.mockImplementationOnce(() => { - throw transformSetupError - }) - - const rendererRouter = await buildRouter() - const transformRouter = await buildRouter() - const rendererServerSsr = rendererRouter.serverSsr! - const transformServerSsr = transformRouter.serverSsr! - process.on('unhandledRejection', onUnhandled) - try { - await expect( - renderRouterToStream({ - request: new Request('http://localhost/'), - router: rendererRouter, - responseHeaders: new Headers(), - children: null, - }), - ).rejects.toBe(rendererSetupError) - await expect( - renderRouterToStream({ - request: new Request('http://localhost/'), - router: transformRouter, - responseHeaders: new Headers(), - children: null, - }), - ).rejects.toBe(transformSetupError) - await new Promise((resolve) => setTimeout(resolve, 0)) - - expect(unhandled).toEqual([]) - expect(rendererRouter.serverSsr).toBeUndefined() - expect(transformRouter.serverSsr).toBeUndefined() - } finally { - process.off('unhandledRejection', onUnhandled) - rendererServerSsr.cleanup() - transformServerSsr.cleanup() - } - }) - - test('a live AbortError is logged without aborting the stream', async () => { - const abort = vi.fn() - const renderError = new DOMException('component failed', 'AbortError') reactDomServerMocks.renderToPipeableStream.mockImplementationOnce( (_children, opts) => { - queueMicrotask(() => opts.onShellReady()) - return { - abort, - pipe(destination: NodeJS.WritableStream) { - destination.write('shell') - opts.onError(renderError, { - componentStack: '', - }) - destination.end('') - }, - } - }, - ) - - const router = await buildRouter() - expect(router.serverSsr!.takeInitialHydrationScriptTags()).toBeDefined() - const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) - try { - const response = unwrapResponse( - await renderRouterToStream({ - request: new Request('http://localhost/'), - router, - responseHeaders: new Headers(), - children: null, - }), - ) - - await expect(response.text()).resolves.toContain('shell') - expect(routerTransformMocks.readableOptions).toHaveBeenCalledWith( - expect.objectContaining({ rendererSafePoint: 'script-close' }), - ) - expect(abort).not.toHaveBeenCalled() - expect(errorSpy).toHaveBeenCalledWith( - 'Error in renderToPipeableStream:', - renderError, - { componentStack: '' }, - ) - } finally { - errorSpy.mockRestore() - router.serverSsr?.cleanup() - } - }) - - test('pipeable renderer cancellation does not log a render error', async () => { - let options: - | Parameters[1] - | undefined - const abort = vi.fn((reason: unknown) => { - options?.onError?.(reason, { componentStack: '' }) - }) - reactDomServerMocks.renderToPipeableStream.mockImplementationOnce( - (_children, nextOptions) => { - options = nextOptions - queueMicrotask(() => nextOptions.onShellReady()) + opts.onError(new Error('sync-react-error'), { componentStack: '' }) return { abort, pipe: vi.fn() } }, ) const router = await buildRouter() const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) - const reason = new Error('pipeable-consumer-gone') try { const response = unwrapResponse( await renderRouterToStream({ @@ -766,15 +102,130 @@ describe('renderRouterToStream - renderer selection and pipeable errors', () => }), ) - await response.body!.cancel(reason) - expect(abort).toHaveBeenCalledWith(reason) - expect(errorSpy).not.toHaveBeenCalled() + expect(abort).toHaveBeenCalledOnce() + await expectBodyRejects(response, 'sync-react-error') } finally { errorSpy.mockRestore() router.serverSsr?.cleanup() } }) + test('sync non-Error onError before pipeable assignment still errors body', async () => { + const abort = vi.fn() + reactDomServerMocks.renderToPipeableStream.mockImplementationOnce( + (_children, opts) => { + opts.onError('string-react-error', { componentStack: '' }) + return { abort, pipe: vi.fn() } + }, + ) + + const router = await buildRouter() + const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) + try { + const response = unwrapResponse( + await renderRouterToStream({ + request: new Request('http://localhost/'), + router, + responseHeaders: new Headers(), + children: null, + }), + ) + + expect(abort).toHaveBeenCalledOnce() + await expectBodyRejects(response, 'string-react-error') + } finally { + errorSpy.mockRestore() + router.serverSsr?.cleanup() + } + }) + + test('sync undefined onError before pipeable assignment still errors body', async () => { + const abort = vi.fn() + reactDomServerMocks.renderToPipeableStream.mockImplementationOnce( + (_children, opts) => { + opts.onError(undefined, { componentStack: '' }) + return { abort, pipe: vi.fn() } + }, + ) + + const router = await buildRouter() + const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) + try { + const response = unwrapResponse( + await renderRouterToStream({ + request: new Request('http://localhost/'), + router, + responseHeaders: new Headers(), + children: null, + }), + ) + + expect(abort).toHaveBeenCalledOnce() + await expectBodyRejects(response, 'SSR aborted') + } finally { + errorSpy.mockRestore() + router.serverSsr?.cleanup() + } + }) + + test('undefined onError after response attach errors body', async () => { + const abort = vi.fn() + let onError!: (error: unknown, info: unknown) => void + reactDomServerMocks.renderToPipeableStream.mockImplementationOnce( + (_children, opts) => { + onError = opts.onError + return { abort, pipe: vi.fn() } + }, + ) + + const router = await buildRouter() + const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) + try { + const response = unwrapResponse( + await renderRouterToStream({ + request: new Request('http://localhost/'), + router, + responseHeaders: new Headers(), + children: null, + }), + ) + + onError(undefined, { componentStack: '' }) + expect(abort).toHaveBeenCalledOnce() + await expectBodyRejects(response, 'SSR aborted') + } finally { + errorSpy.mockRestore() + router.serverSsr?.cleanup() + } + }) + + test('setup throw rejects instead of returning streamed 200', async () => { + const setupError = new Error('setup-boom') + reactDomServerMocks.renderToPipeableStream.mockImplementationOnce(() => { + throw setupError + }) + + const router = await buildRouter() + const cleanup = vi.spyOn(router.serverSsr!, 'cleanup') + const originalServerSsr = router.serverSsr! + const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) + try { + await expect( + renderRouterToStream({ + request: new Request('http://localhost/'), + router, + responseHeaders: new Headers(), + children: null, + }), + ).rejects.toThrow('setup-boom') + + expect(cleanup).toHaveBeenCalledOnce() + } finally { + errorSpy.mockRestore() + originalServerSsr.cleanup() + } + }) + test('request abort cancels pipeable rendering before the response body is consumed', async () => { const abort = vi.fn() reactDomServerMocks.renderToPipeableStream.mockImplementationOnce( @@ -786,13 +237,12 @@ describe('renderRouterToStream - renderer selection and pipeable errors', () => const router = await buildRouter() const controller = new AbortController() - const request = new Request('http://localhost/', { - signal: controller.signal, - }) try { const response = unwrapResponse( await renderRouterToStream({ - request, + request: new Request('http://localhost/', { + signal: controller.signal, + }), router, responseHeaders: new Headers(), children: null, @@ -802,94 +252,13 @@ describe('renderRouterToStream - renderer selection and pipeable errors', () => expect(response.body).not.toBeNull() controller.abort(new Error('request-gone')) await vi.waitFor(() => expect(abort).toHaveBeenCalledOnce()) - await expectBodyRejects(response, 'request-gone') + const terminated = await Promise.race([ + expectBodyRejects(response, 'request-gone').then(() => true), + new Promise((resolve) => setTimeout(() => resolve(false), 2000)), + ]) + expect(terminated).toBe(true) } finally { router.serverSsr?.cleanup() } }) - - test('stream lifetime abort rejects before bot readiness even when React resolves onAllReady', async () => { - let options: - | Parameters[1] - | undefined - const pipe = vi.fn() - const abort = vi.fn((_reason?: unknown) => { - options?.onAllReady?.() - }) - reactDomServerMocks.renderToPipeableStream.mockImplementationOnce( - (_children, nextOptions) => { - options = nextOptions - return { abort, pipe } - }, - ) - - const router = await buildRouter() - const cleanup = vi.spyOn(router.serverSsr!, 'cleanup') - const originalServerSsr = router.serverSsr! - const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}) - vi.useFakeTimers() - try { - const responsePromise = renderRouterToStream({ - request: new Request('http://localhost/', { - headers: { 'User-Agent': 'Googlebot' }, - }), - router, - responseHeaders: new Headers(), - children: null, - }) - const rejection = expect(responsePromise).rejects.toThrow( - 'Stream lifetime exceeded', - ) - - expect(routerTransformMocks.readableOptions).toHaveBeenCalledOnce() - expect(options?.onAllReady).toBeTypeOf('function') - await vi.runAllTimersAsync() - - await rejection - expect(abort).toHaveBeenCalledOnce() - expect(abort.mock.calls[0]![0]).toMatchObject({ - message: 'Stream lifetime exceeded', - }) - expect(pipe).not.toHaveBeenCalled() - expect(cleanup).toHaveBeenCalled() - expect(router.serverSsr).toBeUndefined() - } finally { - vi.useRealTimers() - warnSpy.mockRestore() - originalServerSsr.cleanup() - } - }) - - test('request abort before shell readiness rejects and cleans up', async () => { - const abort = vi.fn() - const controller = new AbortController() - reactDomServerMocks.renderToPipeableStream.mockReturnValueOnce({ - abort, - pipe: vi.fn(), - }) - - const router = await buildRouter() - const cleanup = vi.spyOn(router.serverSsr!, 'cleanup') - const originalServerSsr = router.serverSsr! - const reason = new Error('request-gone-before-shell') - try { - const responsePromise = renderRouterToStream({ - request: new Request('http://localhost/', { - signal: controller.signal, - }), - router, - responseHeaders: new Headers(), - children: null, - }) - await Promise.resolve() - controller.abort(reason) - - await expect(responsePromise).rejects.toBe(reason) - expect(abort).toHaveBeenCalledOnce() - expect(cleanup).toHaveBeenCalledOnce() - expect(router.serverSsr).toBeUndefined() - } finally { - originalServerSsr.cleanup() - } - }) }) diff --git a/packages/react-router/tests/setupTests.tsx b/packages/react-router/tests/setupTests.tsx index 6ab5039d6e..c3d7ec5cf7 100644 --- a/packages/react-router/tests/setupTests.tsx +++ b/packages/react-router/tests/setupTests.tsx @@ -1,3 +1,4 @@ +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 e13437780e..c11cd054f1 100644 --- a/packages/react-router/tests/useBlocker.test.tsx +++ b/packages/react-router/tests/useBlocker.test.tsx @@ -1,4 +1,5 @@ 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/useHydrated.test.tsx b/packages/react-router/tests/useHydrated.test.tsx deleted file mode 100644 index 4b7c6ff469..0000000000 --- a/packages/react-router/tests/useHydrated.test.tsx +++ /dev/null @@ -1,63 +0,0 @@ -import React from 'react' -import { hydrateRoot } from 'react-dom/client' -import { renderToString } from 'react-dom/server' -import { act, cleanup, renderHook } from '@testing-library/react' -import { afterEach, expect, test, vi } from 'vitest' -import { ClientOnly, useHydrated } from '../src/ClientOnly' - -afterEach(() => { - cleanup() - vi.restoreAllMocks() -}) - -test('keeps both snapshot getters stable across renders', () => { - const spy = vi.spyOn(React, 'useSyncExternalStore') - const view = renderHook(() => useHydrated()) - const first = spy.mock.calls.at(-1)! - expect(view.result.current).toBe(true) - view.rerender() - const next = spy.mock.calls.at(-1)! - expect(next[0]).toBe(first[0]) - expect(next[1]).toBe(first[1]) - expect(next[2]).toBe(first[2]) - expect(view.result.current).toBe(true) -}) - -test('preserves the server snapshot through hydration before showing client content', async () => { - const values: Array = [] - function Probe() { - const hydrated = useHydrated() - values.push(hydrated) - return ( -
- {String(hydrated)} - Fallback}> - Client content - -
- ) - } - const container = document.createElement('div') - container.innerHTML = renderToString() - document.body.append(container) - expect(values).toEqual([false]) - expect(container).toHaveTextContent('falseFallback') - values.length = 0 - const onRecoverableError = vi.fn() - let root: ReturnType | undefined - try { - await act(() => { - root = hydrateRoot(container, , { onRecoverableError }) - }) - expect(values[0]).toBe(false) - expect(values.at(-1)).toBe(true) - expect(container).toHaveTextContent('trueClient content') - expect(onRecoverableError).not.toHaveBeenCalled() - values.length = 0 - await act(() => root!.render()) - expect(values).toEqual([true]) - } finally { - await act(() => root?.unmount()) - container.remove() - } -}) diff --git a/packages/react-router/tests/useMatch.test.tsx b/packages/react-router/tests/useMatch.test.tsx index f1b8352bb0..ac4c52f6cc 100644 --- a/packages/react-router/tests/useMatch.test.tsx +++ b/packages/react-router/tests/useMatch.test.tsx @@ -1,4 +1,3 @@ -import { useState } from 'react' import { afterEach, describe, expect, test, vi } from 'vitest' import { cleanup, @@ -101,40 +100,6 @@ describe('useMatch', () => { }) }) - test('switches subscriptions when the targeted route changes', async () => { - function RootComponent() { - const [from, setFrom] = useState('/posts') - const routeId = useMatch({ - from, - shouldThrow: false, - select: (match) => match.routeId, - }) - - return ( - <> -
{routeId ?? 'absent'}
- - - - - ) - } - - setup({ RootComponent }) - expect(await screen.findByText('IndexTitle')).toBeInTheDocument() - expect(screen.getByTestId('targeted-route')).toHaveTextContent('absent') - - fireEvent.click(screen.getByRole('button', { name: 'Select index' })) - expect(screen.getByTestId('targeted-route')).toHaveTextContent('/') - - fireEvent.click(screen.getByRole('button', { name: 'Select posts' })) - expect(screen.getByTestId('targeted-route')).toHaveTextContent('absent') - - fireEvent.click(screen.getByRole('link', { name: 'Posts' })) - expect(await screen.findByText('PostsTitle')).toBeInTheDocument() - expect(screen.getByTestId('targeted-route')).toHaveTextContent('/posts') - }) - test('tracks presentation generations across replacement and re-entry', async () => { function RootComponent() { const targetedRevision = useMatch({ diff --git a/packages/react-router/tests/useNavigate.test.tsx b/packages/react-router/tests/useNavigate.test.tsx index 3acf185b22..1ec1072a26 100644 --- a/packages/react-router/tests/useNavigate.test.tsx +++ b/packages/react-router/tests/useNavigate.test.tsx @@ -1,4 +1,5 @@ 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 798d9b74e4..0eb9e3c77e 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/jest-dom.setup.ts', './tests/setupTests.tsx'], + setupFiles: ['./tests/setupTests.tsx'], }, }) diff --git a/packages/react-start-client/CHANGELOG.md b/packages/react-start-client/CHANGELOG.md index 1cb31dea24..e0256aac9b 100644 --- a/packages/react-start-client/CHANGELOG.md +++ b/packages/react-start-client/CHANGELOG.md @@ -1,124 +1,5 @@ # @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 - -- Updated dependencies [[`f5ffd38`](https://github.com/TanStack/router/commit/f5ffd3884ba26778a2a8ce53b379a5bded231676), [`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f), [`0c1b5e3`](https://github.com/TanStack/router/commit/0c1b5e38de71b7e81bbf1fd81c73ee0cd68ffe47), [`3cdd1af`](https://github.com/TanStack/router/commit/3cdd1af04b3e2d6f777797ee7bddf285318dd9d2), [`76a7c0b`](https://github.com/TanStack/router/commit/76a7c0bfadb42d5f7fe7b9e1748acc7333178c91)]: - - @tanstack/react-router@1.170.40 - - @tanstack/router-core@1.171.33 - - @tanstack/start-client-core@1.170.33 - -## 1.168.37 - -### Patch Changes - -- Updated dependencies [[`73bfc15`](https://github.com/TanStack/router/commit/73bfc153eef460e9b670556215a5adb2b5cbf542)]: - - @tanstack/react-router@1.170.39 - -## 1.168.36 - -### Patch Changes - -- Updated dependencies [[`cecae54`](https://github.com/TanStack/router/commit/cecae5440b8edaea77c5448fe3d74bbd20fe10a4), [`0103578`](https://github.com/TanStack/router/commit/01035782e53af9b929c784b94ddd64b95efb89c7), [`ce10dcd`](https://github.com/TanStack/router/commit/ce10dcd4d9d3d23738744e453205aad5c6dbd716), [`84936cc`](https://github.com/TanStack/router/commit/84936cc04530bba11059c57b293a794922bbc5aa), [`bbd2336`](https://github.com/TanStack/router/commit/bbd2336b8446de3f7dd85070895e7cf43980183e)]: - - @tanstack/router-core@1.171.32 - - @tanstack/react-router@1.170.38 - - @tanstack/start-client-core@1.170.32 - -## 1.168.35 - -### Patch Changes - -- Updated dependencies [[`bc80866`](https://github.com/TanStack/router/commit/bc80866f6d6eb3e6f152ee3682eb783c96403e83), [`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a0b2ad9`](https://github.com/TanStack/router/commit/a0b2ad99aee64af08d16b0e4ff26b3ba42a99f0a), [`8e164d2`](https://github.com/TanStack/router/commit/8e164d28f9e9eb1a7301109230d7ece9817492a8), [`1ca361b`](https://github.com/TanStack/router/commit/1ca361ba52a627d2f76ab33323bd83d1d0aa65a3)]: - - @tanstack/router-core@1.171.31 - - @tanstack/react-router@1.170.37 - - @tanstack/start-client-core@1.170.31 - -## 1.168.34 - -### Patch Changes - -- Updated dependencies [[`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`6387d58`](https://github.com/TanStack/router/commit/6387d581eabc6e6a3acc87a0bc924e5a38d9c8b2), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5), [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58), [`6387d58`](https://github.com/TanStack/router/commit/6387d581eabc6e6a3acc87a0bc924e5a38d9c8b2), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef)]: - - @tanstack/router-core@1.171.30 - - @tanstack/react-router@1.170.36 - - @tanstack/start-client-core@1.170.30 - -## 1.168.33 - -### Patch Changes - -- Updated dependencies [[`8c43c71`](https://github.com/TanStack/router/commit/8c43c712523fc63dc3a814f3a19617e270ce8ed1)]: - - @tanstack/react-router@1.170.35 - -## 1.168.32 - -### Patch Changes - -- Updated dependencies [[`f9836f1`](https://github.com/TanStack/router/commit/f9836f16f0e25b0a8495f5e01e3f303b1cbc8725), [`aee42c6`](https://github.com/TanStack/router/commit/aee42c6b641d8e919bfed9e0f04bb1b72092f3a6), [`9c1871c`](https://github.com/TanStack/router/commit/9c1871ccc88bc1157186b8b460941a304ec740b8), [`9aec5a7`](https://github.com/TanStack/router/commit/9aec5a7012c47e83ec23bb4763494b72a5e68bfc), [`9871c06`](https://github.com/TanStack/router/commit/9871c0625806001d6bf373524821a00303438a91), [`0654c0a`](https://github.com/TanStack/router/commit/0654c0a1a427db24d9af13c1d6ad1217a588c0c9)]: - - @tanstack/router-core@1.171.29 - - @tanstack/react-router@1.170.34 - - @tanstack/start-client-core@1.170.29 - ## 1.168.31 ### Patch Changes diff --git a/packages/react-start-client/package.json b/packages/react-start-client/package.json index b919d47b92..2dd4ef6486 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.45", + "version": "1.168.31", "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 b295d77462..e274285cb8 100644 --- a/packages/react-start-client/src/hydration/visible.tsx +++ b/packages/react-start-client/src/hydration/visible.tsx @@ -26,22 +26,20 @@ function HydrationBoundary(props: { o?: () => void children?: React.ReactNode }) { - // 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 + const { g, o } = props + + if (!g.r) { + if (!reactUse) { + throw g.p + } + + reactUse(g.p) + } + 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 0e7abe502a..0d0ce1faad 100644 --- a/packages/react-start-client/src/tests/Hydrate.test.tsx +++ b/packages/react-start-client/src/tests/Hydrate.test.tsx @@ -12,14 +12,7 @@ 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, - visible, -} from '../hydration' +import { condition, idle, interaction, load, never } from '../hydration' import type { HydrateProps, HydrationPrefetchStrategy } from '../Hydrate' const InternalHydrate = Hydrate as React.ComponentType< @@ -680,84 +673,4 @@ 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 fae6bcabee..d1d7e287a3 100644 --- a/packages/react-start-rsc/CHANGELOG.md +++ b/packages/react-start-rsc/CHANGELOG.md @@ -1,181 +1,5 @@ # @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 - -- Updated dependencies [[`f5ffd38`](https://github.com/TanStack/router/commit/f5ffd3884ba26778a2a8ce53b379a5bded231676), [`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f), [`0c1b5e3`](https://github.com/TanStack/router/commit/0c1b5e38de71b7e81bbf1fd81c73ee0cd68ffe47), [`3cdd1af`](https://github.com/TanStack/router/commit/3cdd1af04b3e2d6f777797ee7bddf285318dd9d2), [`76a7c0b`](https://github.com/TanStack/router/commit/76a7c0bfadb42d5f7fe7b9e1748acc7333178c91)]: - - @tanstack/react-router@1.170.40 - - @tanstack/router-core@1.171.33 - - @tanstack/start-client-core@1.170.33 - - @tanstack/start-plugin-core@1.171.48 - - @tanstack/start-storage-context@1.167.35 - -## 0.1.57 - -### Patch Changes - -- Updated dependencies [[`73bfc15`](https://github.com/TanStack/router/commit/73bfc153eef460e9b670556215a5adb2b5cbf542)]: - - @tanstack/react-router@1.170.39 - -## 0.1.56 - -### Patch Changes - -- Updated dependencies [[`222300b`](https://github.com/TanStack/router/commit/222300b82fe6f2a5e7e7f460ae21a2e35c6230d7)]: - - @tanstack/start-plugin-core@1.171.47 - -## 0.1.55 - -### Patch Changes - -- Updated dependencies [[`cecae54`](https://github.com/TanStack/router/commit/cecae5440b8edaea77c5448fe3d74bbd20fe10a4), [`0103578`](https://github.com/TanStack/router/commit/01035782e53af9b929c784b94ddd64b95efb89c7), [`ce10dcd`](https://github.com/TanStack/router/commit/ce10dcd4d9d3d23738744e453205aad5c6dbd716), [`84936cc`](https://github.com/TanStack/router/commit/84936cc04530bba11059c57b293a794922bbc5aa), [`bbd2336`](https://github.com/TanStack/router/commit/bbd2336b8446de3f7dd85070895e7cf43980183e)]: - - @tanstack/router-core@1.171.32 - - @tanstack/react-router@1.170.38 - - @tanstack/start-client-core@1.170.32 - - @tanstack/start-plugin-core@1.171.46 - - @tanstack/start-storage-context@1.167.34 - -## 0.1.54 - -### Patch Changes - -- Updated dependencies [[`bc80866`](https://github.com/TanStack/router/commit/bc80866f6d6eb3e6f152ee3682eb783c96403e83), [`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a0b2ad9`](https://github.com/TanStack/router/commit/a0b2ad99aee64af08d16b0e4ff26b3ba42a99f0a), [`8e164d2`](https://github.com/TanStack/router/commit/8e164d28f9e9eb1a7301109230d7ece9817492a8), [`1ca361b`](https://github.com/TanStack/router/commit/1ca361ba52a627d2f76ab33323bd83d1d0aa65a3)]: - - @tanstack/router-core@1.171.31 - - @tanstack/react-router@1.170.37 - - @tanstack/start-plugin-core@1.171.45 - - @tanstack/start-client-core@1.170.31 - - @tanstack/start-storage-context@1.167.33 - -## 0.1.53 - -### Patch Changes - -- Updated dependencies [[`ab99818`](https://github.com/TanStack/router/commit/ab99818225835a1553a9f3513cd2093ff1b257be)]: - - @tanstack/start-plugin-core@1.171.44 - -## 0.1.52 - -### Patch Changes - -- Updated dependencies [[`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`6387d58`](https://github.com/TanStack/router/commit/6387d581eabc6e6a3acc87a0bc924e5a38d9c8b2), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5), [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58), [`6387d58`](https://github.com/TanStack/router/commit/6387d581eabc6e6a3acc87a0bc924e5a38d9c8b2), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef)]: - - @tanstack/router-core@1.171.30 - - @tanstack/react-router@1.170.36 - - @tanstack/start-client-core@1.170.30 - - @tanstack/start-plugin-core@1.171.43 - - @tanstack/start-storage-context@1.167.32 - -## 0.1.51 - -### Patch Changes - -- Updated dependencies [[`8c43c71`](https://github.com/TanStack/router/commit/8c43c712523fc63dc3a814f3a19617e270ce8ed1)]: - - @tanstack/react-router@1.170.35 - - @tanstack/start-plugin-core@1.171.42 - -## 0.1.50 - -### Patch Changes - -- Updated dependencies [[`f9836f1`](https://github.com/TanStack/router/commit/f9836f16f0e25b0a8495f5e01e3f303b1cbc8725), [`aee42c6`](https://github.com/TanStack/router/commit/aee42c6b641d8e919bfed9e0f04bb1b72092f3a6), [`49bcd4d`](https://github.com/TanStack/router/commit/49bcd4db743dba4a783d5533a42a0f97a5721292), [`9c1871c`](https://github.com/TanStack/router/commit/9c1871ccc88bc1157186b8b460941a304ec740b8), [`9aec5a7`](https://github.com/TanStack/router/commit/9aec5a7012c47e83ec23bb4763494b72a5e68bfc), [`9871c06`](https://github.com/TanStack/router/commit/9871c0625806001d6bf373524821a00303438a91), [`919c397`](https://github.com/TanStack/router/commit/919c3971493374cccc963e75b9b2a4e98ebf878a), [`0654c0a`](https://github.com/TanStack/router/commit/0654c0a1a427db24d9af13c1d6ad1217a588c0c9)]: - - @tanstack/router-core@1.171.29 - - @tanstack/react-router@1.170.34 - - @tanstack/router-utils@1.162.3 - - @tanstack/start-plugin-core@1.171.41 - - @tanstack/start-client-core@1.170.29 - - @tanstack/start-storage-context@1.167.31 - ## 0.1.49 ### Patch Changes diff --git a/packages/react-start-rsc/package.json b/packages/react-start-rsc/package.json index 40b1847068..e897a234ce 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.67", + "version": "0.1.49", "description": "React Server Components support for TanStack Start", "author": "Tanner Linsley", "license": "MIT", @@ -107,11 +107,11 @@ "pathe": "catalog:" }, "devDependencies": { - "@rspack/core": "2.2.7", + "@rspack/core": "2.0.0", "@testing-library/react": "catalog:", "@vitejs/plugin-react": "catalog:", - "@vitejs/plugin-rsc": "^0.5.39", - "react-server-dom-rspack": "^0.1.1", + "@vitejs/plugin-rsc": "^0.5.30", + "react-server-dom-rspack": "^0.0.2", "@tanstack/vite-config": "catalog:", "vitest": "catalog:", "jsdom": "catalog:", @@ -127,10 +127,10 @@ }, "peerDependencies": { "@rspack/core": ">=2.0.0-0", - "@vitejs/plugin-rsc": ">=0.5.38", + "@vitejs/plugin-rsc": ">=0.5.30", "react": ">=18.0.0 || >=19.0.0", "react-dom": ">=18.0.0 || >=19.0.0", - "react-server-dom-rspack": ">=0.1.1" + "react-server-dom-rspack": ">=0.0.2" }, "peerDependenciesMeta": { "@rspack/core": { diff --git a/packages/react-start-rsc/src/plugin/vite.ts b/packages/react-start-rsc/src/plugin/vite.ts index 9aa9523c6a..90da9d8b96 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: { - rolldownOptions: { + rollupOptions: { input: { index: rscEntryPath, }, diff --git a/packages/react-start-rsc/tests/rscCssTransform.test.tsx b/packages/react-start-rsc/tests/rscCssTransform.test.tsx index afc4686e94..0e2c2e45cf 100644 --- a/packages/react-start-rsc/tests/rscCssTransform.test.tsx +++ b/packages/react-start-rsc/tests/rscCssTransform.test.tsx @@ -161,55 +161,4 @@ 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 86d7854a59..6e6d65399f 100644 --- a/packages/react-start-server/CHANGELOG.md +++ b/packages/react-start-server/CHANGELOG.md @@ -1,132 +1,5 @@ # @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 - -- Updated dependencies [[`f5ffd38`](https://github.com/TanStack/router/commit/f5ffd3884ba26778a2a8ce53b379a5bded231676), [`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f), [`e81845f`](https://github.com/TanStack/router/commit/e81845ff1e4fc66d4e4a87f086be65906f7adb94), [`0c1b5e3`](https://github.com/TanStack/router/commit/0c1b5e38de71b7e81bbf1fd81c73ee0cd68ffe47), [`3cdd1af`](https://github.com/TanStack/router/commit/3cdd1af04b3e2d6f777797ee7bddf285318dd9d2)]: - - @tanstack/react-router@1.170.40 - - @tanstack/router-core@1.171.33 - - @tanstack/start-server-core@1.169.38 - -## 1.167.44 - -### Patch Changes - -- Updated dependencies [[`73bfc15`](https://github.com/TanStack/router/commit/73bfc153eef460e9b670556215a5adb2b5cbf542)]: - - @tanstack/react-router@1.170.39 - -## 1.167.43 - -### Patch Changes - -- Updated dependencies [[`cecae54`](https://github.com/TanStack/router/commit/cecae5440b8edaea77c5448fe3d74bbd20fe10a4), [`0103578`](https://github.com/TanStack/router/commit/01035782e53af9b929c784b94ddd64b95efb89c7), [`ce10dcd`](https://github.com/TanStack/router/commit/ce10dcd4d9d3d23738744e453205aad5c6dbd716), [`84936cc`](https://github.com/TanStack/router/commit/84936cc04530bba11059c57b293a794922bbc5aa), [`bbd2336`](https://github.com/TanStack/router/commit/bbd2336b8446de3f7dd85070895e7cf43980183e)]: - - @tanstack/router-core@1.171.32 - - @tanstack/react-router@1.170.38 - - @tanstack/start-server-core@1.169.37 - -## 1.167.42 - -### Patch Changes - -- Updated dependencies [[`bc80866`](https://github.com/TanStack/router/commit/bc80866f6d6eb3e6f152ee3682eb783c96403e83), [`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a0b2ad9`](https://github.com/TanStack/router/commit/a0b2ad99aee64af08d16b0e4ff26b3ba42a99f0a), [`8e164d2`](https://github.com/TanStack/router/commit/8e164d28f9e9eb1a7301109230d7ece9817492a8), [`1ca361b`](https://github.com/TanStack/router/commit/1ca361ba52a627d2f76ab33323bd83d1d0aa65a3)]: - - @tanstack/router-core@1.171.31 - - @tanstack/react-router@1.170.37 - - @tanstack/start-server-core@1.169.36 - -## 1.167.41 - -### Patch Changes - -- Updated dependencies [[`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`6387d58`](https://github.com/TanStack/router/commit/6387d581eabc6e6a3acc87a0bc924e5a38d9c8b2), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5), [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58), [`6387d58`](https://github.com/TanStack/router/commit/6387d581eabc6e6a3acc87a0bc924e5a38d9c8b2), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef)]: - - @tanstack/router-core@1.171.30 - - @tanstack/react-router@1.170.36 - - @tanstack/start-server-core@1.169.35 - -## 1.167.40 - -### Patch Changes - -- Updated dependencies [[`8c43c71`](https://github.com/TanStack/router/commit/8c43c712523fc63dc3a814f3a19617e270ce8ed1), [`d914b08`](https://github.com/TanStack/router/commit/d914b085bb4bf29ec18a531201e377c10681b661)]: - - @tanstack/react-router@1.170.35 - - @tanstack/start-server-core@1.169.34 - -## 1.167.39 - -### Patch Changes - -- Updated dependencies [[`f9836f1`](https://github.com/TanStack/router/commit/f9836f16f0e25b0a8495f5e01e3f303b1cbc8725), [`aee42c6`](https://github.com/TanStack/router/commit/aee42c6b641d8e919bfed9e0f04bb1b72092f3a6), [`9c1871c`](https://github.com/TanStack/router/commit/9c1871ccc88bc1157186b8b460941a304ec740b8), [`9aec5a7`](https://github.com/TanStack/router/commit/9aec5a7012c47e83ec23bb4763494b72a5e68bfc), [`9871c06`](https://github.com/TanStack/router/commit/9871c0625806001d6bf373524821a00303438a91), [`0654c0a`](https://github.com/TanStack/router/commit/0654c0a1a427db24d9af13c1d6ad1217a588c0c9)]: - - @tanstack/router-core@1.171.29 - - @tanstack/react-router@1.170.34 - - @tanstack/start-server-core@1.169.33 - ## 1.167.38 ### Patch Changes diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index a725b70d9c..cd07592ecd 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.52", + "version": "1.167.38", "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 9d6432f985..165aef092e 100644 --- a/packages/react-start/CHANGELOG.md +++ b/packages/react-start/CHANGELOG.md @@ -1,236 +1,5 @@ # @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 - -- Updated dependencies [[`f5ffd38`](https://github.com/TanStack/router/commit/f5ffd3884ba26778a2a8ce53b379a5bded231676), [`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f), [`e81845f`](https://github.com/TanStack/router/commit/e81845ff1e4fc66d4e4a87f086be65906f7adb94), [`76a7c0b`](https://github.com/TanStack/router/commit/76a7c0bfadb42d5f7fe7b9e1748acc7333178c91)]: - - @tanstack/react-router@1.170.40 - - @tanstack/start-client-core@1.170.33 - - @tanstack/start-server-core@1.169.38 - - @tanstack/start-plugin-core@1.171.48 - - @tanstack/react-start-client@1.168.38 - - @tanstack/react-start-rsc@0.1.58 - - @tanstack/react-start-server@1.167.45 - -## 1.168.58 - -### Patch Changes - -- Updated dependencies [[`73bfc15`](https://github.com/TanStack/router/commit/73bfc153eef460e9b670556215a5adb2b5cbf542)]: - - @tanstack/react-router@1.170.39 - - @tanstack/react-start-client@1.168.37 - - @tanstack/react-start-rsc@0.1.57 - - @tanstack/react-start-server@1.167.44 - -## 1.168.57 - -### Patch Changes - -- Updated dependencies [[`222300b`](https://github.com/TanStack/router/commit/222300b82fe6f2a5e7e7f460ae21a2e35c6230d7)]: - - @tanstack/start-plugin-core@1.171.47 - - @tanstack/react-start-rsc@0.1.56 - -## 1.168.56 - -### Patch Changes - -- Updated dependencies []: - - @tanstack/react-router@1.170.38 - - @tanstack/react-start-client@1.168.36 - - @tanstack/react-start-rsc@0.1.55 - - @tanstack/react-start-server@1.167.43 - - @tanstack/start-client-core@1.170.32 - - @tanstack/start-plugin-core@1.171.46 - - @tanstack/start-server-core@1.169.37 - -## 1.168.55 - -### Patch Changes - -- Updated dependencies [[`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`8e164d2`](https://github.com/TanStack/router/commit/8e164d28f9e9eb1a7301109230d7ece9817492a8)]: - - @tanstack/react-router@1.170.37 - - @tanstack/start-plugin-core@1.171.45 - - @tanstack/start-client-core@1.170.31 - - @tanstack/start-server-core@1.169.36 - - @tanstack/react-start-client@1.168.35 - - @tanstack/react-start-rsc@0.1.54 - - @tanstack/react-start-server@1.167.42 - -## 1.168.54 - -### Patch Changes - -- Updated dependencies [[`ab99818`](https://github.com/TanStack/router/commit/ab99818225835a1553a9f3513cd2093ff1b257be)]: - - @tanstack/start-plugin-core@1.171.44 - - @tanstack/react-start-rsc@0.1.53 - -## 1.168.53 - -### Patch Changes - -- Updated dependencies [[`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6387d58`](https://github.com/TanStack/router/commit/6387d581eabc6e6a3acc87a0bc924e5a38d9c8b2), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`6387d58`](https://github.com/TanStack/router/commit/6387d581eabc6e6a3acc87a0bc924e5a38d9c8b2), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5)]: - - @tanstack/react-router@1.170.36 - - @tanstack/start-server-core@1.169.35 - - @tanstack/react-start-client@1.168.34 - - @tanstack/react-start-rsc@0.1.52 - - @tanstack/react-start-server@1.167.41 - - @tanstack/start-client-core@1.170.30 - - @tanstack/start-plugin-core@1.171.43 - -## 1.168.52 - -### Patch Changes - -- Updated dependencies [[`8c43c71`](https://github.com/TanStack/router/commit/8c43c712523fc63dc3a814f3a19617e270ce8ed1), [`d914b08`](https://github.com/TanStack/router/commit/d914b085bb4bf29ec18a531201e377c10681b661)]: - - @tanstack/react-router@1.170.35 - - @tanstack/start-server-core@1.169.34 - - @tanstack/react-start-client@1.168.33 - - @tanstack/react-start-rsc@0.1.51 - - @tanstack/react-start-server@1.167.40 - - @tanstack/start-plugin-core@1.171.42 - -## 1.168.51 - -### Patch Changes - -- Updated dependencies [[`aee42c6`](https://github.com/TanStack/router/commit/aee42c6b641d8e919bfed9e0f04bb1b72092f3a6), [`49bcd4d`](https://github.com/TanStack/router/commit/49bcd4db743dba4a783d5533a42a0f97a5721292), [`9c1871c`](https://github.com/TanStack/router/commit/9c1871ccc88bc1157186b8b460941a304ec740b8), [`9aec5a7`](https://github.com/TanStack/router/commit/9aec5a7012c47e83ec23bb4763494b72a5e68bfc), [`919c397`](https://github.com/TanStack/router/commit/919c3971493374cccc963e75b9b2a4e98ebf878a)]: - - @tanstack/react-router@1.170.34 - - @tanstack/router-utils@1.162.3 - - @tanstack/start-plugin-core@1.171.41 - - @tanstack/start-server-core@1.169.33 - - @tanstack/react-start-client@1.168.32 - - @tanstack/react-start-rsc@0.1.50 - - @tanstack/react-start-server@1.167.39 - - @tanstack/start-client-core@1.170.29 - ## 1.168.50 ### Patch Changes diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 6d51a4c6d0..21dfafc007 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.169.6", + "version": "1.168.50", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", @@ -171,10 +171,10 @@ "pathe": "catalog:" }, "peerDependencies": { - "@rsbuild/core": "^2.0.5", + "@rsbuild/core": "^2.0.0", "react": ">=18.0.0 || >=19.0.0", "react-dom": ">=18.0.0 || >=19.0.0", - "vite": ">=8.0.0" + "vite": ">=7.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 81b020713b..d59292bc4b 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 -- `@tanstack/start-client-core#start-core/server-functions` — server function patterns -- `@tanstack/start-client-core#start-core/execution-model` — isomorphic execution +- [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 diff --git a/packages/react-start/skills/react-start/SKILL.md b/packages/react-start/skills/react-start/SKILL.md index 988373f107..b0f69009e1 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 -- `@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 +- [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 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 81561824a0..1d0b0b099f 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 query on the server -> `ssr: 'data-only'` +- Route component needs browser APIs but loader can still prefetch 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 `query` with `staleTime: 'static'` +- Query-managed RSC -> `useSuspenseQuery` + SSR `ensureQueryData` - 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 f48ba02d5b..6619f78942 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,13 +73,10 @@ const postQueryOptions = (postId: string) => ({ }) ``` -For SSR reuse, run a static query in the route loader so cached data is reused without a stale refetch: +For SSR reuse, prefetch in the route loader: ```tsx -await context.queryClient.query({ - ...postQueryOptions(params.postId), - staleTime: 'static', -}) +await context.queryClient.ensureQueryData(postQueryOptions(params.postId)) ``` 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 d891e2230d..f22b481035 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 queries. +// Assumes your router context provides a queryClient for SSR prefetch. import type { ReactNode } from 'react' import { createFileRoute } from '@tanstack/react-router' @@ -68,10 +68,7 @@ const postQueryOptions = (postId: string) => ({ export const Route = createFileRoute('/posts/$postId')({ loader: async ({ context, params }) => { - await context.queryClient.query({ - ...postQueryOptions(params.postId), - staleTime: 'static', - }) + await context.queryClient.ensureQueryData(postQueryOptions(params.postId)) }, component: PostPage, }) diff --git a/packages/react-start/src/default-entry/server.ts b/packages/react-start/src/default-entry/server.ts index 638ac3c0a6..8e734a7e49 100644 --- a/packages/react-start/src/default-entry/server.ts +++ b/packages/react-start/src/default-entry/server.ts @@ -1,7 +1,6 @@ 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' @@ -11,8 +10,12 @@ 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 } -// Bind the shared request context and fallback error handling to React's Register. -export const createServerEntry: (entry: ServerEntry) => ServerEntry = - createCoreServerEntry +export function createServerEntry(entry: ServerEntry): ServerEntry { + return { + async fetch(...args) { + return await entry.fetch(...args) + }, + } +} export default createServerEntry({ fetch }) diff --git a/packages/router-cli/CHANGELOG.md b/packages/router-cli/CHANGELOG.md index 67101c3e51..e6b9be6682 100644 --- a/packages/router-cli/CHANGELOG.md +++ b/packages/router-cli/CHANGELOG.md @@ -1,102 +1,5 @@ # @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 - -- Updated dependencies []: - - @tanstack/router-generator@1.167.39 - -## 1.167.38 - -### Patch Changes - -- Updated dependencies []: - - @tanstack/router-generator@1.167.38 - -## 1.167.37 - -### Patch Changes - -- Updated dependencies []: - - @tanstack/router-generator@1.167.37 - -## 1.167.36 - -### Patch Changes - -- Updated dependencies []: - - @tanstack/router-generator@1.167.36 - -## 1.167.35 - -### Patch Changes - -- Updated dependencies [[`49bcd4d`](https://github.com/TanStack/router/commit/49bcd4db743dba4a783d5533a42a0f97a5721292)]: - - @tanstack/router-generator@1.167.35 - ## 1.167.34 ### Patch Changes diff --git a/packages/router-cli/package.json b/packages/router-cli/package.json index 51a729d79b..024c85cbf8 100644 --- a/packages/router-cli/package.json +++ b/packages/router-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-cli", - "version": "1.168.0", + "version": "1.167.34", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", @@ -63,15 +63,16 @@ "bin/**" ], "engines": { - "node": "^20.19.0 || >=22.12.0" + "node": ">=20.19" }, "dependencies": { "@tanstack/router-generator": "workspace:*", - "cac": "^7.1.0", - "chokidar": "catalog:" + "chokidar": "catalog:", + "yargs": "^17.7.2" }, "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 7610fde457..eca5a9ff0e 100644 --- a/packages/router-cli/src/index.ts +++ b/packages/router-cli/src/index.ts @@ -1,51 +1,25 @@ -import { cac } from 'cac' +import yargs from 'yargs' +import { hideBin } from 'yargs/helpers' import { getConfig } from '@tanstack/router-generator' import { generate } from './generate' import { watch } from './watch' -declare const __TSR_VERSION__: string - main() export function main() { - const cli = cac('tsr') - - cli - .command('generate', 'Generate the routes for a project') - .action(async () => { + yargs(hideBin(process.argv)) + .scriptName('tsr') + .usage('$0 [args]') + .command('generate', 'Generate the routes for a project', async () => { const config = getConfig() await generate(config, process.cwd()) }) - - cli .command( 'watch', 'Continuously watch and generate the routes for a project', + () => { + watch(process.cwd()) + }, ) - .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() - } + .help().argv } diff --git a/packages/router-cli/vite.config.ts b/packages/router-cli/vite.config.ts index 0eac9e6ed4..f418b4e943 100644 --- a/packages/router-cli/vite.config.ts +++ b/packages/router-cli/vite.config.ts @@ -1,12 +1,7 @@ import { defineConfig, mergeConfig } from 'vitest/config' import { tanstackViteConfig } from '@tanstack/vite-config' -import packageJson from './package.json' -const config = defineConfig({ - define: { - __TSR_VERSION__: JSON.stringify(packageJson.version), - }, -}) +const config = defineConfig({}) export default mergeConfig( config, diff --git a/packages/router-core/AGENTS.md b/packages/router-core/AGENTS.md deleted file mode 100644 index 7402f0bdfe..0000000000 --- a/packages/router-core/AGENTS.md +++ /dev/null @@ -1,12 +0,0 @@ -# Router core - -- `RouterCore.update` gates shared route-tree caching with `process.env.NODE_ENV !== 'development'`. `loadRouteChunk` checks promise ownership outside production so obsolete lazy imports cannot overwrite HMR changes. Preserve both behaviors; validate hot updates while imports are pending. -- Route hooks, lifecycle callbacks, and abort listeners can navigate synchronously. Recheck the internal navigation owner after callbacks and awaits before publishing state/assets. Public loader abort signals belong to shared data generations; self-aborting a loader does not discard its result or error. Preserve loader ownership when transferring work between preload, navigation, cache, and background loads; see [`tests/preload-public-signal-lifetime.test.ts`](tests/preload-public-signal-lifetime.test.ts). -- Reusing loader work/data does not reuse `beforeLoad`: each active preload and subsequent navigation reruns it. Keep its returned context separate from reusable route-context contributions; see [`tests/public-preload-lane-contract.test.ts`](tests/public-preload-lane-contract.test.ts). -- Code emitted into HTML (`?script-string` entries and RawStream factories) executes without module scope. Keep it self-contained; pass dependencies explicitly. Validate emitted strings through the existing execution tests after refactors (`RawStream`, `scroll-restoration-script`, `tsr-script-teardown`). -- Before changing SSR streaming or hydration transport, read [`src/ssr/STREAMING.md`](src/ssr/STREAMING.md). Byte ordering, renderer safe points, and completion handling have framework-specific contracts. -- 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-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 b01991e223..99b17900b3 100644 --- a/packages/router-core/CHANGELOG.md +++ b/packages/router-core/CHANGELOG.md @@ -1,198 +1,5 @@ # @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 - -- [#8297](https://github.com/TanStack/router/pull/8297) [`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f) - Update `seroval` and `seroval-plugins` from 1.6.2 to 1.6.7. This picks up the typed array length guard, the `maxBase64Length` and `compactArrayBufferViews` options, and the `isStream` export. - -- [#8460](https://github.com/TanStack/router/pull/8460) [`0c1b5e3`](https://github.com/TanStack/router/commit/0c1b5e38de71b7e81bbf1fd81c73ee0cd68ffe47) - Abort reserved loader generations with no remaining owners when invalidation removes them from discovery, ensuring their public abort signals are retired. - -- [#8519](https://github.com/TanStack/router/pull/8519) [`3cdd1af`](https://github.com/TanStack/router/commit/3cdd1af04b3e2d6f777797ee7bddf285318dd9d2) - Hand native scroll restoration back to the browser on pagehide, including entries entering BFCache, and reclaim manual restoration when a cached document resumes. - -## 1.171.32 - -### Patch Changes - -- [#8363](https://github.com/TanStack/router/pull/8363) [`cecae54`](https://github.com/TanStack/router/commit/cecae5440b8edaea77c5448fe3d74bbd20fe10a4) - Detect plain objects by constructor instead of `Object.prototype.toString` dispatches in `isPlainObject`, which gates every `deepEqual` and `replaceEqualDeep` recursion step. Object literals, `JSON.parse` output and null-prototype objects are still plain; objects from another realm no longer are. Records with an own `constructor` key (for example the search params of `?constructor=foo`) fall back to a prototype check, so they keep structural sharing while class instances stay opaque. - -- [#8364](https://github.com/TanStack/router/pull/8364) [`0103578`](https://github.com/TanStack/router/commit/01035782e53af9b929c784b94ddd64b95efb89c7) - Compare and copy plain objects in `replaceEqualDeep` by their string keys only, skipping the symbol-key lookup that dominated key enumeration. Objects with non-enumerable own properties, or symbol keys on the incoming value, now pass through untouched instead of being structurally shared. - -- [#8411](https://github.com/TanStack/router/pull/8411) [`ce10dcd`](https://github.com/TanStack/router/commit/ce10dcd4d9d3d23738744e453205aad5c6dbd716) - Reduce structural-sharing allocations by reusing array key storage and returning incoming objects when their children need no replacements. Preserve signed zero consistently, remove stale symbol properties, and keep sparse arrays with extra keys and built-ins with an own `constructor` opaque. - - Null-prototype mode now applies only when constructing a copy; existing incoming objects can be reused with their original prototype. - -- [#8362](https://github.com/TanStack/router/pull/8362) [`84936cc`](https://github.com/TanStack/router/commit/84936cc04530bba11059c57b293a794922bbc5aa) - Allocate the `replaceEqualDeep` result only at the first difference, so structural sharing of search, params, state and loader data no longer allocates when the new value is deeply equal to the previous one. - -- [#8389](https://github.com/TanStack/router/pull/8389) [`bbd2336`](https://github.com/TanStack/router/commit/bbd2336b8446de3f7dd85070895e7cf43980183e) - Split `replaceEqualDeep` into an equality scan and a copy phase: arrays and objects are scanned by dedicated loops up to the first difference, matching keys prove ownership without a `hasOwnProperty` lookup, and once a difference is found the result is built without any further equality bookkeeping. Deeply equal search, params, state and loader data are recognised faster and changed values are copied with less work per entry. - -## 1.171.31 - -### Patch Changes - -- [#8417](https://github.com/TanStack/router/pull/8417) [`bc80866`](https://github.com/TanStack/router/commit/bc80866f6d6eb3e6f152ee3682eb783c96403e83) - Speed up `deepEqual`: identical array elements no longer recurse, the exact comparison keeps a single key counter, and the redundant `typeof` early exit is gone. Equal numeric arrays compare ~70% faster and record comparisons 5–12% faster in the mixed-mode workloads that Link option stabilization and active-state checks produce, with a slightly smaller bundle. Behavior, including key enumeration and getter read order, is unchanged. - -- [#8418](https://github.com/TanStack/router/pull/8418) [`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387) - `deepEqual` now takes its flags as positional arguments — `deepEqual(a, b, partial?, explicitUndefined?)` — instead of an options object. The router's hot callers (Link option stabilization and active-state checks, `matchRoute`) no longer allocate an options object per comparison, and the comparator reads two booleans instead of a polymorphic object. `explicitUndefined` replaces `ignoreUndefined: false`. `deepEqual` is an internal helper; it stays exported for compatibility of two-argument calls. - -- [#8204](https://github.com/TanStack/router/pull/8204) [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26) - Reduce per-request SSR overhead: abort settled route matches with one shared `AbortError`-shaped reason instead of building a stack-capturing `DOMException` per match, skip `JSON.parse` for search values that cannot start JSON, wait on request signals with one listener per wait, and keep resolved server-function modules in production builds instead of re-importing them on every call. - -- [#8419](https://github.com/TanStack/router/pull/8419) [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd) - `resolvePath` (internal helper) now takes positional arguments — `resolvePath(base, to, trailingSlash?, cache?)` — so `buildLocation` and `matchRoute` no longer allocate an options object per path resolution. - -- [#8204](https://github.com/TanStack/router/pull/8204) [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26) - Stream large deferred SSR hydration payloads through a backpressure-aware router transport, fail known setup errors before response creation, and close cancelled or expired transforms safely. - - Start now cancels discarded middleware and HEAD response bodies, including plain streams and derived branches. - - Server-function raw streams share one ordered response. Arbitrary or sequential consumption can require potentially unbounded buffering of unread data on the client. Cancelling one raw stream discards it locally, while aborting the whole call cancels the response and server work. Consume streams concurrently, cancel unused streams promptly, or use separate calls when independent backpressure is required. A raw stream that exceeds its unread-byte limit now fails alone; sibling streams and the JSON result keep flowing. - - The JSON wire shape of a `RawStream` server-function argument changed. Clients and servers must run matching versions for requests that pass a `RawStream`. - - The frame-protocol constants (`FRAME_TYPE_*`, `MAX_FRAME_PAYLOAD_SIZE`, `MAX_FRAMED_STREAMS`) moved from the `@tanstack/start-client-core` root to the `@tanstack/start-client-core/client-rpc` subpath. - - Router requests whose `Accept` header allows neither `text/html` nor `*/*` now receive `406 Not Acceptable` instead of `500`. - - Framework adapters share the body `` composition (`getSsrBodyScriptParts`, `composeSsrBodyScripts`) and the eager HTML response wrapper (`renderSsrHtmlResponse`) from `@tanstack/router-core`. - - Solid SSR now emits one document type and renders late lazy errors through route boundaries. A Solid `` without a `fallback` no longer holds the streamed shell; it renders inside the nearest `` boundary like React and Vue, and now renders falsy resolved values. - - Static server functions decode cached `RawStream` values with the client deserializer plugins. - - SSR Query integrations now keep request cleanup and stream ownership aligned with the router lifecycle. - -- [#8422](https://github.com/TanStack/router/pull/8422) [`a0b2ad9`](https://github.com/TanStack/router/commit/a0b2ad99aee64af08d16b0e4ff26b3ba42a99f0a) - Parse the location once when `router.update()` changes the basepath or rewrite, collect `invalidate()` match ids in a single pass, and specialize internal basepath composition without arrays or loops. Preserve basepath case sensitivity when creating and updating the router. - - Rebuild server route trees when `caseSensitive` changes and reuse the server cache only when the route tree and case sensitivity both match. - -- [#8421](https://github.com/TanStack/router/pull/8421) [`1ca361b`](https://github.com/TanStack/router/commit/1ca361ba52a627d2f76ab33323bd83d1d0aa65a3) - Parse masked locations without mutating shared state and simplify input rewrite handling. - -## 1.171.30 - -### Patch Changes - -- [#8321](https://github.com/TanStack/router/pull/8321) [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6) - Cache route branches and interpolated paths on their route objects, removing the fixed template limit for registered routes and reusing cached paths across server requests. Rebuild tree-dependent caches together, preserve decoder and trailing-slash isolation, and keep unregistered templates bounded. - -- [#8390](https://github.com/TanStack/router/pull/8390) [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776) - Keep the Link location cache out of server bundles: `buildLocation` only creates, reads and writes it when `isServer` is false. Render React Links on the server without the extra prop copies and the forwarded-ref hook. Link SSR rendering is 20-40% faster in the Link benchmarks and the React Start SSR request loop about 7% faster. - - React `activeProps` and `inactiveProps` now follow one precedence rule on every link, including links whose destination is blocked for using a disallowed scheme: state props override element props, `ref` and event handlers, while `href`, `disabled` and `target` stay controlled by the router. Previously a blocked link ignored a `ref` or handler from its inactive props. - - React `Link` and `useLinkProps` split router options from element props with one key set on the client and the server. Element props pass through as given: external links forward them verbatim, falsy values included, and `useLinkProps` now returns `children` for router-controlled links as it already did for external ones. - -- [#8382](https://github.com/TanStack/router/pull/8382) [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed) - `buildLocation` no longer structurally shares the built `search` and `state` with the current location. The observable `location.search` and `location.state` still preserve equal nested references across navigations, because `parseLocation` stabilizes them once a location is committed. A search whose contents equal the current search but list its keys in a different order now serializes in the requested order, so navigating to it creates a new history entry instead of being treated as the same location. A `state` object passed to `navigate` or `buildLocation` is never mutated. - -- [#8325](https://github.com/TanStack/router/pull/8325) [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274) - Reuse the already-owned raw-param snapshot during lightweight source matching instead of copying it again. - -- [#8325](https://github.com/TanStack/router/pull/8325) [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274) - Reduce transient JIT compilation memory during navigation by separating search middleware collection from recursive execution. - -- [#8252](https://github.com/TanStack/router/pull/8252) [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734) - Collect shared pathname-cache keys during interpolation instead of parsing templates twice, and share dynamic-segment handling to reduce bundle size. - -- [#8319](https://github.com/TanStack/router/pull/8319) [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa) - Simplify path interpolation into ordered segment-type blocks with shared prefix/value/suffix assembly. Preserve one-pass parsing and optional metadata collection, and reuse the public result object instead of allocating and clearing a missing-parameter callback. - -- [#8252](https://github.com/TanStack/router/pull/8252) [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734) - Reuse pathname interpolation across Links with bounded router-scoped caches. Keep parameter callbacks and navigation state independent of the cache. - -- [#8327](https://github.com/TanStack/router/pull/8327) [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef) - Make `pathParamsAllowedCharacters` initialization-only. Configure it when creating the router; changing allowed characters requires a new router instance. Remove decoder-update bookkeeping and decoder-change checks from route-owned path caches. - -- [#8370](https://github.com/TanStack/router/pull/8370) [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5) - Stop exporting the internal `isPlainObject` and `isPlainArray` helpers. - -- [#8327](https://github.com/TanStack/router/pull/8327) [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef) - Initialize routes directly during route-tree processing, removing the callback indirection while preserving parent-first initialization and route indexes. - -- [#8328](https://github.com/TanStack/router/pull/8328) [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5) - Reduce duplication in navigation parameter handling while preserving parameter inheritance, null-prototype dictionaries, and updater isolation. - -- [#8410](https://github.com/TanStack/router/pull/8410) [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58) - Treat `0` and `false` as provided `_splat` values when interpolating paths. Only `undefined`, `null`, and `''` now omit a splat segment, matching how other path params are stringified. - -- [#8354](https://github.com/TanStack/router/pull/8354) [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244) - Use lightweight request history for SSR and make server navigation a no-op. Use redirect() to issue HTTP redirects. Server hrefs use the same normalization as browser history to handle protocol-relative URLs and control characters. - -- [#8321](https://github.com/TanStack/router/pull/8321) [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6) - Consolidate internal path interpolation into `interpolatePath`, returning a pathname directly and collecting metadata only when requested. Update router and devtools callers without changing route parsing or interpolation caching. - -- [#8327](https://github.com/TanStack/router/pull/8327) [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef) - Reduce route-tree initialization work by avoiding temporary path-joining arrays and duplicate ID normalization. - -- [#8327](https://github.com/TanStack/router/pull/8327) [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef) - Reuse parsed route segments when generating paths for navigation, Links, and Devtools. Preserve interpolation metadata and refresh segments when the route tree is rebuilt, without reparsing templates for new parameter values. - -- [#8252](https://github.com/TanStack/router/pull/8252) [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734) - Reduce the bundle cost of shared Link pathname interpolation while preserving its rendering performance. Reuse one interpolation pass for pathname and optional metadata, keep the bounded cache on the router, and simplify React Link active-state and prop merging. - -- [#8385](https://github.com/TanStack/router/pull/8385) [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09) - Collect search middlewares with a counted loop so the optimized code stays valid across navigations. This removes a JIT recompilation that raised peak memory in the interrupted-navigations client memory benchmark. - -- [#8370](https://github.com/TanStack/router/pull/8370) [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5) - Reuse built locations for Links whose destination does not depend on the current location. `buildLocation` keeps the result per options object when the build never read the current location, and the React `Link` passes one stable options object per instance, so navigations resolve unchanged Links with a lookup instead of a full build. The per-route pathname interpolation cache this replaces is removed. Link `params`, `search` and `activeOptions` are compared by value on render, so inline object literals with unchanged contents keep reusing the Link's location. Pass a new object to change a destination; like any other React prop, an object mutated in place is not re-read. - -- [#8325](https://github.com/TanStack/router/pull/8325) [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274) - Cache normalized route pathnames so repeated Link destinations do not decode the same interpolation result again. - -- [#8327](https://github.com/TanStack/router/pull/8327) [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef) - Share compact parsed route segments between matching and interpolation, preserve original parameter names, and avoid reparsing templates while building paths. Simplify route-tree traversal, reuse existing path helpers, and keep Devtools-only navigation validation out of the production formatter. Preserve dynamic match identity for standalone legacy fallback routes. - -- [#8327](https://github.com/TanStack/router/pull/8327) [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef) - Pass route initialization indexes directly instead of wrapping each index in an options object. - -- Updated dependencies [[`8fff7fa`](https://github.com/TanStack/router/commit/8fff7fa1f2e6f061916b0bf5e0ec486b2e732f94), [`f021f6d`](https://github.com/TanStack/router/commit/f021f6d1c6dce6c9b54d70766f1d636d8fd9e184), [`ae68535`](https://github.com/TanStack/router/commit/ae68535929043607d4ee9438f8ae401f3a064862), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244)]: - - @tanstack/history@1.162.4 - -## 1.171.29 - -### Patch Changes - -- [#8313](https://github.com/TanStack/router/pull/8313) [`f9836f1`](https://github.com/TanStack/router/commit/f9836f16f0e25b0a8495f5e01e3f303b1cbc8725) - Avoid constructing a query serializer when search is empty or all values are undefined. - -- [#8308](https://github.com/TanStack/router/pull/8308) [`9c1871c`](https://github.com/TanStack/router/commit/9c1871ccc88bc1157186b8b460941a304ec740b8) - Validate navigation and redirect destinations, keep ambiguous relative URLs on the current origin, and constrain prerender requests and output paths. Prevent redirect headers from appearing in serialized server function response bodies. - - Preserve native form HTTP redirects, route error handling and masks for document redirects, and per-navigation destinations for shared loader redirects. Avoid redundant origin parsing and reduce link styling and server-rendering work. Configured origins must already be normalized. - - Keep blocked-link inactive props consistent during React hydration, honor explicit redirect Location headers before checking route options, and refresh Vue link state when destinations become internal. Reuse the protocol-relative URL check while parsing redirect schemes once. - - Reduce React link bundle size by sharing pathname comparisons, state-prop selection, and element creation. - - Share normalized pathname comparisons in Solid and Vue links to reduce bundle size. - -- [#8288](https://github.com/TanStack/router/pull/8288) [`9871c06`](https://github.com/TanStack/router/commit/9871c0625806001d6bf373524821a00303438a91) - Reduce cache maintenance work during navigation by indexing incoming match IDs once per commit. - -- [#8287](https://github.com/TanStack/router/pull/8287) [`0654c0a`](https://github.com/TanStack/router/commit/0654c0a1a427db24d9af13c1d6ad1217a588c0c9) - Use full-document navigation when an output rewrite produces a cross-origin destination, including the public URL of a route mask. - - Respect registered history blockers during document navigation, passing history locations and the requested push or replace action. - -- Updated dependencies [[`9c1871c`](https://github.com/TanStack/router/commit/9c1871ccc88bc1157186b8b460941a304ec740b8), [`0654c0a`](https://github.com/TanStack/router/commit/0654c0a1a427db24d9af13c1d6ad1217a588c0c9)]: - - @tanstack/history@1.162.3 - ## 1.171.28 ### Patch Changes diff --git a/packages/router-core/INTERNALS.md b/packages/router-core/INTERNALS.md index 4ef0dfa031..3314b5d2c3 100644 --- a/packages/router-core/INTERNALS.md +++ b/packages/router-core/INTERNALS.md @@ -104,9 +104,6 @@ resource ownership, and a promise settling is not permission to publish. - `src/ssr/handlerCallback.ts`, `src/ssr/ssr-server.ts`, and `src/ssr/transformStreamWithRouter.ts` transfer stream ownership and coordinate serialization, injection, abort, and cleanup. - `src/ssr/hydrationScripts.ts` owns the request-local hydration script queue - and framing; `src/ssr/htmlBoundaryScanner.ts` owns the byte matchers. - See `src/ssr/STREAMING.md` for the transport contract. - Framework `Transitioner` and `Matches` implementations acknowledge exact publications and render only through the selected boundary. Framework `RouterClient` and render-to-stream implementations complete hydration and diff --git a/packages/router-core/benchmarks/ssr-streaming/.gitignore b/packages/router-core/benchmarks/ssr-streaming/.gitignore deleted file mode 100644 index 6628455c0a..0000000000 --- a/packages/router-core/benchmarks/ssr-streaming/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/results/ diff --git a/packages/router-core/benchmarks/ssr-streaming/README.md b/packages/router-core/benchmarks/ssr-streaming/README.md deleted file mode 100644 index bda5d4ee12..0000000000 --- a/packages/router-core/benchmarks/ssr-streaming/README.md +++ /dev/null @@ -1,162 +0,0 @@ -# SSR streaming benchmark - -This harness compares two Git revisions of router-core SSR streaming. Transform -runs validate byte count, SHA-256 digest, markers, selected transport API, and -lifecycle counts. Isolated transform timing includes hashing and marker scans; -warm transform timing moves those two checks into preflight requests. -Production-owner suites validate byte count, final owner state, and the 64 KiB -output chunk cap. Isolated owner timing includes hashing; warm and soak suites -use one separate digest-validating preflight per implementation. - -Generated JSON and Markdown summaries stay under `results/` and are ignored by -Git. CPU profiles default to a `*-profiles/` directory beside the configured -JSON output. `--profile-dir` overrides that location. - -## Quick start - -Compare the latest `origin/main` with `HEAD`: - -```sh -node packages/router-core/benchmarks/ssr-streaming/run.mjs \ - --origin=origin/main \ - --candidate=HEAD \ - --suite=common \ - --warmups=20 \ - --iterations=30 \ - --batch-requests=1000 \ - --output=packages/router-core/benchmarks/ssr-streaming/results/common.json -``` - -Use `--candidate=worktree` while testing an uncommitted optimization. Final -comparisons should use Git revisions so the result can be reproduced. - -Run the focused queue-mechanism benchmark with: - -```sh -pnpm --dir packages/router-core exec vitest bench \ - tests/hydrationQueue.bench.ts --run -``` - -## Suites - -| Suite | Purpose | Default measurement | -| ----------------- | ------------------------------------------------------------------------ | ------------------------------------------------- | -| `smoke` | Short raw, fast, and merge check | One isolated process per cell | -| `common` | Normal 1–64 KiB hydration payloads across React, Solid, and Vue profiles | Warm paired batches | -| `safe-points` | Many small React and Solid renderer records | Warm paired batches | -| `coalesced-close` | React script safe points inside large renderer chunks | Warm paired batches | -| `small-memory` | Small React raw, fast, and merge responses | Isolated processes with forced GC | -| `primary` | Large hydration, closing-tag, renderer-record, and backlog stress | Isolated processes with forced GC | -| `source` | Large flat and rope router sources | Isolated processes and direct `encodeInto` probes | -| `strings` | Large flat and rope renderer string records | Warm paired batches | -| `owner` | Production hydration owner and maximum legal backlogs | Isolated processes with forced GC | -| `owner-warm` | Production hydration owner latency | Warm paired batches | -| `owner-soak` | Production hydration owner retention after repeated requests | Post-return forced-GC checkpoints | - -Filter cells with comma-separated `--scenario` and `--mode` values. Isolated -suites also accept `--implementation` and `--runs`. Warm suites accept -`--warmups`, `--iterations`, and `--batch-requests`. - -The `coalesced-close` suite keeps hydration waiting until renderer EOF. Its -1 KiB and 64 KiB filler follows a script in one chunk, so returning at that -script can repeat the document-close search over the remaining bytes. It also -covers a close in the next chunk and a late-script control with little content -left to rescan. The filler contains complete HTML elements. An empty final -input record prevents source prefetch from finishing hydration before the -coalesced content drains. These cases measure repeated scanning within one -chunk; `safe-points` continues to measure separate small renderer records. - -The `owner-warm` suite requires both revisions to contain -`packages/router-core/src/ssr/hydrationScripts.ts`. Older `origin/main` -revisions do not contain this file. After the owner exists in a committed -baseline, use `--origin=HEAD --candidate=worktree` for later changes. - -During the initial owner introduction, run an isolated worktree-only cell: - -```sh -node packages/router-core/benchmarks/ssr-streaming/run.mjs \ - --candidate=worktree \ - --suite=owner \ - --implementation=worktree \ - --scenario=hydration-owner-16x1k \ - --runs=1 -``` - -For example: - -```sh -node packages/router-core/benchmarks/ssr-streaming/run.mjs \ - --origin=HEAD \ - --candidate=worktree \ - --suite=common \ - --scenario=hydration-32k \ - --warmups=30 \ - --iterations=50 \ - --batch-requests=2000 \ - --output=packages/router-core/benchmarks/ssr-streaming/results/candidate.json -``` - -## What the numbers mean - -Warm suites load both implementations into one Node process. They alternate which -implementation runs first for every request pair and at every batch boundary. -The warm-up count is per implementation: each warm-up iteration runs one -request against both revisions. Timed samples are complete request batches. - -For isolated transform cells, `elapsedMs` includes incremental hashing and -marker validation. For warm transform cells, it measures a byte-counted drain -after validated warm-up requests. `wallElapsedMs` also includes synthetic -request setup and lifecycle checks. Merge cells include source creation by the -fake producer. - -Isolated suites start a new Node process for each cell. Memory values are -sampled high-water deltas above a forced-GC baseline, not exact allocation -peaks and not proof that a leak is absent. - -Treat changes below 1% as inconclusive unless several independent processes -repeat the result. In soak output, heap, external, and ArrayBuffer checkpoints -describe retained JavaScript-visible memory after forced GC. RSS is allocator -high-water behavior and is not, by itself, evidence of a leak. Use unit and -integration tests for backpressure, cancellation, abort, timeout, Unicode, and -split-boundary correctness. The throughput harness does not replace those -tests. - -## Scope and limits - -- Normal transform suites use `Uint8Array` renderer records. The `strings` - suite isolates Node renderer string records. -- React uses the `script-close` safe point, Solid uses `record-end`, and Vue - uses only the universal router boundary, document close, and EOF points. -- The fixed boundary suffix lets old and new implementations consume identical - bytes and matches the production transport. -- The worker supplies the legacy `origin/main` transport and the current - hydration-output transport so the intended baseline and candidate can share - one fixture. It does not preserve intermediate private transport fields or - benchmark the complete production hydration producer. -- The `owner` suites call the production hydration owner directly. They do not - include the transform or a framework renderer. -- CPU results describe this Node and machine. They do not establish browser or - Cloudflare Worker performance. - -## Reproducibility - -The runner materializes the complete tracked `packages/router-core/src` tree -for both inputs before it builds. With `--candidate=worktree`, it first copies -one immutable worktree snapshot so later edits cannot change the measured -artifact. Results record available commit IDs, both source-tree hashes, bundle -hashes, platform details, and a hash of the measured source pair. Child -processes and bundles use `NODE_ENV=production`. - -Before publishing a conclusion: - -1. Use clean Git revision names for both sides. -2. Run the same harness revision for both implementations. -3. Verify matching output bytes and digests. -4. Repeat latency comparisons in fresh processes when the expected change is - small. -5. Run memory and correctness tests before retaining an optimization. - -For attribution only, `--cpu-prof=true` writes profiles into a sibling -`*-profiles/` directory by default. Use `--profile-dir=...` to choose another -new or empty directory. Profiles also contain fixture and validation work, so -use them as hints rather than standalone proof. diff --git a/packages/router-core/benchmarks/ssr-streaming/run.mjs b/packages/router-core/benchmarks/ssr-streaming/run.mjs deleted file mode 100644 index 2d1f2245c2..0000000000 --- a/packages/router-core/benchmarks/ssr-streaming/run.mjs +++ /dev/null @@ -1,860 +0,0 @@ -import { execFileSync, spawnSync } from 'node:child_process' -import { - existsSync, - mkdirSync, - mkdtempSync, - readFileSync, - readdirSync, - rmSync, - writeFileSync, -} from 'node:fs' -import { arch, cpus, platform, tmpdir } from 'node:os' -import { dirname, join, resolve } from 'node:path' -import { fileURLToPath } from 'node:url' -import { createHash } from 'node:crypto' -import { build } from 'esbuild' - -const here = dirname(fileURLToPath(import.meta.url)) -const repo = resolve(here, '../../../..') -const dependencyNodePaths = [resolve(repo, 'packages/router-core/node_modules')] -const args = Object.fromEntries( - process.argv.slice(2).map((arg) => { - const [name, value = 'true'] = arg.replace(/^--/, '').split('=', 2) - return [name, value] - }), -) -const knownArgs = new Set([ - 'suite', - 'origin', - 'candidate', - 'runs', - 'output', - 'keep-artifacts', - 'cpu-prof', - 'profile-dir', - 'scenario', - 'mode', - 'implementation', - 'warmups', - 'iterations', - 'batch-requests', -]) -for (const name of Object.keys(args)) { - if (!knownArgs.has(name)) { - throw new Error(`Unknown benchmark option: --${name}`) - } -} -const suite = args.suite ?? 'primary' -const suites = new Set([ - 'common', - 'safe-points', - 'coalesced-close', - 'small-memory', - 'smoke', - 'source', - 'strings', - 'owner', - 'owner-warm', - 'owner-soak', - 'primary', -]) -if (!suites.has(suite)) { - throw new Error(`Unknown benchmark suite: ${suite}`) -} -const isWarmSuite = - suite === 'common' || - suite === 'safe-points' || - suite === 'coalesced-close' || - suite === 'strings' || - suite === 'owner-warm' -const selectedImplementations = isWarmSuite - ? [] - : ['origin', 'worktree'].filter((implementation) => { - if (!args.implementation || args.implementation === 'all') { - return true - } - return args.implementation.split(',').includes(implementation) - }) -const unsupportedSuiteOption = ( - isWarmSuite - ? ['runs', 'implementation'] - : ['warmups', 'iterations', 'batch-requests'] -).find((name) => args[name] !== undefined) -if (unsupportedSuiteOption) { - throw new Error( - `--${unsupportedSuiteOption} is not supported by the ${suite} suite`, - ) -} -if ( - args['cpu-prof'] !== undefined && - !['true', 'false'].includes(args['cpu-prof']) -) { - throw new Error('--cpu-prof must be true or false') -} -const cpuProfiled = args['cpu-prof'] === 'true' -if (args['profile-dir'] !== undefined && !cpuProfiled) { - throw new Error('--profile-dir requires --cpu-prof=true') -} -const originRef = args.origin ?? 'origin/main' -const candidateRef = args.candidate ?? 'HEAD' -const originSha = execFileSync('git', ['rev-parse', `${originRef}^{commit}`], { - cwd: repo, - encoding: 'utf8', -}).trim() -const candidateSha = - candidateRef === 'worktree' - ? undefined - : execFileSync('git', ['rev-parse', `${candidateRef}^{commit}`], { - cwd: repo, - encoding: 'utf8', - }).trim() -const headSha = execFileSync('git', ['rev-parse', 'HEAD^{commit}'], { - cwd: repo, - encoding: 'utf8', -}).trim() -const runs = Number(args.runs ?? (suite === 'smoke' ? 1 : 3)) -const outputPath = resolve( - repo, - args.output ?? - `packages/router-core/benchmarks/ssr-streaming/results/${suite}.json`, -) -if (!outputPath.endsWith('.json')) { - throw new Error('Benchmark output must end in .json') -} -if (!Number.isInteger(runs) || runs < 1) { - throw new Error('--runs must be an integer greater than zero') -} -const keepArtifacts = args['keep-artifacts'] - ? resolve(repo, args['keep-artifacts']) - : undefined -if ( - keepArtifacts && - existsSync(keepArtifacts) && - readdirSync(keepArtifacts).length -) { - throw new Error('--keep-artifacts must name a new or empty directory') -} -const temp = keepArtifacts ?? mkdtempSync(join(tmpdir(), 'tsr-ssr-streaming-')) -mkdirSync(temp, { recursive: true }) -function cleanupTemporaryArtifacts() { - if (!keepArtifacts) { - rmSync(temp, { recursive: true, force: true }) - } -} -// Some setup and child-failure paths exit before the main try/finally can -// unwind. Register cleanup as soon as the temporary directory exists. -process.once('exit', cleanupTemporaryArtifacts) -const profileDir = cpuProfiled - ? resolve( - repo, - args['profile-dir'] ?? outputPath.replace(/\.json$/, '-profiles'), - ) - : undefined -if (profileDir) { - if (existsSync(profileDir) && readdirSync(profileDir).length) { - throw new Error( - `${args['profile-dir'] === undefined ? 'Default profile directory' : '--profile-dir'} must name a new or empty directory`, - ) - } - mkdirSync(profileDir, { recursive: true }) -} -const childEnvironment = { ...process.env, NODE_ENV: 'production' } - -function sourcePathsAt(ref) { - const output = execFileSync( - 'git', - ['ls-tree', '-r', '--name-only', ref, '--', 'packages/router-core/src'], - { cwd: repo, encoding: 'utf8' }, - ).trim() - return output ? output.split('\n') : [] -} - -function worktreeSourcePaths() { - const output = execFileSync( - 'git', - [ - 'ls-files', - '--cached', - '--others', - '--exclude-standard', - '--', - 'packages/router-core/src', - ], - { cwd: repo, encoding: 'utf8' }, - ).trim() - return output - ? output - .split('\n') - .filter((repositoryPath) => existsSync(resolve(repo, repositoryPath))) - .sort() - : [] -} - -function materializeSourceSnapshot(ref, sourceRoot, repositoryPaths) { - for (const repositoryPath of repositoryPaths) { - const target = join( - sourceRoot, - repositoryPath.slice('packages/router-core/src/'.length), - ) - mkdirSync(dirname(target), { recursive: true }) - writeFileSync( - target, - execFileSync('git', ['show', `${ref}:${repositoryPath}`], { cwd: repo }), - ) - } -} - -function materializeWorktreeSnapshot(sourceRoot, repositoryPaths) { - for (const repositoryPath of repositoryPaths) { - const target = join( - sourceRoot, - repositoryPath.slice('packages/router-core/src/'.length), - ) - mkdirSync(dirname(target), { recursive: true }) - writeFileSync(target, readFileSync(resolve(repo, repositoryPath))) - } -} - -function sourceSnapshotSha256(sourceRoot, repositoryPaths) { - const hash = createHash('sha256') - for (const repositoryPath of repositoryPaths) { - hash.update(repositoryPath) - hash.update('\0') - hash.update( - readFileSync( - join( - sourceRoot, - repositoryPath.slice('packages/router-core/src/'.length), - ), - ), - ) - hash.update('\0') - } - return hash.digest('hex') -} - -const originSourceRoot = join(temp, 'origin/packages/router-core/src') -const candidateSourceRoot = join(temp, 'worktree/packages/router-core/src') -const originSourcePaths = sourcePathsAt(originSha) -const candidateSourcePaths = - candidateRef === 'worktree' - ? worktreeSourcePaths() - : sourcePathsAt(candidateSha) -if (suite.startsWith('owner')) { - const ownerSourcePath = 'packages/router-core/src/ssr/hydrationScripts.ts' - const missingImplementations = [] - const requiredImplementations = isWarmSuite - ? ['origin', 'worktree'] - : selectedImplementations - if ( - requiredImplementations.includes('origin') && - !originSourcePaths.includes(ownerSourcePath) - ) { - missingImplementations.push(`origin (${originRef})`) - } - if ( - requiredImplementations.includes('worktree') && - !candidateSourcePaths.includes(ownerSourcePath) - ) { - missingImplementations.push(`candidate (${candidateRef})`) - } - if (missingImplementations.length > 0) { - throw new Error( - `The ${suite} suite requires hydrationScripts.ts in the selected revision(s). ` + - `Missing from ${missingImplementations.join(' and ')}.`, - ) - } -} -materializeSourceSnapshot(originSha, originSourceRoot, originSourcePaths) -if (candidateRef === 'worktree') { - materializeWorktreeSnapshot(candidateSourceRoot, candidateSourcePaths) -} else { - materializeSourceSnapshot( - candidateSha, - candidateSourceRoot, - candidateSourcePaths, - ) -} -const originSourceSha256 = sourceSnapshotSha256( - originSourceRoot, - originSourcePaths, -) -const candidateSourceSha256 = sourceSnapshotSha256( - candidateSourceRoot, - candidateSourcePaths, -) -const measuredSourcePairSha256 = createHash('sha256') - .update(originSourceSha256) - .update('\0') - .update(candidateSourceSha256) - .digest('hex') -const transformSources = { - origin: readFileSync( - join(originSourceRoot, 'ssr/transformStreamWithRouter.ts'), - 'utf8', - ), - worktree: readFileSync( - join(candidateSourceRoot, 'ssr/transformStreamWithRouter.ts'), - 'utf8', - ), -} -const hasHistoricalBufferGuards = { - origin: transformSources.origin.includes( - 'SSR router HTML exceeded maximum buffer', - ), - worktree: transformSources.worktree.includes( - 'SSR router HTML exceeded maximum buffer', - ), -} -const transformExportNames = { - origin: transformSources.origin.includes( - 'export function transformStreamWithRouter(', - ) - ? 'transformStreamWithRouter' - : 'transformReadableStreamWithRouter', - worktree: transformSources.worktree.includes( - 'export function transformStreamWithRouter(', - ) - ? 'transformStreamWithRouter' - : 'transformReadableStreamWithRouter', -} - -// The worktree transform imports protocol constants from hydrationScripts. -// Its producer is not used by this benchmark worker, so the Vite-only script -// string can stay empty in the benchmark bundle. -const scriptStringPlugin = { - name: 'script-string', - setup(build) { - build.onResolve({ filter: /\?script-string$/ }, (args) => ({ - path: args.path, - namespace: 'script-string', - })) - build.onLoad({ filter: /.*/, namespace: 'script-string' }, () => ({ - contents: 'export default ""', - loader: 'js', - })) - }, -} - -async function bundle(implementation) { - const sourceRoot = - implementation === 'origin' ? originSourceRoot : candidateSourceRoot - const entry = join(temp, `${implementation}-entry.ts`) - writeFileSync( - entry, - suite === 'owner' || suite === 'owner-soak' - ? `import { runHydrationOwner, runHydrationOwnerSoak } from ${JSON.stringify(resolve(here, 'worker.ts'))}\n` + - `import { createHydrationScripts } from ${JSON.stringify(join(sourceRoot, 'ssr/hydrationScripts.ts'))}\n` + - `const values = Object.fromEntries(process.argv.slice(2).map((value) => value.replace(/^--/, '').split('=', 2)))\n` + - `${suite === 'owner-soak' ? 'runHydrationOwnerSoak' : 'runHydrationOwner'}(createHydrationScripts, ${JSON.stringify(implementation)}, values.scenario)\n` - : `import { run, runProbe } from ${JSON.stringify(resolve(here, 'worker.ts'))}\n` + - `import { ${transformExportNames[implementation]} as transform } from ${JSON.stringify(join(sourceRoot, 'ssr/transformStreamWithRouter.ts'))}\n` + - `const values = Object.fromEntries(process.argv.slice(2).map((value) => value.replace(/^--/, '').split('=', 2)))\n` + - `if (values.probe) { runProbe(values.shape, Number(values.size), values.strategy) } else { await run(transform, ${JSON.stringify(implementation)}, values.scenario, values.mode) }\n`, - ) - const outfile = join(temp, `${implementation}.mjs`) - await build({ - entryPoints: [entry], - outfile, - bundle: true, - platform: 'node', - format: 'esm', - target: 'node20', - logLevel: 'silent', - nodePaths: dependencyNodePaths, - plugins: [scriptStringPlugin], - define: { 'process.env.NODE_ENV': '"production"' }, - }) - return outfile -} - -async function bundleWarmComparison() { - const entry = join(temp, 'warm-comparison-entry.ts') - writeFileSync( - entry, - suite === 'owner-warm' - ? `import { runWarmHydrationOwnerComparison } from ${JSON.stringify(resolve(here, 'worker.ts'))}\n` + - `import { createHydrationScripts as origin } from ${JSON.stringify(join(originSourceRoot, 'ssr/hydrationScripts.ts'))}\n` + - `import { createHydrationScripts as worktree } from ${JSON.stringify(join(candidateSourceRoot, 'ssr/hydrationScripts.ts'))}\n` + - `const values = Object.fromEntries(process.argv.slice(2).map((value) => value.replace(/^--/, '').split('=', 2)))\n` + - `const result = runWarmHydrationOwnerComparison({ origin, worktree }, values.scenarios.split(','), Number(values.warmups), Number(values.iterations), Number(values.batchRequests))\n` + - `process.stdout.write(JSON.stringify(result) + '\\n')\n` - : `import { runWarmComparison } from ${JSON.stringify(resolve(here, 'worker.ts'))}\n` + - `import { ${transformExportNames.origin} as origin } from ${JSON.stringify(join(originSourceRoot, 'ssr/transformStreamWithRouter.ts'))}\n` + - `import { ${transformExportNames.worktree} as worktree } from ${JSON.stringify(join(candidateSourceRoot, 'ssr/transformStreamWithRouter.ts'))}\n` + - `const values = Object.fromEntries(process.argv.slice(2).map((value) => value.replace(/^--/, '').split('=', 2)))\n` + - `const result = await runWarmComparison({ origin, worktree }, values.scenarios.split(','), values.modes.split(','), Number(values.warmups), Number(values.iterations), Number(values.batchRequests))\n` + - `process.stdout.write(JSON.stringify(result) + '\\n')\n`, - ) - const outfile = join(temp, 'warm-comparison.mjs') - await build({ - entryPoints: [entry], - outfile, - bundle: true, - platform: 'node', - format: 'esm', - target: 'node20', - logLevel: 'silent', - nodePaths: dependencyNodePaths, - plugins: [scriptStringPlugin], - define: { 'process.env.NODE_ENV': '"production"' }, - }) - return outfile -} - -function tasksForSuite() { - if (suite === 'common') { - return [ - 'hydration-1k', - 'hydration-4k', - 'hydration-16k', - 'hydration-32k', - 'hydration-64k', - 'hydration-solid-32k', - 'hydration-vue-32k', - ] - } - if (suite === 'safe-points') { - return ['react-patches-64-records', 'solid-patches-64-records'] - } - if (suite === 'coalesced-close') { - return [ - 'react-coalesced-early-script-1k', - 'react-coalesced-early-script-64k', - 'react-coalesced-next-close-64k', - 'react-coalesced-late-script-64k', - ] - } - if (suite === 'small-memory') { - return ['hydration-1k', 'hydration-4k'] - } - if (suite === 'smoke') { - return ['closing-heavy-17m'] - } - if (suite === 'source') { - return [ - 'router-string-flat-1m', - 'router-string-flat-4m', - 'router-string-flat-17m', - 'router-string-flat-32m', - 'router-string-rope-1m', - 'router-string-rope-4m', - 'router-string-rope-17m', - 'router-string-rope-32m', - ] - } - if (suite === 'strings') { - return [ - 'application-string-flat-1m', - 'application-string-flat-4m', - 'application-string-flat-17m', - 'application-string-rope-1m', - 'application-string-rope-4m', - 'application-string-rope-17m', - ] - } - if (suite === 'owner' || suite === 'owner-warm') { - return [ - 'hydration-owner-1x1k', - 'hydration-owner-16x1k', - 'hydration-owner-400x40k', - 'hydration-owner-4095x4k', - ] - } - if (suite === 'owner-soak') { - return ['hydration-owner-16x1k', 'hydration-owner-4095x4k'] - } - return [ - 'hydration-32k', - 'hydration-17m', - 'router-records-15m', - 'closing-heavy-17m', - 'react18-patches-17m', - 'react19-patches-17m', - ] -} - -function writeSummary(results, path, warmComparison) { - const provenance = [ - `Origin: ${originRef} (${originSha})`, - `Candidate: ${candidateRef} (${candidateSha ?? `worktree snapshot ${candidateSourceSha256}`})`, - `Node: ${process.version}; NODE_ENV=production`, - ] - if (warmComparison) { - const lines = [ - '# Warm SSR streaming benchmark results', - '', - ...provenance, - `Requests per timed batch: ${warmComparison.batchRequests}`, - '', - '| baseline | scenario | framework | safe point | mode | baseline mean us/request | candidate mean us/request | aggregate change | paired geometric mean | paired median | paired p10 | paired p90 | wall aggregate |', - '| --- | --- | --- | --- | --- | ---: | ---: | ---: | ---: | ---: | ---: | ---: | ---: |', - ] - for (const comparison of warmComparison.comparisons) { - const baseline = results.find( - (value) => - value.scenario === comparison.scenario && - value.framework === comparison.framework && - value.rendererSafePoint === comparison.rendererSafePoint && - value.mode === comparison.mode && - value.implementation === comparison.baseline && - value.comparisonBaseline === comparison.baseline, - ) - const worktree = results.find( - (value) => - value.scenario === comparison.scenario && - value.framework === comparison.framework && - value.rendererSafePoint === comparison.rendererSafePoint && - value.mode === comparison.mode && - value.implementation === 'worktree' && - value.comparisonBaseline === comparison.baseline, - ) - if (!baseline || !worktree) { - throw new Error( - `Missing warm result row for ${comparison.scenario}/${comparison.framework}/${comparison.rendererSafePoint ?? '-'}/${comparison.mode}/${comparison.baseline}`, - ) - } - lines.push( - `| ${comparison.baseline} | ${comparison.scenario} | ${comparison.framework} | ${comparison.rendererSafePoint ?? '-'} | ${comparison.mode} | ${(baseline.statistics.elapsedMs.mean * 1000).toFixed(2)} | ${(worktree.statistics.elapsedMs.mean * 1000).toFixed(2)} | ${comparison.aggregateElapsedPercent.toFixed(1)}% | ${comparison.pairedElapsedPercent.geometricMean.toFixed(1)}% | ${comparison.pairedElapsedPercent.median.toFixed(1)}% | ${comparison.pairedElapsedPercent.p10.toFixed(1)}% | ${comparison.pairedElapsedPercent.p90.toFixed(1)}% | ${comparison.aggregateWallElapsedPercent.toFixed(1)}% |`, - ) - } - writeFileSync(path, `${lines.join('\n')}\n`) - return - } - - const lines = [ - '# SSR streaming benchmark results', - '', - ...provenance, - '', - '| implementation | run | scenario | framework | safe point | mode | TTFB ms | first router ms | MiB/s | heap peak MiB | external peak MiB | max chunk | records HWM |', - '| --- | ---: | --- | --- | --- | --- | ---: | ---: | ---: | ---: | ---: | ---: | ---: |', - ] - const soakRows = [] - for (const value of results) { - if (value.outcome === 'expected-error') { - lines.push( - `| ${value.implementation} | ${value.run ?? '-'} | ${value.scenario} | ${value.framework} | ${value.rendererSafePoint ?? '-'} | ${value.mode} | - | - | expected guard | - | - | - | - |`, - ) - continue - } - if (value.implementation === 'v8-probe') { - for (const pass of value.passes) { - lines.push( - `| v8-probe | ${pass.pass} | ${value.scenario} | - | - | ${value.mode} | - | - | ${pass.throughputMiBPerSecond.toFixed(1)} | ${(pass.memoryPeakBytes.heapUsed / 1048576).toFixed(1)} | ${(pass.memoryPeakBytes.external / 1048576).toFixed(1)} | ${value.outputChunkBytes} | 0 |`, - ) - } - continue - } - if (value.mode === 'owner-soak') { - soakRows.push(value) - continue - } - lines.push( - `| ${value.implementation} | ${value.run ?? '-'} | ${value.scenario} | ${value.framework} | ${value.rendererSafePoint ?? '-'} | ${value.mode} | ${value.ttfbMs?.toFixed(2) ?? '-'} | ${value.firstRouterScriptMs?.toFixed(2) ?? '-'} | ${value.throughputMiBPerSecond.toFixed(1)} | ${(value.memoryPeakBytes.heapUsed / 1048576).toFixed(1)} | ${(value.memoryPeakBytes.external / 1048576).toFixed(1)} | ${value.maxOutputChunkBytes} | ${value.sourceRecordHighWater} |`, - ) - } - if (soakRows.length > 0) { - lines.push( - '', - '## Post-GC retention soak', - '', - '| implementation | run | scenario | requests | MiB/s including checkpoint GC | retained heap HWM MiB | retained external HWM MiB | retained ArrayBuffer HWM MiB |', - '| --- | ---: | --- | ---: | ---: | ---: | ---: | ---: |', - ) - for (const value of soakRows) { - lines.push( - `| ${value.implementation} | ${value.run ?? '-'} | ${value.scenario} | ${value.requests} | ${value.throughputIncludingGcMiBPerSecond.toFixed(1)} | ${(value.retainedHighWaterBytes.heapUsed / 1048576).toFixed(1)} | ${(value.retainedHighWaterBytes.external / 1048576).toFixed(1)} | ${(value.retainedHighWaterBytes.arrayBuffers / 1048576).toFixed(1)} |`, - ) - } - } - writeFileSync(path, `${lines.join('\n')}\n`) -} - -try { - const bundles = {} - for (const implementation of selectedImplementations) { - bundles[implementation] = await bundle(implementation) - } - const scenarios = tasksForSuite().filter( - (scenario) => !args.scenario || args.scenario.split(',').includes(scenario), - ) - const supportedModes = - suite === 'owner' || suite === 'owner-warm' || suite === 'owner-soak' - ? ['owner'] - : suite === 'source' || - suite === 'strings' || - suite === 'safe-points' || - suite === 'coalesced-close' - ? ['merge'] - : isWarmSuite - ? ['fast', 'merge'] - : ['raw', 'fast', 'merge'] - const modes = supportedModes.filter( - (mode) => !args.mode || args.mode.split(',').includes(mode), - ) - const implementations = selectedImplementations - const results = [] - const artifactPaths = { ...bundles } - let warmComparison - if ( - scenarios.length === 0 || - modes.length === 0 || - (!isWarmSuite && implementations.length === 0) - ) { - throw new Error('Benchmark filters selected no cells') - } - if (isWarmSuite) { - const warmBundle = await bundleWarmComparison() - artifactPaths['warm-comparison'] = warmBundle - const focusedSafePoints = - suite === 'safe-points' || suite === 'coalesced-close' - const warmups = Number(args.warmups ?? (focusedSafePoints ? 20 : 50)) - const iterations = Number(args.iterations ?? (focusedSafePoints ? 20 : 50)) - const batchRequests = Number( - args['batch-requests'] ?? (focusedSafePoints ? 250 : 1000), - ) - if ( - scenarios.length === 0 || - !Number.isInteger(warmups) || - warmups < 0 || - !Number.isInteger(iterations) || - iterations < 1 || - !Number.isInteger(batchRequests) || - batchRequests < 1 - ) { - throw new Error('Invalid warm-suite scenario or iteration count') - } - const child = spawnSync( - process.execPath, - [ - '--expose-gc', - ...(profileDir - ? [ - '--cpu-prof', - `--cpu-prof-dir=${profileDir}`, - `--cpu-prof-name=warm-${suite}.cpuprofile`, - ] - : []), - warmBundle, - `--scenarios=${scenarios.join(',')}`, - `--modes=${modes.join(',')}`, - `--warmups=${warmups}`, - `--iterations=${iterations}`, - `--batchRequests=${batchRequests}`, - ], - { - cwd: repo, - encoding: 'utf8', - maxBuffer: 10 * 1024 * 1024, - env: childEnvironment, - }, - ) - if (child.status !== 0) { - process.stderr.write(child.stderr) - process.stderr.write(child.stdout) - process.exit(child.status ?? 1) - } - warmComparison = JSON.parse(child.stdout.trim()) - if (warmComparison.comparisons.length === 0) { - throw new Error('Benchmark filters selected no warm comparison cells') - } - results.push(...warmComparison.results) - for (const comparison of warmComparison.comparisons) { - process.stdout.write( - `${comparison.baseline}->candidate ${comparison.scenario} ${comparison.framework} ${comparison.rendererSafePoint ?? 'no-extra-safe-point'} ${comparison.mode}: aggregate ${comparison.aggregateElapsedPercent.toFixed(1)}%, paired geometric mean ${comparison.pairedElapsedPercent.geometricMean.toFixed(1)}%\n`, - ) - } - } - for (const scenario of scenarios) { - const framework = - scenario.startsWith('hydration-solid-') || scenario.startsWith('solid-') - ? 'solid' - : scenario.startsWith('hydration-vue-') - ? 'vue' - : 'react' - const rendererSafePoint = - framework === 'react' - ? 'script-close' - : framework === 'solid' - ? 'record-end' - : undefined - for (const mode of modes) { - for (let run = 1; run <= runs; run++) { - const orders = [ - ['origin', 'worktree'], - ['worktree', 'origin'], - ] - const implementationOrder = orders[(run - 1) % orders.length].filter( - (implementation) => implementations.includes(implementation), - ) - for (const implementation of implementationOrder) { - const profileArgs = profileDir - ? [ - '--cpu-prof', - `--cpu-prof-dir=${profileDir}`, - `--cpu-prof-name=${implementation}-${scenario}-${mode}-${run}.cpuprofile`, - ] - : [] - const child = spawnSync( - process.execPath, - [ - '--expose-gc', - ...profileArgs, - bundles[implementation], - `--scenario=${scenario}`, - `--mode=${mode}`, - ], - { - cwd: repo, - encoding: 'utf8', - maxBuffer: 10 * 1024 * 1024, - env: childEnvironment, - }, - ) - if (child.status !== 0) { - const expectedHistoricalLimit = - mode !== 'merge' || !hasHistoricalBufferGuards[implementation] - ? undefined - : scenario === 'react18-patches-17m' - ? 'SSR stream tail exceeded maximum buffer' - : scenario === 'hydration-17m' || - /^router-string-(flat|rope)-(17|32)m$/.test(scenario) - ? 'SSR router HTML exceeded maximum buffer' - : undefined - const diagnostic = `${child.stderr}\n${child.stdout}` - if ( - expectedHistoricalLimit && - diagnostic.includes(expectedHistoricalLimit) - ) { - results.push({ - implementation, - scenario, - framework, - rendererSafePoint, - mode, - outcome: 'expected-error', - error: expectedHistoricalLimit, - run, - }) - process.stdout.write( - `${implementation} ${scenario} ${mode} ${run}/${runs}: expected historical buffer guard\n`, - ) - continue - } - process.stderr.write(child.stderr) - process.stderr.write(child.stdout) - process.exit(child.status ?? 1) - } - const value = JSON.parse(child.stdout.trim()) - value.run = run - results.push(value) - const throughput = - value.throughputMiBPerSecond ?? - value.throughputIncludingGcMiBPerSecond - process.stdout.write( - `${implementation} ${scenario} ${mode} ${run}/${runs}: ${throughput.toFixed(1)} MiB/s\n`, - ) - } - } - } - } - if (suite === 'source' && !args.scenario && !args.mode) { - for (const shape of ['flat', 'rope']) { - for (const size of [1, 4, 17, 32]) { - for (const strategy of ['suffix', 'window']) { - const profileArgs = profileDir - ? [ - '--cpu-prof', - `--cpu-prof-dir=${profileDir}`, - `--cpu-prof-name=probe-${shape}-${size}m-${strategy}.cpuprofile`, - ] - : [] - const child = spawnSync( - process.execPath, - [ - '--expose-gc', - ...profileArgs, - bundles.worktree ?? bundles.origin, - '--probe=true', - `--shape=${shape}`, - `--size=${size}`, - `--strategy=${strategy}`, - ], - { - cwd: repo, - encoding: 'utf8', - maxBuffer: 10 * 1024 * 1024, - env: childEnvironment, - }, - ) - if (child.status !== 0) { - process.stderr.write(child.stderr) - process.stderr.write(child.stdout) - process.exit(child.status ?? 1) - } - results.push(JSON.parse(child.stdout.trim())) - } - } - } - } - mkdirSync(dirname(outputPath), { recursive: true }) - writeFileSync( - outputPath, - `${JSON.stringify( - { - generatedAt: new Date().toISOString(), - node: process.version, - nodeEnv: 'production', - cpuProfiled, - platform: { os: platform(), arch: arch(), cpu: cpus()[0]?.model }, - originRef, - originSha, - originSourceSha256, - candidateRef, - candidateSha, - headSha, - candidateSourceSha256, - benchmarkInput: - suite === 'strings' - ? 'renderer string records' - : suite.startsWith('owner') - ? 'production hydration owner' - : 'Uint8Array renderer records', - measuredSourcePairSha256, - artifactSha256: Object.fromEntries( - Object.entries(artifactPaths) - .map(([name, path]) => [ - name, - createHash('sha256').update(readFileSync(path)).digest('hex'), - ]) - .concat( - profileDir - ? readdirSync(profileDir) - .filter((name) => name.endsWith('.cpuprofile')) - .sort() - .map((name) => [ - `profile:${name}`, - createHash('sha256') - .update(readFileSync(join(profileDir, name))) - .digest('hex'), - ]) - : [], - ), - ), - suite, - runs: isWarmSuite ? undefined : runs, - warmComparison, - results: isWarmSuite ? undefined : results, - }, - null, - 2, - )}\n`, - ) - const summaryPath = outputPath.replace(/\.json$/, '.md') - writeSummary(results, summaryPath, warmComparison) - process.stdout.write(`Raw results: ${outputPath}\nSummary: ${summaryPath}\n`) -} finally { - cleanupTemporaryArtifacts() - process.removeListener('exit', cleanupTemporaryArtifacts) -} diff --git a/packages/router-core/benchmarks/ssr-streaming/worker.ts b/packages/router-core/benchmarks/ssr-streaming/worker.ts deleted file mode 100644 index 5a12fe2920..0000000000 --- a/packages/router-core/benchmarks/ssr-streaming/worker.ts +++ /dev/null @@ -1,2254 +0,0 @@ -import { createHash } from 'node:crypto' -import { ReadableStream } from 'node:stream/web' -import { performance } from 'node:perf_hooks' - -const MiB = 1024 * 1024 -// Shared legacy-compatible input: origin finds the ID, while the current -// transform finds the exact boundary suffix. Both benchmark the same bytes. -const BARRIER = - '' -const SHELL_PREFIX = '
done
' -const PREFIX = `${SHELL_PREFIX}${BARRIER}` -const SUFFIX = '' -const SCRIPT_OPEN = '' -const REACT_PATCH_PREFIX = '' -const REACT_PATCH_BYTES = 32 * 1024 -const REACT_PATCH = - REACT_PATCH_PREFIX + - 'x'.repeat( - REACT_PATCH_BYTES - REACT_PATCH_PREFIX.length - REACT_PATCH_SUFFIX.length, - ) + - REACT_PATCH_SUFFIX -const SMALL_REACT_PATCH = - '' -const SMALL_SOLID_RECORD = '' -const COALESCED_PATCH = '' -const COALESCED_LAST_PATCH = '' -const COALESCED_FILLER = '
ordinary text
' -// Mirrors of `src/ssr/hydrationScripts.ts` limits and states. The worker -// also runs against a baseline worktree, so it cannot import them; keep these -// in step with MAX_HYDRATION_OUTPUT_CHUNK_BYTES, MAX_DIRECT_CODE_UNITS, -// MIN_OUTPUT_BYTES, and HydrationScriptOutputState. -const OUTPUT_BYTES = 64 * 1024 -const FILL_BYTES = 64 * 1024 -const DIRECT_HYDRATION_CODE_UNITS = 16 * 1024 -const MIN_HYDRATION_OUTPUT_BYTES = 256 - -const HydrationOutputState = { - Waiting: 0, - Ready: 1, - Active: 2, - Done: 3, - Failed: 4, -} as const -type HydrationOutputState = - (typeof HydrationOutputState)[keyof typeof HydrationOutputState] -const HydrationRecordPhase = { - Opening: 0, - Source: 1, - Closing: 2, -} as const -type HydrationRecordPhase = - (typeof HydrationRecordPhase)[keyof typeof HydrationRecordPhase] -const hydrationEncoder = new TextEncoder() - -type Mode = 'raw' | 'fast' | 'merge' -type Shape = 'flat' | 'rope' -type Framework = 'react' | 'solid' | 'vue' -type RendererSafePoint = 'script-close' | 'record-end' -type BaselineImplementation = 'origin' -type AppStreamValue = Uint8Array | string -type Transform = ( - router: any, - stream: ReadableStream, - options?: { rendererSafePoint?: RendererSafePoint }, -) => ReadableStream - -type Memory = { - heapUsed: number - external: number - arrayBuffers: number - rss: number -} - -type ScenarioMetadata = { - name: string - framework: Framework - rendererSafePoint?: RendererSafePoint -} - -type Scenario = - | (ScenarioMetadata & { - kind: 'hydration' - records: number - recordBytes: number - shape: Shape - }) - | (ScenarioMetadata & { - kind: 'closing' - bytes: number - framework: 'react' - rendererSafePoint: 'script-close' - }) - | (ScenarioMetadata & { - kind: 'renderer-records' - record: string - records: number - closeBeforeRecords: boolean - routerRecordBytes: number - framework: 'react' | 'solid' - rendererSafePoint: RendererSafePoint - }) - | (ScenarioMetadata & { - kind: 'coalesced-close' - bytes: number - scriptAtEnd: boolean - closeInNextChunk: boolean - framework: 'react' - rendererSafePoint: 'script-close' - }) - | (ScenarioMetadata & { - kind: 'application-string' - bytes: number - shape: Shape - routerRecordBytes: number - framework: 'react' - rendererSafePoint: 'script-close' - }) - -function parseScenario(name: string): Scenario { - const coalescedCloseMatch = - /^react-coalesced-(early-script|next-close|late-script)-(1|64)k$/.exec(name) - if (coalescedCloseMatch) { - return { - kind: 'coalesced-close', - name, - bytes: Number(coalescedCloseMatch[2]) * 1024, - scriptAtEnd: coalescedCloseMatch[1] === 'late-script', - closeInNextChunk: coalescedCloseMatch[1] === 'next-close', - framework: 'react', - rendererSafePoint: 'script-close', - } - } - const commonHydrationMatch = - /^hydration(?:(?:-(solid|vue))?)-(1|4|16|32|64)k$/.exec(name) - if (commonHydrationMatch) { - const framework = - (commonHydrationMatch[1] as Framework | undefined) ?? 'react' - return { - kind: 'hydration', - name, - records: 1, - recordBytes: Number(commonHydrationMatch[2]) * 1024, - shape: 'flat', - framework, - rendererSafePoint: - framework === 'react' - ? 'script-close' - : framework === 'solid' - ? 'record-end' - : undefined, - } - } - if (name === 'hydration-17m') { - return { - kind: 'hydration', - name, - records: 1, - recordBytes: 17 * MiB, - shape: 'flat', - framework: 'react', - rendererSafePoint: 'script-close', - } - } - if (name === 'router-records-15m') { - return { - kind: 'hydration', - name, - records: 480, - recordBytes: 32 * 1024, - shape: 'flat', - framework: 'react', - rendererSafePoint: 'script-close', - } - } - if (name === 'closing-heavy-17m') { - return { - kind: 'closing', - name, - bytes: 17 * MiB, - framework: 'react', - rendererSafePoint: 'script-close', - } - } - if (name === 'react18-patches-17m') { - return { - kind: 'renderer-records', - name, - record: REACT_PATCH, - records: (17 * MiB) / REACT_PATCH_BYTES, - closeBeforeRecords: true, - routerRecordBytes: 32 * 1024, - framework: 'react', - rendererSafePoint: 'script-close', - } - } - if (name === 'react19-patches-17m') { - return { - kind: 'renderer-records', - name, - record: REACT_PATCH, - records: (17 * MiB) / REACT_PATCH_BYTES, - closeBeforeRecords: false, - routerRecordBytes: 32 * 1024, - framework: 'react', - rendererSafePoint: 'script-close', - } - } - if (name === 'react-patches-64-records') { - return { - kind: 'renderer-records', - name, - record: SMALL_REACT_PATCH, - records: 64, - closeBeforeRecords: false, - routerRecordBytes: 1024, - framework: 'react', - rendererSafePoint: 'script-close', - } - } - if (name === 'solid-patches-64-records') { - return { - kind: 'renderer-records', - name, - record: SMALL_SOLID_RECORD, - records: 64, - closeBeforeRecords: false, - routerRecordBytes: 1024, - framework: 'solid', - rendererSafePoint: 'record-end', - } - } - const applicationStringMatch = - /^application-string-(flat|rope)-(1|4|17)m$/.exec(name) - if (applicationStringMatch) { - return { - kind: 'application-string', - name, - bytes: Number(applicationStringMatch[2]) * MiB, - shape: applicationStringMatch[1] as Shape, - routerRecordBytes: 1024, - framework: 'react', - rendererSafePoint: 'script-close', - } - } - const routerMatch = /^(router-string)-(flat|rope)-(1|4|17|32)m$/.exec(name) - if (routerMatch) { - return { - kind: 'hydration', - name, - records: 1, - recordBytes: Number(routerMatch[3]) * MiB, - shape: routerMatch[2] as Shape, - framework: 'react', - rendererSafePoint: 'script-close', - } - } - throw new Error(`Unknown benchmark scenario: ${name}`) -} - -function forceGc() { - if (typeof globalThis.gc !== 'function') { - throw new Error('The benchmark worker requires node --expose-gc') - } - globalThis.gc() - globalThis.gc() -} - -function memory(): Memory { - const value = process.memoryUsage() - return { - heapUsed: value.heapUsed, - external: value.external, - arrayBuffers: value.arrayBuffers, - rss: value.rss, - } -} - -function delta(value: Memory, baseline: Memory): Memory { - return { - heapUsed: value.heapUsed - baseline.heapUsed, - external: value.external - baseline.external, - arrayBuffers: value.arrayBuffers - baseline.arrayBuffers, - rss: value.rss - baseline.rss, - } -} - -function maxMemory(target: Memory, value: Memory) { - target.heapUsed = Math.max(target.heapUsed, value.heapUsed) - target.external = Math.max(target.external, value.external) - target.arrayBuffers = Math.max(target.arrayBuffers, value.arrayBuffers) - target.rss = Math.max(target.rss, value.rss) -} - -function marker(index: number) { - return `r${index.toString(36).padStart(6, '0')}:` -} - -function fillCode(index: number) { - return 97 + (index % 20) -} - -function createSource(bytes: number, index: number, shape: Shape) { - const recordMarker = marker(index) - const remaining = bytes - recordMarker.length - if (remaining < 0) { - throw new Error('Source record is smaller than its marker') - } - if (shape === 'flat') { - const source = Buffer.allocUnsafe(bytes) - source.fill(fillCode(index)) - source.write(recordMarker, 0, 'ascii') - return source.toString('latin1') - } - const piece = String.fromCharCode(fillCode(index)).repeat(4096) - let source = recordMarker - let left = remaining - while (left > 0) { - source += left >= piece.length ? piece : piece.slice(0, left) - left -= Math.min(left, piece.length) - } - return source -} - -function updateRepeated( - hash: ReturnType, - code: number, - bytes: number, -) { - const buffer = Buffer.allocUnsafe(Math.min(FILL_BYTES, bytes || 1)).fill(code) - let left = bytes - while (left > 0) { - const length = Math.min(left, buffer.length) - hash.update(buffer.subarray(0, length)) - left -= length - } -} - -function updateSource( - hash: ReturnType, - bytes: number, - index: number, -) { - const recordMarker = marker(index) - hash.update(recordMarker) - updateRepeated(hash, fillCode(index), bytes - recordMarker.length) -} - -type RouterSource = { - records: number - recordBytes: number - shape: Shape -} - -function getRouterSource(scenario: Scenario): RouterSource | undefined { - if (scenario.kind === 'hydration') { - return { - records: scenario.records, - recordBytes: scenario.recordBytes, - shape: scenario.shape, - } - } - if (scenario.kind === 'renderer-records') { - return { - records: 1, - recordBytes: scenario.routerRecordBytes, - shape: 'flat', - } - } - if (scenario.kind === 'application-string') { - return { - records: 1, - recordBytes: scenario.routerRecordBytes, - shape: 'flat', - } - } - return undefined -} - -function expected(scenario: Scenario, mode: Mode) { - const hash = createHash('sha256') - let bytes = 0 - const add = (value: string) => { - hash.update(value) - bytes += Buffer.byteLength(value) - } - const addRouterRecord = (recordBytes: number, index: number) => { - add(SCRIPT_OPEN) - updateSource(hash, recordBytes, index) - bytes += recordBytes - add(SCRIPT_CLOSE) - } - const addRouterSources = () => { - const source = getRouterSource(scenario) - if (!source) { - return - } - for (let index = 0; index < source.records; index++) { - addRouterRecord(source.recordBytes, index) - } - } - const addRendererRecords = (record: string, records: number) => { - for (let index = 0; index < records; index++) { - add(record) - } - } - - if (scenario.kind === 'coalesced-close') { - add(PREFIX) - if (!scenario.scriptAtEnd) { - add(COALESCED_PATCH) - } - add(createCoalescedFiller(scenario.bytes)) - if (scenario.scriptAtEnd) { - add(COALESCED_PATCH) - } - if (mode !== 'merge') { - add(SUFFIX) - } - add(COALESCED_LAST_PATCH) - if (mode === 'merge') { - add(SUFFIX) - } - } else if (scenario.kind === 'closing') { - add(SHELL_PREFIX) - const pattern = '
x
' - const repetitions = Math.floor(scenario.bytes / pattern.length) - const remainder = scenario.bytes % pattern.length - for (let index = 0; index < repetitions; index++) { - add(pattern) - } - add(pattern.slice(0, remainder)) - add(BARRIER) - add(SUFFIX) - } else if (scenario.kind === 'hydration') { - if (mode === 'merge') { - add(PREFIX) - addRouterSources() - } else { - add(SHELL_PREFIX) - addRouterSources() - add(BARRIER) - } - add(SUFFIX) - } else if (scenario.kind === 'renderer-records') { - if (mode === 'merge') { - add(PREFIX) - addRendererRecords(scenario.record, scenario.records) - addRouterSources() - add(SUFFIX) - } else { - add(SHELL_PREFIX) - addRouterSources() - add(BARRIER) - if (scenario.closeBeforeRecords) { - add(SUFFIX) - } - addRendererRecords(scenario.record, scenario.records) - if (!scenario.closeBeforeRecords) { - add(SUFFIX) - } - } - } else { - if (mode === 'merge') { - add(PREFIX) - addRouterSources() - } else { - add(SHELL_PREFIX) - addRouterSources() - add(BARRIER) - } - updateRepeated(hash, 'x'.charCodeAt(0), scenario.bytes) - bytes += scenario.bytes - add(SUFFIX) - } - return { bytes, digest: hash.digest('hex') } -} - -const expectedOutputCache = new Map>() - -function getExpectedOutput(scenario: Scenario, mode: Mode) { - const key = `${scenario.name}:${mode}` - let value = expectedOutputCache.get(key) - if (!value) { - value = expected(scenario, mode) - expectedOutputCache.set(key, value) - } - return value -} - -function* repeatedPatternBytes(pattern: string, bytes: number) { - const chunk = pattern.repeat(Math.floor(FILL_BYTES / pattern.length)) - let left = bytes - while (left > 0) { - const value = chunk.slice(0, Math.min(left, chunk.length)) - yield Buffer.from(value) - left -= value.length - } -} - -function* repeatedCompletePatternBytes( - pattern: string, - bytes: number, - maxChunkBytes = FILL_BYTES, -) { - let repetitions = Math.floor(bytes / pattern.length) - const repetitionsPerChunk = Math.max( - 1, - Math.floor(maxChunkBytes / pattern.length), - ) - const fullChunk = pattern.repeat(repetitionsPerChunk) - while (repetitions > 0) { - const count = Math.min(repetitions, repetitionsPerChunk) - yield Buffer.from( - count === repetitionsPerChunk ? fullChunk : pattern.repeat(count), - ) - repetitions -= count - } -} - -function* routerScriptBytes(source: RouterSource): Generator { - for (let index = 0; index < source.records; index++) { - yield Buffer.from(SCRIPT_OPEN + marker(index)) - let left = source.recordBytes - marker(index).length - while (left > 0) { - const length = Math.min(left, FILL_BYTES) - yield Buffer.alloc(length, fillCode(index)) - left -= length - } - yield Buffer.from(SCRIPT_CLOSE) - } -} - -function* integratedBytes(scenario: Scenario): Generator { - if (scenario.kind === 'coalesced-close') { - yield* coalescedCloseApplicationBytes(scenario) - return - } - if (scenario.kind === 'closing') { - yield Buffer.from(SHELL_PREFIX) - yield* repeatedPatternBytes('
x
', scenario.bytes) - yield Buffer.from(BARRIER) - yield Buffer.from(SUFFIX) - return - } - - yield Buffer.from(SHELL_PREFIX) - const source = getRouterSource(scenario) - if (source) { - yield* routerScriptBytes(source) - } - yield Buffer.from(BARRIER) - - if (scenario.kind === 'hydration') { - yield Buffer.from(SUFFIX) - } else if (scenario.kind === 'renderer-records') { - if (scenario.closeBeforeRecords) { - yield Buffer.from(SUFFIX) - } - yield* repeatedCompletePatternBytes( - scenario.record, - scenario.record.length * scenario.records, - scenario.record.length, - ) - if (!scenario.closeBeforeRecords) { - yield Buffer.from(SUFFIX) - } - } else { - yield Buffer.alloc(scenario.bytes, 'x'.charCodeAt(0)) - yield Buffer.from(SUFFIX) - } -} - -function createCoalescedFiller(bytes: number) { - return ( - COALESCED_FILLER.repeat(Math.floor(bytes / COALESCED_FILLER.length)) + - 'x'.repeat(bytes % COALESCED_FILLER.length) - ) -} - -function* coalescedCloseApplicationBytes( - scenario: Extract, -) { - const filler = createCoalescedFiller(scenario.bytes) - const content = - PREFIX + - (scenario.scriptAtEnd ? filler + COALESCED_PATCH : COALESCED_PATCH + filler) - const close = SUFFIX + COALESCED_LAST_PATCH - yield Buffer.from(content + (scenario.closeInNextChunk ? '' : close)) - if (scenario.closeInNextChunk) { - yield Buffer.from(close) - } - // Keep hydration Waiting while the coalesced bytes drain. Without this - // record, source prefetch can report EOF before the transform scans them. - yield new Uint8Array(0) -} - -function* rendererRecordApplicationBytes( - scenario: Extract, -) { - yield Buffer.from(PREFIX) - if (scenario.closeBeforeRecords) { - yield Buffer.from(SUFFIX) - } - yield* repeatedCompletePatternBytes( - scenario.record, - scenario.record.length * scenario.records, - scenario.record.length, - ) - if (!scenario.closeBeforeRecords) { - yield Buffer.from(SUFFIX) - } - // This empty record lets the transform consume all renderer bytes before - // the source reports EOF and starts the independent router producer. - yield new Uint8Array(0) -} - -function streamFromIterator( - iterator: Iterator, - onEof?: () => void, - beforeEof?: Promise, - onBeforeEof?: () => void, -) { - return new ReadableStream({ - async pull(controller) { - const next = iterator.next() - if (next.done) { - onBeforeEof?.() - await beforeEof - onEof?.() - controller.close() - } else { - controller.enqueue(next.value) - } - }, - }) -} - -function createApplicationString( - scenario: Extract, -) { - if (scenario.shape === 'flat') { - const value = Buffer.allocUnsafe( - PREFIX.length + scenario.bytes + SUFFIX.length, - ) - value.write(PREFIX, 0, 'ascii') - value.fill('x'.charCodeAt(0), PREFIX.length, PREFIX.length + scenario.bytes) - value.write(SUFFIX, PREFIX.length + scenario.bytes, 'ascii') - return value.toString('latin1') - } - const piece = 'x'.repeat(4096) - let value = PREFIX - let left = scenario.bytes - while (left > 0) { - value += left >= piece.length ? piece : piece.slice(0, left) - left -= Math.min(left, piece.length) - } - return value + SUFFIX -} - -function makeRouter(serializationFinished: boolean) { - let finished = serializationFinished - let streamFastPathReserved = false - let cleanupCount = 0 - let renderFinishedCount = 0 - let reserveCalls = 0 - let scriptSubscriptions = 0 - let htmlSubscriptions = 0 - let bufferedHtmlReads = 0 - let fastPathGrants = 0 - let hydrationOutputClaims = 0 - let hydrationOutputSubscriptions = 0 - let hydrationOutputPulls = 0 - const scriptListeners = new Set<(parts: ReadonlyArray) => void>() - const htmlListeners = new Set<(html: string) => void>() - const finishedListeners = new Set<() => void>() - const pendingScripts: Array = [] - const bufferedHtml: Array = [] - const hydrationSources: Array = [] - let hydrationSourceHead = 0 - let hydrationSource: string | undefined - let hydrationSegment = '' - let hydrationSegmentOffset = 0 - let hydrationPhase: HydrationRecordPhase = HydrationRecordPhase.Opening - let hydrationOutputCapacity = MIN_HYDRATION_OUTPUT_BYTES - let hydrationState: HydrationOutputState = HydrationOutputState.Waiting - let hydrationError: unknown - let hydrationListener: (() => void) | undefined - let hydrationOutput: - | { - readonly state: number - readonly error: unknown - pullChunk(): Uint8Array - subscribe(onChange: () => void): () => void - } - | undefined - let liftBarrier!: () => void - const barrier = new Promise((resolve) => { - liftBarrier = resolve - }) - - function hydrationQueueIsEmpty() { - return hydrationSourceHead === hydrationSources.length - } - - function refreshHydrationState(notify = true) { - const next = hydrationSource - ? HydrationOutputState.Active - : !hydrationQueueIsEmpty() - ? HydrationOutputState.Ready - : finished - ? HydrationOutputState.Done - : HydrationOutputState.Waiting - if (hydrationState !== next) { - hydrationState = next - if (notify) { - hydrationListener?.() - } - } - } - - function releaseHydrationSource() { - hydrationSources[hydrationSourceHead++] = undefined - if (hydrationQueueIsEmpty()) { - hydrationSources.length = 0 - hydrationSourceHead = 0 - } - hydrationSource = undefined - hydrationSegment = '' - hydrationSegmentOffset = 0 - hydrationPhase = HydrationRecordPhase.Opening - refreshHydrationState(false) - } - - function startHydrationSource(codeUnits: number) { - hydrationSource = hydrationSources[hydrationSourceHead]! - hydrationPhase = HydrationRecordPhase.Opening - hydrationSegment = SCRIPT_OPEN - hydrationSegmentOffset = 0 - hydrationOutputCapacity = Math.max( - MIN_HYDRATION_OUTPUT_BYTES, - Math.min(OUTPUT_BYTES, codeUnits), - ) - hydrationState = HydrationOutputState.Active - } - - function advanceHydrationSegment() { - if (hydrationPhase === HydrationRecordPhase.Opening) { - hydrationPhase = HydrationRecordPhase.Source - hydrationSegment = hydrationSource! - hydrationSegmentOffset = 0 - } else if (hydrationPhase === HydrationRecordPhase.Source) { - hydrationPhase = HydrationRecordPhase.Closing - hydrationSegment = SCRIPT_CLOSE - hydrationSegmentOffset = 0 - } else { - releaseHydrationSource() - } - } - - function pullHydrationChunk() { - hydrationOutputPulls++ - if ( - hydrationState !== HydrationOutputState.Ready && - hydrationState !== HydrationOutputState.Active - ) { - throw new Error('Benchmark hydration output is not ready') - } - - try { - if (hydrationState === HydrationOutputState.Ready) { - const source = hydrationSources[hydrationSourceHead]! - const codeUnits = - SCRIPT_OPEN.length + source.length + SCRIPT_CLOSE.length - if (codeUnits <= DIRECT_HYDRATION_CODE_UNITS) { - const bytes = hydrationEncoder.encode( - SCRIPT_OPEN + source + SCRIPT_CLOSE, - ) - hydrationSource = source - releaseHydrationSource() - return bytes - } - startHydrationSource(codeUnits) - } - - const bytes = new Uint8Array(hydrationOutputCapacity) - let outputOffset = 0 - while (hydrationSource) { - if (hydrationSegmentOffset === hydrationSegment.length) { - advanceHydrationSegment() - } else if (outputOffset === bytes.length) { - break - } else { - const target = - outputOffset === 0 ? bytes : bytes.subarray(outputOffset) - const result = hydrationEncoder.encodeInto( - hydrationSegment.slice(hydrationSegmentOffset), - target, - ) - if (result.read === 0) { - if (outputOffset === 0) { - throw new Error('Benchmark hydration encoder made no progress') - } - break - } - hydrationSegmentOffset += result.read - outputOffset += result.written - } - } - if (outputOffset === 0) { - throw new Error('Benchmark hydration record produced no output') - } - return outputOffset === bytes.length - ? bytes - : bytes.subarray(0, outputOffset) - } catch (error) { - hydrationError = error - hydrationState = HydrationOutputState.Failed - hydrationListener?.() - throw error - } - } - - function reserveFastPath(output?: typeof hydrationOutput) { - reserveCalls++ - if ( - !finished || - streamFastPathReserved || - pendingScripts.length > 0 || - hydrationSource !== undefined || - !hydrationQueueIsEmpty() || - (hydrationOutput ? output !== hydrationOutput : output !== undefined) - ) { - return false - } - streamFastPathReserved = true - fastPathGrants++ - return true - } - - function claimOutput() { - hydrationOutputClaims++ - if (hydrationOutput) { - throw new Error('Benchmark hydration output already has a consumer') - } - hydrationOutput = { - get state() { - return hydrationState - }, - get error() { - return hydrationError - }, - pullChunk: pullHydrationChunk, - subscribe(onChange: () => void) { - hydrationOutputSubscriptions++ - if (hydrationListener) { - throw new Error('Benchmark hydration output already has a subscriber') - } - hydrationListener = onChange - return () => { - if (hydrationListener === onChange) { - hydrationListener = undefined - } - } - }, - } - refreshHydrationState(false) - return hydrationOutput - } - - const hydrationScripts = { - reserveFastPath, - claimOutput, - liftBarrier, - // The worktree transform skips barrier scanning until the initial take. - // The synthetic fixture renders the boundary in its input, so report the - // take as already done. - isInitialTaken: () => true, - // The worktree transform arms the serialization deadline through the - // transport; the fixture manages its own timing. - startSerializationTimeout: (_timeoutMs: number) => {}, - } - - const serverSsr = { - hydrationScripts, - isSerializationFinished: () => finished, - // Keep the old transport shape so this one fixture can run origin and the - // candidate baseline against the same synthetic request. - reserveStreamFastPath: reserveFastPath, - claimHydrationScriptOutput: claimOutput, - onScriptBatch(listener: (parts: ReadonlyArray) => void) { - scriptSubscriptions++ - scriptListeners.add(listener) - if (pendingScripts.length > 0) { - const parts = pendingScripts.splice(0) - listener(parts) - } - return () => scriptListeners.delete(listener) - }, - onInjectedHtml(listener: (html: string) => void) { - htmlSubscriptions++ - htmlListeners.add(listener) - return () => htmlListeners.delete(listener) - }, - takeBufferedHtml() { - bufferedHtmlReads++ - return bufferedHtml.shift() - }, - onSerializationFinished(listener: () => void) { - finishedListeners.add(listener) - return () => finishedListeners.delete(listener) - }, - setRenderFinished() { - renderFinishedCount++ - liftBarrier() - }, - liftScriptBarrier: liftBarrier, - // The worktree transform registers a cleanup listener to tear down - // promptly on external cleanup. The fixture drives termination itself, - // so registration is accepted and ignored. - onCleanup(_listener: () => void) {}, - cleanup() { - cleanupCount++ - scriptListeners.clear() - htmlListeners.clear() - finishedListeners.clear() - pendingScripts.length = 0 - bufferedHtml.length = 0 - hydrationSources.length = 0 - hydrationSourceHead = 0 - hydrationSource = undefined - hydrationSegment = '' - hydrationSegmentOffset = 0 - hydrationPhase = HydrationRecordPhase.Opening - hydrationOutputCapacity = MIN_HYDRATION_OUTPUT_BYTES - hydrationListener = undefined - hydrationOutput = undefined - hydrationError = undefined - hydrationState = HydrationOutputState.Done - }, - } - return { - router: { options: {}, serverSsr }, - emit(source: string) { - if (hydrationOutput) { - hydrationSources.push(source) - refreshHydrationState() - } else if (scriptListeners.size > 0) { - for (const listener of scriptListeners) { - listener([source]) - } - } else { - pendingScripts.push(source) - } - if (htmlListeners.size > 0) { - const html = SCRIPT_OPEN + source + SCRIPT_CLOSE - bufferedHtml.push(html) - for (const listener of htmlListeners) { - listener(html) - } - if (bufferedHtml[0] === html) { - bufferedHtml.shift() - } - } - }, - finish() { - finished = true - refreshHydrationState() - for (const listener of finishedListeners) { - listener() - } - }, - barrier, - counts: () => ({ - cleanupCount, - renderFinishedCount, - reserveCalls, - fastPathGrants, - scriptSubscriptions, - htmlSubscriptions, - bufferedHtmlReads, - hydrationOutputClaims, - hydrationOutputSubscriptions, - hydrationOutputPulls, - }), - } -} - -function createInput( - scenario: Scenario, - mode: Mode, - onEof: () => void, - beforeEof?: Promise, - onBeforeEof?: () => void, -) { - if (mode === 'merge' && scenario.kind === 'application-string') { - return streamFromIterator( - [createApplicationString(scenario)][Symbol.iterator](), - onEof, - beforeEof, - onBeforeEof, - ) - } - if (mode === 'merge' && scenario.kind === 'hydration') { - return streamFromIterator( - [Buffer.from(PREFIX), Buffer.from(SUFFIX)][Symbol.iterator](), - onEof, - beforeEof, - onBeforeEof, - ) - } - if (mode === 'merge' && scenario.kind === 'renderer-records') { - return streamFromIterator( - rendererRecordApplicationBytes(scenario), - onEof, - beforeEof, - onBeforeEof, - ) - } - return streamFromIterator( - integratedBytes(scenario), - onEof, - beforeEof, - onBeforeEof, - ) -} - -function findNeedle(chunk: Uint8Array, needle: Buffer, tail: Buffer) { - const value = Buffer.from(chunk.buffer, chunk.byteOffset, chunk.byteLength) - let count = 0 - - if (tail.length > 0 && value.length > 0) { - const headLength = Math.min(value.length, needle.length - 1) - const boundary = Buffer.allocUnsafe(tail.length + headLength) - boundary.set(tail) - boundary.set(value.subarray(0, headLength), tail.length) - let offset = 0 - for (;;) { - const found = boundary.indexOf(needle, offset) - if (found === -1) { - break - } - if (found < tail.length && found + needle.length > tail.length) { - count++ - } - offset = found + 1 - } - } - - let offset = 0 - for (;;) { - const found = value.indexOf(needle, offset) - if (found === -1) { - break - } - count++ - offset = found + 1 - } - - const keep = Math.min(needle.length - 1, tail.length + value.length) - let nextTail: Buffer - if (keep === 0) { - nextTail = Buffer.alloc(0) - } else if (value.length >= keep) { - nextTail = Buffer.from(value.subarray(value.length - keep)) - } else { - nextTail = Buffer.allocUnsafe(keep) - const tailBytes = keep - value.length - nextTail.set(tail.subarray(tail.length - tailBytes)) - nextTail.set(value, tailBytes) - } - return { - count, - tail: nextTail, - } -} - -export async function run( - transform: Transform, - implementation: string, - scenarioName: string, - mode: Mode, - writeResult = true, - measureMemory = true, - validateOutput = true, -) { - const scenario = parseScenario(scenarioName) - const expectedOutput = getExpectedOutput(scenario, mode) - const routerSource = getRouterSource(scenario) - const containsRouterScripts = routerSource !== undefined - const hasLateScripts = mode === 'merge' && containsRouterScripts - const fake = makeRouter(mode !== 'merge') - let resolveProducerComplete!: () => void - const producerComplete = new Promise((resolve) => { - resolveProducerComplete = resolve - }) - if (!hasLateScripts) { - resolveProducerComplete() - } - let resolveAppContentConsumed!: () => void - const appContentConsumed = new Promise((resolve) => { - resolveAppContentConsumed = resolve - }) - if (scenario.kind !== 'renderer-records' || mode !== 'merge') { - resolveAppContentConsumed() - } - let startedAt = 0 - let rendererEofMs: number | null = null - const input = createInput( - scenario, - mode, - () => { - rendererEofMs = performance.now() - startedAt - if (mode === 'merge' && !hasLateScripts) { - fake.finish() - } - }, - hasLateScripts ? producerComplete : undefined, - resolveAppContentConsumed, - ) - if (measureMemory) { - forceGc() - } - const baseline = measureMemory ? memory() : undefined - const peak: Memory = { heapUsed: 0, external: 0, arrayBuffers: 0, rss: 0 } - const sample = () => { - if (!measureMemory) { - return - } - const value = delta(memory(), baseline!) - maxMemory(peak, value) - } - - startedAt = performance.now() - const output = - mode === 'raw' - ? (input as ReadableStream) - : transform( - fake.router, - input, - scenario.rendererSafePoint - ? { rendererSafePoint: scenario.rendererSafePoint } - : {}, - ) - - let sourceProducerMs = 0 - let producerFinishedMs: number | null = null - let outstandingSourceRecords = 0 - let outstandingSourceCodeUnits = 0 - let sourceRecordHighWater = 0 - let sourceCodeUnitHighWater = 0 - const producer = hasLateScripts - ? (async () => { - await fake.barrier - await appContentConsumed - const sourceStartedAt = performance.now() - for (let index = 0; index < routerSource!.records; index++) { - const source = createSource( - routerSource!.recordBytes, - index, - routerSource!.shape, - ) - outstandingSourceRecords++ - outstandingSourceCodeUnits += source.length - sourceRecordHighWater = Math.max( - sourceRecordHighWater, - outstandingSourceRecords, - ) - sourceCodeUnitHighWater = Math.max( - sourceCodeUnitHighWater, - outstandingSourceCodeUnits, - ) - fake.emit(source) - if (index % 16 === 15) { - await new Promise((resolve) => setImmediate(resolve)) - } - } - fake.finish() - sourceProducerMs = performance.now() - sourceStartedAt - producerFinishedMs = performance.now() - startedAt - sample() - resolveProducerComplete() - })() - : Promise.resolve() - - const reader = output.getReader() - const hash = validateOutput ? createHash('sha256') : undefined - const firstScriptNeedle = Buffer.from(marker(0)) - const completedScriptNeedle = Buffer.from(SCRIPT_CLOSE) - let firstScriptTail: Buffer = Buffer.alloc(0) - let completedScriptTail: Buffer = Buffer.alloc(0) - let firstRouterScriptMs: number | null = null - let bytes = 0 - let chunks = 0 - let maxOutputChunkBytes = 0 - let ttfbMs: number | null = null - for (;;) { - const result = await reader.read() - if (result.done) { - break - } - const now = performance.now() - if (ttfbMs === null) { - ttfbMs = now - startedAt - } - const value = result.value - bytes += value.byteLength - chunks++ - maxOutputChunkBytes = Math.max(maxOutputChunkBytes, value.byteLength) - hash?.update(value) - if ( - validateOutput && - containsRouterScripts && - firstRouterScriptMs === null - ) { - const match = findNeedle(value, firstScriptNeedle, firstScriptTail) - firstScriptTail = match.tail - if (match.count > 0) { - firstRouterScriptMs = now - startedAt - } - } - if (validateOutput && hasLateScripts) { - const completed = findNeedle( - value, - completedScriptNeedle, - completedScriptTail, - ) - completedScriptTail = completed.tail - if (completed.count > 0) { - outstandingSourceRecords -= completed.count - outstandingSourceCodeUnits -= - completed.count * routerSource!.recordBytes - } - } - if (chunks % 16 === 0) { - sample() - } - } - await producer - sample() - const elapsedMs = performance.now() - startedAt - const digest = hash?.digest('hex') ?? expectedOutput.digest - const memoryBeforeFinalGc = measureMemory ? memory() : undefined - if (measureMemory) { - maxMemory(peak, delta(memoryBeforeFinalGc!, baseline!)) - forceGc() - } - const finalMemory = measureMemory ? memory() : undefined - const counts = fake.counts() - let selectedApi: - | 'none' - | 'hydration-output' - | 'script-batch' - | 'injected-html' - | 'buffered-html' = 'none' - if ( - bytes !== expectedOutput.bytes || - (validateOutput && digest !== expectedOutput.digest) - ) { - throw new Error( - `Output validation failed: ${bytes}/${digest} !== ${expectedOutput.bytes}/${expectedOutput.digest}`, - ) - } - if (validateOutput && hasLateScripts && outstandingSourceRecords !== 0) { - throw new Error( - `Only ${routerSource!.records - outstandingSourceRecords} router records completed`, - ) - } - if (validateOutput && containsRouterScripts && firstRouterScriptMs === null) { - throw new Error('The output did not contain the first router script') - } - if ( - validateOutput && - hasLateScripts && - scenario.kind === 'hydration' && - (firstRouterScriptMs === null || - rendererEofMs === null || - firstRouterScriptMs >= rendererEofMs) - ) { - throw new Error( - `Router source did not start before renderer EOF: ${firstRouterScriptMs}/${rendererEofMs}`, - ) - } - if ( - validateOutput && - hasLateScripts && - (producerFinishedMs === null || - rendererEofMs === null || - producerFinishedMs > rendererEofMs) - ) { - throw new Error( - `Router producer finished after renderer EOF: ${producerFinishedMs}/${rendererEofMs}`, - ) - } - if ( - mode !== 'raw' && - (counts.cleanupCount < 1 || counts.renderFinishedCount !== 1) - ) { - throw new Error(`Invalid lifecycle counts: ${JSON.stringify(counts)}`) - } - if ( - mode === 'fast' && - (counts.reserveCalls !== 1 || - counts.fastPathGrants !== 1 || - counts.hydrationOutputClaims !== 0 || - counts.hydrationOutputSubscriptions !== 0 || - counts.hydrationOutputPulls !== 0) - ) { - throw new Error( - `Fast path was not selected exactly once: ${JSON.stringify(counts)}`, - ) - } - if (mode === 'merge') { - const mergeApi = - counts.hydrationOutputClaims === 1 && - counts.hydrationOutputSubscriptions === 1 && - counts.scriptSubscriptions === 0 && - counts.htmlSubscriptions === 0 - ? 'hydration-output' - : counts.hydrationOutputClaims === 0 && - counts.scriptSubscriptions === 1 && - counts.htmlSubscriptions === 0 - ? 'script-batch' - : counts.hydrationOutputClaims === 0 && - counts.scriptSubscriptions === 0 && - counts.htmlSubscriptions === 1 - ? counts.bufferedHtmlReads > 0 - ? 'buffered-html' - : 'injected-html' - : undefined - if (!mergeApi || counts.reserveCalls < 1) { - throw new Error( - `Merge path/API assertion failed: ${JSON.stringify(counts)}`, - ) - } - selectedApi = mergeApi - } - const dynamicPassThroughSelected = - mode === 'merge' && counts.fastPathGrants === 1 - const result = { - implementation, - scenario: scenario.name, - framework: scenario.framework, - rendererSafePoint: scenario.rendererSafePoint, - mode, - memoryMeasured: measureMemory, - selectedApi, - dynamicPassThroughSelected, - outputBytes: bytes, - outputSha256: digest, - chunks, - maxOutputChunkBytes, - ttfbMs, - firstRouterScriptMs, - producerFinishedMs, - rendererEofMs, - elapsedMs, - throughputMiBPerSecond: bytes / MiB / (elapsedMs / 1000), - sourceProducerMs, - sourceRecordHighWater, - sourceCodeUnitHighWater, - memoryBaselineBytes: baseline, - memoryPeakBytes: measureMemory ? peak : undefined, - memoryBeforeFinalGcBytes: memoryBeforeFinalGc, - memoryBeforeFinalGcDeltaBytes: measureMemory - ? delta(memoryBeforeFinalGc!, baseline!) - : undefined, - memoryAfterFinalGcBytes: finalMemory, - memoryAfterFinalGcDeltaBytes: measureMemory - ? delta(finalMemory!, baseline!) - : undefined, - resourceUsage: measureMemory ? process.resourceUsage() : undefined, - lifecycle: counts, - } - if (writeResult) { - process.stdout.write(`${JSON.stringify(result)}\n`) - } - return result -} - -type NumericSummary = { - mean: number - median: number - p10: number - p90: number - min: number - max: number -} - -function summarizeNumbers(values: Array): NumericSummary { - const sorted = values.slice().sort((a, b) => a - b) - const at = (fraction: number) => - sorted[Math.floor((sorted.length - 1) * fraction)]! - const middle = Math.floor(sorted.length / 2) - const median = - sorted.length % 2 === 0 - ? (sorted[middle - 1]! + sorted[middle]!) / 2 - : sorted[middle]! - return { - mean: values.reduce((sum, value) => sum + value, 0) / values.length, - median, - p10: at(0.1), - p90: at(0.9), - min: sorted[0]!, - max: sorted[sorted.length - 1]!, - } -} - -type MeasuredRun = Awaited> - -type WarmBatch = { - requests: number - elapsedMs: number - wallElapsedMs: number - ttfbMs: number - outputBytes: number - outputSha256: string - chunks: number - maxOutputChunkBytes: number - sourceRecordHighWater: number - dynamicPassThroughRequests: number -} - -type WarmBatchAccumulator = Omit< - WarmBatch, - 'outputBytes' | 'outputSha256' | 'chunks' -> & { - first?: MeasuredRun -} - -function createWarmBatchAccumulator(requests: number): WarmBatchAccumulator { - return { - requests, - elapsedMs: 0, - wallElapsedMs: 0, - ttfbMs: 0, - maxOutputChunkBytes: 0, - sourceRecordHighWater: 0, - dynamicPassThroughRequests: 0, - } -} - -function recordWarmRun( - batch: WarmBatchAccumulator, - row: MeasuredRun, - wallElapsedMs: number, -) { - batch.first ??= row - batch.elapsedMs += row.elapsedMs - batch.wallElapsedMs += wallElapsedMs - batch.ttfbMs += row.ttfbMs! - batch.maxOutputChunkBytes = Math.max( - batch.maxOutputChunkBytes, - row.maxOutputChunkBytes, - ) - batch.sourceRecordHighWater = Math.max( - batch.sourceRecordHighWater, - row.sourceRecordHighWater, - ) - if (row.dynamicPassThroughSelected) { - batch.dynamicPassThroughRequests++ - } -} - -function finishWarmBatch(batch: WarmBatchAccumulator): WarmBatch { - const { first, ...totals } = batch - if (!first) { - throw new Error('A warm benchmark batch did not run any requests') - } - return { - ...totals, - outputBytes: first.outputBytes, - outputSha256: first.outputSha256, - chunks: first.chunks, - } -} - -async function runWarmPair( - baselineName: BaselineImplementation, - baselineTransform: Transform, - worktreeTransform: Transform, - scenario: Scenario, - mode: Mode, - requests: number, - startWith: 'baseline' | 'worktree', -) { - const batches = { - baseline: createWarmBatchAccumulator(requests), - worktree: createWarmBatchAccumulator(requests), - } - - for (let index = 0; index < requests; index++) { - const baselineFirst = (index & 1) === (startWith === 'baseline' ? 0 : 1) - let implementation: 'baseline' | 'worktree' = baselineFirst - ? 'baseline' - : 'worktree' - for (let position = 0; position < 2; position++) { - const wallStartedAt = performance.now() - const row = await run( - implementation === 'baseline' ? baselineTransform : worktreeTransform, - implementation === 'baseline' ? baselineName : 'worktree', - scenario.name, - mode, - false, - false, - false, - ) - recordWarmRun( - batches[implementation], - row, - performance.now() - wallStartedAt, - ) - implementation = implementation === 'baseline' ? 'worktree' : 'baseline' - } - } - - return { - baseline: finishWarmBatch(batches.baseline), - worktree: finishWarmBatch(batches.worktree), - } -} - -function summarizeWarmBatches( - implementation: string, - scenario: Scenario, - mode: Mode, - rows: Array, -) { - const batchRequests = rows[0]!.requests - const elapsedMs = summarizeNumbers( - rows.map((row) => row.elapsedMs / row.requests), - ) - const batchElapsedMs = summarizeNumbers(rows.map((row) => row.elapsedMs)) - const batchWallElapsedMs = summarizeNumbers( - rows.map((row) => row.wallElapsedMs), - ) - const ttfbMs = summarizeNumbers(rows.map((row) => row.ttfbMs / row.requests)) - const throughputMiBPerSecond = summarizeNumbers( - rows.map( - (row) => (row.outputBytes * row.requests) / MiB / (row.elapsedMs / 1000), - ), - ) - const dynamicPassThroughRequests = rows.reduce( - (total, row) => total + row.dynamicPassThroughRequests, - 0, - ) - return { - implementation, - scenario: scenario.name, - framework: scenario.framework, - rendererSafePoint: scenario.rendererSafePoint, - mode, - measurement: 'warm', - memoryMeasured: false, - iterations: rows.length, - batchRequests, - measuredRequests: rows.length * batchRequests, - dynamicPassThroughRequests, - dynamicPassThroughRate: - dynamicPassThroughRequests / (rows.length * batchRequests), - outputBytes: rows[0]!.outputBytes, - outputSha256: rows[0]!.outputSha256, - chunks: rows[0]!.chunks, - maxOutputChunkBytes: Math.max( - ...rows.map((row) => row.maxOutputChunkBytes), - ), - ttfbMs: ttfbMs.median, - elapsedMs: elapsedMs.median, - throughputMiBPerSecond: throughputMiBPerSecond.median, - sourceRecordHighWater: Math.max( - ...rows.map((row) => row.sourceRecordHighWater), - ), - statistics: { - elapsedMs, - batchElapsedMs, - batchWallElapsedMs, - ttfbMs, - throughputMiBPerSecond, - }, - } -} - -function summarizePercentRatios(values: Array) { - const logs = summarizeNumbers(values.map((value) => Math.log(value))) - const toPercent = (value: number) => (Math.exp(value) - 1) * 100 - return { - geometricMean: toPercent(logs.mean), - median: toPercent(logs.median), - p10: toPercent(logs.p10), - p90: toPercent(logs.p90), - min: toPercent(logs.min), - max: toPercent(logs.max), - } -} - -async function measureWarmComparison( - baselineName: BaselineImplementation, - baselineTransform: Transform, - worktreeTransform: Transform, - scenarioNames: Array, - requestedModes: Array, - warmups: number, - iterations: number, - batchRequests: number, -) { - const results = [] - const comparisons = [] - - for (const scenarioName of scenarioNames) { - const scenario = parseScenario(scenarioName) - const availableModes: Array = - scenario.kind === 'application-string' || - scenario.kind === 'coalesced-close' - ? ['merge'] - : scenario.kind !== 'renderer-records' && scenario.framework === 'react' - ? ['fast', 'merge'] - : ['merge'] - const modes = availableModes.filter((mode) => requestedModes.includes(mode)) - for (const mode of modes) { - await run( - baselineTransform, - baselineName, - scenario.name, - mode, - false, - false, - true, - ) - await run( - worktreeTransform, - 'worktree', - scenario.name, - mode, - false, - false, - true, - ) - forceGc() - for (let index = 0; index < warmups; index++) { - const order: Array<'baseline' | 'worktree'> = - index % 2 === 0 ? ['baseline', 'worktree'] : ['worktree', 'baseline'] - for (const implementation of order) { - await run( - implementation === 'baseline' - ? baselineTransform - : worktreeTransform, - implementation === 'baseline' ? baselineName : 'worktree', - scenario.name, - mode, - false, - false, - ) - } - } - - const rows: Record<'baseline' | 'worktree', Array> = { - baseline: [], - worktree: [], - } - const elapsedRatios: Array = [] - const wallElapsedRatios: Array = [] - for (let index = 0; index < iterations; index++) { - const pair = await runWarmPair( - baselineName, - baselineTransform, - worktreeTransform, - scenario, - mode, - batchRequests, - index % 2 === 0 ? 'baseline' : 'worktree', - ) - rows.baseline.push(pair.baseline) - rows.worktree.push(pair.worktree) - elapsedRatios.push(pair.worktree.elapsedMs / pair.baseline.elapsedMs) - wallElapsedRatios.push( - pair.worktree.wallElapsedMs / pair.baseline.wallElapsedMs, - ) - } - - const baseline = summarizeWarmBatches( - baselineName, - scenario, - mode, - rows.baseline, - ) - const worktree = summarizeWarmBatches( - 'worktree', - scenario, - mode, - rows.worktree, - ) - const baselineElapsedTotal = rows.baseline.reduce( - (total, row) => total + row.elapsedMs, - 0, - ) - const worktreeElapsedTotal = rows.worktree.reduce( - (total, row) => total + row.elapsedMs, - 0, - ) - const baselineWallTotal = rows.baseline.reduce( - (total, row) => total + row.wallElapsedMs, - 0, - ) - const worktreeWallTotal = rows.worktree.reduce( - (total, row) => total + row.wallElapsedMs, - 0, - ) - results.push( - { ...baseline, comparisonBaseline: baselineName }, - { ...worktree, comparisonBaseline: baselineName }, - ) - comparisons.push({ - baseline: baselineName, - scenario: scenario.name, - framework: scenario.framework, - rendererSafePoint: scenario.rendererSafePoint, - mode, - pairedElapsedPercent: summarizePercentRatios(elapsedRatios), - pairedWallElapsedPercent: summarizePercentRatios(wallElapsedRatios), - aggregateElapsedPercent: - (worktreeElapsedTotal / baselineElapsedTotal - 1) * 100, - aggregateWallElapsedPercent: - (worktreeWallTotal / baselineWallTotal - 1) * 100, - elapsedMedianPercent: - (worktree.statistics.elapsedMs.median / - baseline.statistics.elapsedMs.median - - 1) * - 100, - samples: rows.baseline.map((baselineRow, index) => ({ - baselineElapsedMs: baselineRow.elapsedMs, - candidateElapsedMs: rows.worktree[index]!.elapsedMs, - baselineWallElapsedMs: baselineRow.wallElapsedMs, - candidateWallElapsedMs: rows.worktree[index]!.wallElapsedMs, - elapsedRatio: elapsedRatios[index]!, - wallElapsedRatio: wallElapsedRatios[index]!, - })), - }) - } - } - - return { - warmups, - iterations, - batchRequests, - measuredRequestsPerImplementation: iterations * batchRequests, - scenarios: scenarioNames, - order: `${baselineName}/worktree order alternates for every request and reverses at each batch start`, - validation: - 'SHA-256 and marker checks in untimed preflight/warm-up requests; timed requests retain byte, lifecycle, and API checks', - source: - 'fresh renderer bytes for fast mode and one fresh router source string for merge mode', - memory: 'not measured in the warm latency loop', - garbageCollection: - 'forced once before warm-up; natural GC remains enabled for all measured batches', - results, - comparisons, - } -} - -export function runWarmComparison( - transforms: Record<'origin' | 'worktree', Transform>, - scenarioNames: Array, - requestedModes: Array, - warmups: number, - iterations: number, - batchRequests: number, -) { - return measureWarmComparison( - 'origin', - transforms.origin, - transforms.worktree, - scenarioNames, - requestedModes, - warmups, - iterations, - batchRequests, - ) -} - -function safeWindowEnd(value: string, start: number, wantedEnd: number) { - const end = Math.min(wantedEnd, value.length) - if (end <= start || end >= value.length) { - return end - } - const previous = value.charCodeAt(end - 1) - const next = value.charCodeAt(end) - return previous >= 0xd800 && - previous <= 0xdbff && - next >= 0xdc00 && - next <= 0xdfff - ? end - 1 - : end -} - -export function runProbe( - shape: Shape, - sizeMiB: number, - strategy: 'suffix' | 'window', -) { - const bytes = sizeMiB * MiB - const source = createSource(bytes, 0, shape) - const expectedHash = createHash('sha256') - updateSource(expectedHash, bytes, 0) - const expectedDigest = expectedHash.digest('hex') - forceGc() - const baseline = memory() - const encoder = new TextEncoder() - const passes = [] - for (let pass = 1; pass <= 2; pass++) { - const hash = createHash('sha256') - const peak: Memory = { heapUsed: 0, external: 0, arrayBuffers: 0, rss: 0 } - let offset = 0 - let chunks = 0 - const startedAt = performance.now() - while (offset < source.length) { - const output = new Uint8Array(OUTPUT_BYTES) - const input = - strategy === 'suffix' - ? source.slice(offset) - : source.slice( - offset, - safeWindowEnd(source, offset, offset + OUTPUT_BYTES), - ) - const encoded = encoder.encodeInto(input, output) - if (encoded.read === 0) { - throw new Error('Probe encoder made no progress') - } - offset += encoded.read - hash.update(output.subarray(0, encoded.written)) - chunks++ - if (chunks % 16 === 0) { - maxMemory(peak, delta(memory(), baseline)) - } - } - const elapsedMs = performance.now() - startedAt - const digest = hash.digest('hex') - if (digest !== expectedDigest || offset !== source.length) { - throw new Error('Source-window probe validation failed') - } - maxMemory(peak, delta(memory(), baseline)) - forceGc() - const afterGc = delta(memory(), baseline) - passes.push({ - pass, - elapsedMs, - throughputMiBPerSecond: bytes / MiB / (elapsedMs / 1000), - chunks, - memoryPeakBytes: peak, - memoryAfterGcBytes: afterGc, - }) - } - process.stdout.write( - `${JSON.stringify({ - implementation: 'v8-probe', - scenario: `encode-${shape}-${sizeMiB}m`, - mode: strategy, - sourceReadyBaselineBytes: baseline, - outputBytes: bytes, - outputChunkBytes: OUTPUT_BYTES, - outputSha256: expectedDigest, - passes, - })}\n`, - ) -} - -type HydrationOwner = { - takeInitialHydrationScriptTags(): unknown - claimOutput(): { - state: number - pullChunk(): Uint8Array - } - liftBarrier(): void - pushSource(source: string): void - finish(): void - cleanup(): void -} - -type CreateHydrationOwner = ( - nonce: string | undefined, - initialSources: ReadonlyArray, -) => HydrationOwner - -type HydrationOwnerExpected = { - records: number - recordBytes: number - bytes: number - digest: string -} - -const hydrationOwnerExpectedCache = new Map() - -function getHydrationOwnerExpected(scenarioName: string) { - const cached = hydrationOwnerExpectedCache.get(scenarioName) - if (cached) { - return cached - } - const match = /^hydration-owner-(\d+)x(\d+)k$/.exec(scenarioName) - if (!match) { - throw new Error(`Unknown hydration-owner scenario: ${scenarioName}`) - } - const records = Number(match[1]) - const recordBytes = Number(match[2]) * 1024 - const hash = createHash('sha256') - let bytes = 0 - const addExpected = (value: string) => { - hash.update(value) - bytes += Buffer.byteLength(value) - } - let partIndex = 0 - while (partIndex <= records) { - const batchStart = partIndex - let codeUnits = SCRIPT_OPEN.length + SCRIPT_CLOSE.length - 1 - while (partIndex <= records) { - const partLength = - partIndex === records ? '$_TSR.e()'.length : recordBytes - const nextCodeUnits = codeUnits + 1 + partLength - if (partIndex > batchStart && nextCodeUnits > OUTPUT_BYTES) { - break - } - codeUnits = nextCodeUnits - partIndex++ - if (codeUnits > OUTPUT_BYTES) { - break - } - } - addExpected(SCRIPT_OPEN) - for (let index = batchStart; index < partIndex; index++) { - if (index > batchStart) { - addExpected(';') - } - if (index === records) { - addExpected('$_TSR.e()') - } else { - updateSource(hash, recordBytes, index) - bytes += recordBytes - } - } - addExpected(SCRIPT_CLOSE) - } - const expected = { - records, - recordBytes, - bytes, - digest: hash.digest('hex'), - } - hydrationOwnerExpectedCache.set(scenarioName, expected) - return expected -} - -function measureHydrationOwner( - createHydrationOwner: CreateHydrationOwner, - implementation: string, - scenarioName: string, - measureMemory: boolean, - validateOutput = true, -) { - const expected = getHydrationOwnerExpected(scenarioName) - if (measureMemory) { - forceGc() - } - const baseline = measureMemory ? memory() : undefined - const peak: Memory = { heapUsed: 0, external: 0, arrayBuffers: 0, rss: 0 } - const sample = () => { - if (measureMemory) { - maxMemory(peak, delta(memory(), baseline!)) - } - } - const owner = createHydrationOwner(undefined, []) - owner.takeInitialHydrationScriptTags() - const output = owner.claimOutput() - owner.liftBarrier() - for (let index = 0; index < expected.records; index++) { - owner.pushSource(createSource(expected.recordBytes, index, 'flat')) - } - owner.finish() - sample() - const hash = validateOutput ? createHash('sha256') : undefined - let bytes = 0 - let chunks = 0 - let maxOutputChunkBytes = 0 - const startedAt = performance.now() - while ( - output.state === HydrationOutputState.Ready || - output.state === HydrationOutputState.Active - ) { - const chunk = output.pullChunk() - hash?.update(chunk) - bytes += chunk.byteLength - chunks++ - maxOutputChunkBytes = Math.max(maxOutputChunkBytes, chunk.byteLength) - if (measureMemory && (chunks & 15) === 0) { - sample() - } - } - const elapsedMs = performance.now() - startedAt - if (measureMemory) { - sample() - } - const digest = hash?.digest('hex') ?? expected.digest - if ( - output.state !== HydrationOutputState.Done || - bytes !== expected.bytes || - (validateOutput && digest !== expected.digest) || - maxOutputChunkBytes > OUTPUT_BYTES - ) { - throw new Error( - `Hydration-owner validation failed: ${output.state}/${bytes}/${digest}/${maxOutputChunkBytes}`, - ) - } - owner.cleanup() - return { - implementation, - scenario: scenarioName, - framework: 'router-core', - mode: 'owner', - outputBytes: bytes, - outputSha256: digest, - chunks, - maxOutputChunkBytes, - elapsedMs, - throughputMiBPerSecond: bytes / MiB / (elapsedMs / 1000), - memoryPeakBytes: measureMemory ? peak : undefined, - sourceRecordHighWater: expected.records + 1, - } -} - -export function runHydrationOwner( - createHydrationOwner: CreateHydrationOwner, - implementation: string, - scenarioName: string, -) { - process.stdout.write( - `${JSON.stringify( - measureHydrationOwner( - createHydrationOwner, - implementation, - scenarioName, - true, - ), - )}\n`, - ) -} - -export function runHydrationOwnerSoak( - createHydrationOwner: CreateHydrationOwner, - implementation: string, - scenarioName: string, -) { - const expected = getHydrationOwnerExpected(scenarioName) - const requestsPerBlock = expected.records > 1000 ? 5 : 500 - const blocks = 10 - measureHydrationOwner( - createHydrationOwner, - implementation, - scenarioName, - false, - true, - ) - for (let index = 0; index < Math.min(100, requestsPerBlock); index++) { - measureHydrationOwner( - createHydrationOwner, - implementation, - scenarioName, - false, - false, - ) - } - forceGc() - const baseline = memory() - const highWater: Memory = { - heapUsed: 0, - external: 0, - arrayBuffers: 0, - rss: 0, - } - const checkpoints = [] - const startedAt = performance.now() - for (let block = 1; block <= blocks; block++) { - for (let request = 0; request < requestsPerBlock; request++) { - measureHydrationOwner( - createHydrationOwner, - implementation, - scenarioName, - false, - false, - ) - } - forceGc() - const retained = delta(memory(), baseline) - maxMemory(highWater, retained) - checkpoints.push({ block, requests: block * requestsPerBlock, retained }) - } - const elapsedMs = performance.now() - startedAt - const finalRetained = checkpoints.at(-1)!.retained - process.stdout.write( - `${JSON.stringify({ - implementation, - scenario: scenarioName, - framework: 'router-core', - mode: 'owner-soak', - requests: blocks * requestsPerBlock, - aggregateOutputBytes: expected.bytes * blocks * requestsPerBlock, - validatedPerRequestOutputSha256: expected.digest, - elapsedIncludingGcMs: elapsedMs, - throughputIncludingGcMiBPerSecond: - (expected.bytes * blocks * requestsPerBlock) / MiB / (elapsedMs / 1000), - retainedHighWaterBytes: highWater, - retainedAfterFinalGcBytes: finalRetained, - retentionCheckpoints: checkpoints, - sourceRecordHighWater: expected.records + 1, - })}\n`, - ) -} - -export function runWarmHydrationOwnerComparison( - factories: Record<'origin' | 'worktree', CreateHydrationOwner>, - scenarioNames: Array, - warmups: number, - iterations: number, - batchRequests: number, -) { - const results = [] - const comparisons = [] - for (const scenarioName of scenarioNames) { - measureHydrationOwner(factories.origin, 'origin', scenarioName, false, true) - measureHydrationOwner( - factories.worktree, - 'worktree', - scenarioName, - false, - true, - ) - forceGc() - for (let index = 0; index < warmups; index++) { - const first = index % 2 === 0 ? 'origin' : 'worktree' - const second = first === 'origin' ? 'worktree' : 'origin' - measureHydrationOwner(factories[first], first, scenarioName, false, false) - measureHydrationOwner( - factories[second], - second, - scenarioName, - false, - false, - ) - } - const elapsed: Record<'origin' | 'worktree', Array> = { - origin: [], - worktree: [], - } - const wall: Record<'origin' | 'worktree', Array> = { - origin: [], - worktree: [], - } - const samples = [] - const firstResult: Partial< - Record<'origin' | 'worktree', ReturnType> - > = {} - for (let iteration = 0; iteration < iterations; iteration++) { - const totals = { - origin: { elapsed: 0, wall: 0 }, - worktree: { elapsed: 0, wall: 0 }, - } - for (let request = 0; request < batchRequests; request++) { - const originFirst = (request & 1) === (iteration & 1) - const order: Array<'origin' | 'worktree'> = originFirst - ? ['origin', 'worktree'] - : ['worktree', 'origin'] - for (const implementation of order) { - const startedAt = performance.now() - const row = measureHydrationOwner( - factories[implementation], - implementation, - scenarioName, - false, - false, - ) - firstResult[implementation] ??= row - totals[implementation].wall += performance.now() - startedAt - totals[implementation].elapsed += row.elapsedMs - } - } - elapsed.origin.push(totals.origin.elapsed / batchRequests) - elapsed.worktree.push(totals.worktree.elapsed / batchRequests) - wall.origin.push(totals.origin.wall / batchRequests) - wall.worktree.push(totals.worktree.wall / batchRequests) - samples.push({ - baselineElapsedMs: totals.origin.elapsed, - candidateElapsedMs: totals.worktree.elapsed, - baselineWallElapsedMs: totals.origin.wall, - candidateWallElapsedMs: totals.worktree.wall, - elapsedRatio: totals.worktree.elapsed / totals.origin.elapsed, - wallElapsedRatio: totals.worktree.wall / totals.origin.wall, - }) - } - const originElapsed = summarizeNumbers(elapsed.origin) - const worktreeElapsed = summarizeNumbers(elapsed.worktree) - for (const implementation of ['origin', 'worktree'] as const) { - const statistics = summarizeNumbers(elapsed[implementation]) - results.push({ - ...firstResult[implementation], - implementation, - measurement: 'warm', - memoryMeasured: false, - iterations, - batchRequests, - measuredRequests: iterations * batchRequests, - elapsedMs: statistics.median, - throughputMiBPerSecond: - firstResult[implementation]!.outputBytes / - MiB / - (statistics.median / 1000), - statistics: { elapsedMs: statistics }, - comparisonBaseline: 'origin', - }) - } - comparisons.push({ - baseline: 'origin', - scenario: scenarioName, - framework: 'router-core', - mode: 'owner', - pairedElapsedPercent: summarizePercentRatios( - samples.map((sample) => sample.elapsedRatio), - ), - pairedWallElapsedPercent: summarizePercentRatios( - samples.map((sample) => sample.wallElapsedRatio), - ), - aggregateElapsedPercent: - (worktreeElapsed.mean / originElapsed.mean - 1) * 100, - aggregateWallElapsedPercent: - (summarizeNumbers(wall.worktree).mean / - summarizeNumbers(wall.origin).mean - - 1) * - 100, - elapsedMedianPercent: - (worktreeElapsed.median / originElapsed.median - 1) * 100, - samples, - }) - } - return { - warmups, - iterations, - batchRequests, - measuredRequestsPerImplementation: iterations * batchRequests, - scenarios: scenarioNames, - order: 'origin/worktree order alternates for every request and batch', - validation: - 'SHA-256 in one untimed preflight per implementation; timed requests retain byte, state, and output-limit checks', - memory: 'not measured in the warm latency loop', - garbageCollection: 'forced once before each scenario warm-up', - results, - comparisons, - } -} diff --git a/packages/router-core/package.json b/packages/router-core/package.json index ed2b794278..294d572bfd 100644 --- a/packages/router-core/package.json +++ b/packages/router-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-core", - "version": "1.171.39", + "version": "1.171.28", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", @@ -184,11 +184,11 @@ "dependencies": { "@tanstack/history": "workspace:*", "cookie-es": "^3.0.0", - "seroval": "^1.6.7", - "seroval-plugins": "^1.6.7" + "seroval": "^1.6.2", + "seroval-plugins": "^1.6.2" }, "devDependencies": { - "@tanstack/store": "^0.11.2", + "@tanstack/store": "^0.9.3", "@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 4d1a6a3b6e..71a87a2a3e 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`), external session helpers, OAuth `state` + PKCE, password-reset enumeration defense, CSRF, rate limiting — see `@tanstack/start-client-core#start-core/auth-server-primitives`. +> **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). > > **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 `@tanstack/start-client-core#start-core/auth-server-primitives` 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 [start-core/auth-server-primitives](../../../../start-client-core/skills/start-core/auth-server-primitives/SKILL.md) 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 752fb837a5..d1e0524f13 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 -- `@tanstack/react-router#compositions/router-query` — SSR dehydration/hydration with TanStack Query +- [compositions/router-query](../../../../react-router/skills/compositions/router-query/SKILL.md) — 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 15b9d35770..ce9204677e 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 query return type into the route tree +// SLOWER — TS infers the full ensureQueryData return type into the route tree export const Route = createFileRoute('/posts/$postId')({ loader: ({ context: { queryClient }, params: { postId } }) => - queryClient.query({ ...postQueryOptions(postId), staleTime: 'static' }), + queryClient.ensureQueryData(postQueryOptions(postId)), component: PostComponent, }) -// FASTER — async loader returns no query data, inference stays out of the route tree +// FASTER — void return, inference stays out of the route tree export const Route = createFileRoute('/posts/$postId')({ - loader: async ({ context: { queryClient }, params: { postId: id } }) => { - await queryClient.query({ ...postQueryOptions(id), staleTime: 'static' }) + loader: async ({ context: { queryClient }, params: { postId } }) => { + await queryClient.ensureQueryData(postQueryOptions(postId)) }, component: PostComponent, }) diff --git a/packages/router-core/src/await-signal.ts b/packages/router-core/src/await-signal.ts index 61d59bde2d..c3506e2abd 100644 --- a/packages/router-core/src/await-signal.ts +++ b/packages/router-core/src/await-signal.ts @@ -1,61 +1,27 @@ -function observeLate( - callback: ((value: T) => unknown) | undefined, - value: T, -) { - if (!callback) { - return - } - - try { - const result = callback(value) - if (result !== undefined) { - void Promise.resolve(result).catch(() => {}) - } - } catch {} -} - -/** - * Await `value` unless `signal` aborts first. A result that settles after the - * abort is passed to `onLate` / `onLateError` instead. - * - * One abort listener per wait: SSR requests nest at most a few waits on one - * signal, so pooling them was measurably slower than this. - */ export function waitForReason( value: T | PromiseLike, signal: AbortSignal, - onLate?: (value: T) => unknown, - onLateError?: (reason: unknown) => unknown, + onLate?: (value: T) => void, ): Promise { const promise = Promise.resolve(value) if (signal.aborted) { - void promise.then( - (result) => observeLate(onLate, result), - (error) => observeLate(onLateError, error), - ) + if (!onLate) { + return Promise.race([Promise.reject(signal.reason), promise]) + } + void promise.then(onLate, () => {}) return Promise.reject(signal.reason) } - return new Promise((resolve, reject) => { const abort = () => reject(signal.reason) signal.addEventListener('abort', abort, { once: true }) - void promise.then( - (result) => { - signal.removeEventListener('abort', abort) + promise + .then((result) => { if (signal.aborted) { - observeLate(onLate, result) + onLate?.(result) } else { resolve(result) } - }, - (error) => { - signal.removeEventListener('abort', abort) - if (signal.aborted) { - observeLate(onLateError, error) - } else { - reject(error) - } - }, - ) + }, reject) + .finally(() => signal.removeEventListener('abort', abort)) }) } diff --git a/packages/router-core/src/index.ts b/packages/router-core/src/index.ts index 9206ef60dd..4d7fe106f6 100644 --- a/packages/router-core/src/index.ts +++ b/packages/router-core/src/index.ts @@ -103,12 +103,7 @@ export { resolveManifestCssLink, } from './manifest' export { isMatch } from './Matches' -export { - _getAssetMatches, - _getRenderedMatches, - _isRouteDeparting, -} from './load-client' -export { composeSsrBodyScripts, getSsrBodyScriptParts } from './ssr/bodyScripts' +export { _getAssetMatches, _getRenderedMatches } from './load-client' export type { AnyMatchAndValue, FindValueByIndex, @@ -138,8 +133,6 @@ export { exactPathTest, resolvePath, interpolatePath, - getRouteSegments, - hasMissingPathParams, } from './path' export { encode, decode } from './qss' export { rootRouteId } from './root' @@ -280,6 +273,7 @@ export type { ParseLocationFn, InvalidateFn, ControllablePromise, + InjectedHtmlEntry, EmitFn, LoadFn, SubscribeFn, @@ -318,9 +312,10 @@ export { functionalUpdate, hasKeys, replaceEqualDeep, + isPlainObject, + isPlainArray, deepEqual, createControlledPromise, - isPromise, isModuleNotFoundError, DEFAULT_PROTOCOL_ALLOWLIST, escapeHtml, @@ -477,10 +472,19 @@ export type { SerializationError, } from './ssr/serializer/transformer' -export { createSerializationAdapter } from './ssr/serializer/transformer' -export { makeSerovalPlugin } from './ssr/serializer/makeSerovalPlugin' +export { + createSerializationAdapter, + makeSerovalPlugin, + makeSsrSerovalPlugin, +} from './ssr/serializer/transformer' -export { RawStream } from './ssr/serializer/RawStream' +export { defaultSerovalPlugins } from './ssr/serializer/seroval-plugins' + +export { + RawStream, + createRawStreamRPCPlugin, + createRawStreamDeserializePlugin, +} from './ssr/serializer/RawStream' export type { OnRawStreamCallback, RawStreamHint, diff --git a/packages/router-core/src/load-client.ts b/packages/router-core/src/load-client.ts index e84bb8fba5..1994eb2c37 100644 --- a/packages/router-core/src/load-client.ts +++ b/packages/router-core/src/load-client.ts @@ -7,8 +7,9 @@ import { lifecycleEnd, runRouteLifecycle, } from './router' -import { dehydrateSsrMatchId } from './ssr/ssr-match-id' +import { hydrateSsrMatchId } from './ssr/ssr-match-id' import type { GLOBAL_SEROVAL, GLOBAL_TSR } from './ssr/constants' +import type { AnySerializationAdapter } from './ssr/serializer/transformer' import type { TsrSsrGlobal } from './ssr/types' import type { ParsedLocation } from './location' import type { NavigateOptions } from './link' @@ -116,28 +117,6 @@ 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, @@ -2206,7 +2185,9 @@ export async function hydrate(router: AnyRouter): Promise { } const tsr = window.$_TSR! - const adapters = router.options.serializationAdapters + const adapters = router.options.serializationAdapters as + | Array + | undefined if (adapters?.length) { tsr.t = new Map( adapters.map((adapter) => [adapter.key, adapter.fromSerializable]), @@ -2316,7 +2297,10 @@ export async function hydrate(router: AnyRouter): Promise { for (let index = 0; index < shared; index++) { const candidate = candidates[index]! const dehydrated = dehydratedMatches[index]! - if (dehydrated.i !== dehydrateSsrMatchId(candidate.id)) { + if ( + typeof dehydrated.i !== 'string' || + hydrateSsrMatchId(dehydrated.i) !== candidate.id + ) { pendingBoundary ??= index break } diff --git a/packages/router-core/src/load-server.ts b/packages/router-core/src/load-server.ts index 325f8d63f7..1991828d4f 100644 --- a/packages/router-core/src/load-server.ts +++ b/packages/router-core/src/load-server.ts @@ -48,16 +48,6 @@ const NOT_FOUND = 2 const REDIRECTED = 3 const SKIPPED = 4 -const MATCH_SETTLED_ABORT_REASON = Object.freeze({ - name: 'AbortError', - message: 'TanStack Router aborted this server match because it settled.', -}) - -const REDIRECT_ABORT_REASON = Object.freeze({ - name: 'AbortError', - message: 'TanStack Router aborted this server match because of a redirect.', -}) - type LoaderOutcome = | [typeof SUCCESS, data: unknown] | [typeof ERROR, error: unknown] @@ -460,10 +450,7 @@ function createLoaderTask( (cause) => normalize(cause, true), ) .then((result): LoaderOutcome => { - if ( - signal?.aborted || - match.abortController.signal.reason === REDIRECT_ABORT_REASON - ) { + if (signal?.aborted || match.abortController.signal.reason === lane) { return [SKIPPED] } if (result[0] === ERROR) { @@ -532,7 +519,7 @@ async function getNotFoundBoundary( function abortMatches( matches: Array, start = 0, - reason: unknown = MATCH_SETTLED_ABORT_REASON, + reason?: unknown, ): void { for (let index = start; index < matches.length; index++) { matches[index]!.abortController.abort(reason) @@ -696,12 +683,7 @@ async function executeServerLane( abortController: new AbortController(), })), } as MatchedLane - const abortLane = () => - abortMatches( - matched.matches, - 0, - signal?.reason ?? MATCH_SETTLED_ABORT_REASON, - ) + const abortLane = () => abortMatches(matched.matches, 0, signal?.reason) if (signal?.aborted) { abortLane() signal.throwIfAborted() @@ -791,7 +773,7 @@ async function executeServerLane( signal?.throwIfAborted() if (control?.[1][0] === REDIRECTED) { - abortMatches(lane.matches, 0, REDIRECT_ABORT_REASON) + abortMatches(lane.matches, 0, lane) return { type: 'redirect', redirect: control[1][1] } } @@ -835,7 +817,7 @@ async function executeServerLane( signal?.throwIfAborted() if (requiredFailure) { if (requiredFailure[1][0] === REDIRECTED) { - abortMatches(lane.matches, 0, REDIRECT_ABORT_REASON) + abortMatches(lane.matches) return { type: 'redirect', redirect: requiredFailure[1][1] } } failure = requiredFailure @@ -872,24 +854,7 @@ async function executeServerLane( signal, ) signal?.throwIfAborted() - // Deferred loader work can outlive this lane, and the request signal above - // only covers one way a response ends. SSR cleanup covers them all: - // - // - client disconnected -> abort (work may be pending) - // - serialization or lifetime timeout -> abort (a deferred value hung) - // - body disposed server-side (HEAD strip, - // middleware replaced the response) -> abort (never delivered) - // - plain response / `hydrate: false`: the - // loader data was never dehydrated -> abort (never consumed) - // - stream completed: every dehydrated value - // already settled -> nothing left to abort - // - // `settled` is false in exactly the first four cases. - router.serverSsr?.onCleanup((settled) => { - if (!settled) { - abortLane() - } - }) + router.serverSsr?.onCleanup(abortLane) return { type: 'render', status: terminal.status, matches: lane.matches } } finally { signal?.removeEventListener('abort', abortLane) @@ -904,9 +869,7 @@ export async function loadServerRoute( router: AnyRouter, opts?: ServerLoadOptions, ): Promise { - if (!opts?._skipLocationUpdate) { - router.updateLatestLocation() - } + 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 b43f485236..aca4b96eac 100644 --- a/packages/router-core/src/manifest.ts +++ b/packages/router-core/src/manifest.ts @@ -43,7 +43,6 @@ export function getScriptPreloadAttrs( rel: 'modulepreload' | 'preload' as?: 'script' href: string - fetchPriority: 'low' crossOrigin?: AssetCrossOrigin } { const preloadLink = resolveManifestAssetLink(link) @@ -55,7 +54,6 @@ 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 fd63889df2..0b3cf1b5ab 100644 --- a/packages/router-core/src/new-process-route-tree.ts +++ b/packages/router-core/src/new-process-route-tree.ts @@ -1,9 +1,7 @@ import { invariant } from './invariant' -import { trimPathRight } from './path' import { createSieveCache } from './sieve-cache' import { last } from './utils' import type { SieveCache } from './sieve-cache' -import type { InterpolationSegment, RouteInterpolation } from './path' export const SEGMENT_TYPE_PATHNAME = 0 export const SEGMENT_TYPE_PARAM = 1 @@ -29,269 +27,325 @@ type ExtendedSegmentKind = | typeof SEGMENT_TYPE_INDEX | typeof SEGMENT_TYPE_PATHLESS -export type DynamicPathSegment = [ - kind: Exclude, - key: string, - prefix: string, - /** Undefined marks a bare splat, which discards the remaining template. */ - suffix: string | undefined, -] - -export function getParamNames(data: RouteInterpolation): Array { - const cached = data.names - if (cached) { - return cached - } - const keys: Array = [] - for (const segment of data) { - if (typeof segment !== 'string') { - keys.push(segment[1 /* key */]) - } - } - return (data.names = keys) +type ParsedSegment = Uint16Array & { + /** segment type (0 = pathname, 1 = param, 2 = wildcard, 3 = optional param) */ + 0: SegmentKind + /** index of the end of the prefix */ + 1: number + /** index of the start of the value */ + 2: number + /** index of the end of the value */ + 3: number + /** index of the start of the suffix */ + 4: number + /** index of the end of the segment */ + 5: number } -/** Parse one segment for matching and retain the same record for interpolation. */ +/** + * Populates the `output` array with the parsed representation of the given `segment` string. + * + * Usage: + * ```ts + * let output + * let cursor = 0 + * while (cursor < path.length) { + * output = parseSegment(path, cursor, output) + * const end = output[5] + * cursor = end + 1 + * ``` + * + * `output` is stored outside to avoid allocations during repeated calls. It doesn't need to be typed + * or initialized, it will be done automatically. + */ export function parseSegment( /** The full path string containing the segment. */ path: string, /** The starting index of the segment within the path. */ start: number, - /** The next slash, or the length of the path. */ - end: number, -): InterpolationSegment { - const part = path.slice(start, end) - if (part.charCodeAt(0) === 36) { - return part.length === 1 - ? [SEGMENT_TYPE_WILDCARD, '_splat', '', undefined] - : [SEGMENT_TYPE_PARAM, part.slice(1), '', ''] + /** A Uint16Array (length: 6) to populate with the parsed segment data. */ + output: Uint16Array = new Uint16Array(6), +): ParsedSegment { + const next = path.indexOf('/', start) + const end = next === -1 ? path.length : next + const part = path.substring(start, end) + + if (!part || !part.includes('$')) { + // early escape for static pathname + output[0] = SEGMENT_TYPE_PATHNAME + output[1] = start + output[2] = start + output[3] = end + output[4] = end + output[5] = end + return output as ParsedSegment } - const open = part.indexOf('{') - if (open >= 0) { - const close = part.indexOf('}', open) - const optional = part.charCodeAt(open + 1) === 45 - const nameStart = open + (optional ? 3 : 2) - if ( - close >= 0 && - part.charCodeAt(nameStart - 1) === 36 && - (!optional || nameStart < close) - ) { - const key = part.slice(nameStart, close) - return [ - optional - ? SEGMENT_TYPE_OPTIONAL_PARAM - : key - ? SEGMENT_TYPE_PARAM - : SEGMENT_TYPE_WILDCARD, - key || '_splat', - part.slice(0, open), - path.slice(start + close + 1, key ? end : path.length), - ] + + // $ (wildcard) + if (part === '$') { + const total = path.length + output[0] = SEGMENT_TYPE_WILDCARD + output[1] = start + output[2] = start + output[3] = total + output[4] = total + output[5] = total + return output as ParsedSegment + } + + // $paramName + if (part.charCodeAt(0) === 36) { + output[0] = SEGMENT_TYPE_PARAM + output[1] = start + output[2] = start + 1 // skip '$' + output[3] = end + output[4] = end + output[5] = end + return output as ParsedSegment + } + + const openBrace = part.indexOf('{') + let closeBrace + if ( + openBrace !== -1 && + openBrace + 1 < part.length && + (closeBrace = part.indexOf('}', openBrace)) !== -1 + ) { + const firstChar = part.charCodeAt(openBrace + 1) + + // Check for {-$...} (optional param) + // prefix{-$paramName}suffix + // /^([^{]*)\{-\$([a-zA-Z_$][a-zA-Z0-9_$]*)\}([^}]*)$/ + if (firstChar === 45) { + // '-' + if ( + openBrace + 2 < part.length && + part.charCodeAt(openBrace + 2) === 36 // '$' + ) { + const paramStart = openBrace + 3 + const paramEnd = closeBrace + // Validate param name exists + if (paramStart < paramEnd) { + output[0] = SEGMENT_TYPE_OPTIONAL_PARAM + output[1] = start + openBrace + output[2] = start + paramStart + output[3] = start + paramEnd + output[4] = start + closeBrace + 1 + output[5] = end + return output as ParsedSegment + } + } + } else if (firstChar === 36) { + // '$' + const dollarPos = openBrace + 1 + const afterDollar = openBrace + 2 + // Check for {$} (wildcard) + if (afterDollar === closeBrace) { + // For wildcard, value should be '$' (from dollarPos to afterDollar) + // prefix{$}suffix + // /^([^{]*)\{\$\}([^}]*)$/ + output[0] = SEGMENT_TYPE_WILDCARD + output[1] = start + openBrace + output[2] = start + dollarPos + output[3] = start + afterDollar + output[4] = start + closeBrace + 1 + output[5] = path.length + return output as ParsedSegment + } + // Regular param {$paramName} - value is the param name (after $) + // prefix{$paramName}suffix + // /^([^{]*)\{\$([a-zA-Z_$][a-zA-Z0-9_$]*)\}([^}]*)$/ + output[0] = SEGMENT_TYPE_PARAM + output[1] = start + openBrace + output[2] = start + afterDollar + output[3] = start + closeBrace + output[4] = start + closeBrace + 1 + output[5] = end + return output as ParsedSegment } } - return part + + // fallback to static pathname (should never happen) + output[0] = SEGMENT_TYPE_PATHNAME + output[1] = start + output[2] = start + output[3] = end + output[4] = end + output[5] = end + return output as ParsedSegment } -type ParsedRoute = [ - node: AnySegmentNode, - cursor: number, - segments: RouteInterpolation | undefined, -] - -/** Compile a template, optionally attaching its new segments to the matching trie. */ -export function parseSegments( - defaultCaseSensitive: boolean, - route: TRouteLike, - start: number, -): RouteInterpolation -export function parseSegments( +/** + * Recursively parses the segments of the given route tree and populates a segment trie. + * + * @param data A reusable Uint16Array for parsing segments. (non important, we're just avoiding allocations) + * @param route The current route to parse. + * @param start The starting index for parsing within the route's full path. + * @param node The current segment node in the trie to populate. + * @param onRoute Callback invoked for each route processed. + */ +function parseSegments( defaultCaseSensitive: boolean, + data: Uint16Array, route: TRouteLike, start: number, node: AnySegmentNode, - dynamicListsToSort?: Array>>, - parentInterpolation?: RouteInterpolation, -): ParsedRoute -export function parseSegments( - defaultCaseSensitive: boolean, - route: TRouteLike, - start: number, - node?: AnySegmentNode, + depth: number, /** Each dynamic sibling list is recorded once, when it first needs sorting. */ dynamicListsToSort?: Array>>, - parentInterpolation?: RouteInterpolation, -): RouteInterpolation | ParsedRoute { + onRoute?: (route: TRouteLike) => void, +) { + onRoute?.(route) let cursor = start - const path = route.fullPath ?? route.from - const options = route.options - const length = path.length - const literalEnd = path.endsWith('/') ? length - 1 : length - const caseSensitive = options?.caseSensitive ?? defaultCaseSensitive - const parseParams = options?.params?.parse ?? options?.parseParams - let interpolation: Array | undefined - let literalStart = parentInterpolation ? start - 1 : 0 - if (!node || path.includes('$')) { - interpolation = parentInterpolation?.slice() ?? [] - const tail = last(interpolation) + { + const path = route.fullPath ?? route.from + const options = route.options + const length = path.length + const caseSensitive = options?.caseSensitive ?? defaultCaseSensitive + const parseParams = options?.params?.parse ?? options?.parseParams + while (cursor < length) { + const segment = parseSegment(path, cursor, data) + let nextNode: AnySegmentNode + const start = cursor + const end = segment[5] + cursor = end + 1 + depth++ + const kind = segment[0] + switch (kind) { + case SEGMENT_TYPE_PATHNAME: { + const value = path.substring(segment[2], segment[3]) + let name = value + let staticChildren: Map> + if (caseSensitive) { + staticChildren = node.static ??= new Map() + } else { + name = value.toLowerCase() + staticChildren = node.staticInsensitive ??= new Map() + } + const existingNode = staticChildren.get(name) + if (existingNode) { + nextNode = existingNode + } else { + const next = createStaticNode(path) + next.parent = node + next.depth = depth + nextNode = next + staticChildren.set(name, next) + } + break + } + case SEGMENT_TYPE_PARAM: + case SEGMENT_TYPE_OPTIONAL_PARAM: + case SEGMENT_TYPE_WILDCARD: { + let prefix = path.substring(start, segment[1]) + let suffix = path.substring(segment[4], end) + const actuallyCaseSensitive = caseSensitive && !!(prefix || suffix) + if (!caseSensitive) { + prefix = prefix.toLowerCase() + suffix = suffix.toLowerCase() + } + const siblings = + kind === SEGMENT_TYPE_PARAM + ? node.dynamic + : kind === SEGMENT_TYPE_OPTIONAL_PARAM + ? node.optional + : node.wildcard + const existingNode = + // Keep wildcard aliases as separate match candidates, even when + // they have the same shape and no parser. + kind !== SEGMENT_TYPE_WILDCARD && + !parseParams && + siblings?.find( + (s) => + !s.parse && + s.caseSensitive === actuallyCaseSensitive && + s.prefix === prefix && + s.suffix === suffix, + ) + if (existingNode) { + nextNode = existingNode + } else { + const next = createDynamicNode( + kind, + path, + actuallyCaseSensitive, + prefix, + suffix, + ) + nextNode = next + next.parent = node + next.depth = depth + let nodes: Array> + if (kind === SEGMENT_TYPE_PARAM) { + nodes = node.dynamic ??= [] + } else if (kind === SEGMENT_TYPE_OPTIONAL_PARAM) { + nodes = node.optional ??= [] + } else { + nodes = node.wildcard ??= [] + } + nodes.push(next) + if (nodes.length === 2) { + dynamicListsToSort?.push(nodes) + } + } + break + } + } + node = nextNode + } + + // create pathless node if ( - tail && - typeof tail !== 'string' && - tail[0 /* kind */] === SEGMENT_TYPE_WILDCARD + parseParams && + route.children && + !route.isRoot && + route.id && + route.id.charCodeAt(route.id.lastIndexOf('/') + 1) === 95 /* '_' */ ) { - // A parent's wildcard consumes the child's template too. - // `start` follows that entire template, including its trailing slash. - interpolation[interpolation.length - 1] = [ - tail[0 /* kind */], - tail[1 /* key */], - tail[2 /* prefix */], - tail[3 /* suffix */] === undefined - ? undefined - : tail[3 /* suffix */] + - path.substring( - start - (path[start - 2] === '/' ? 2 : 1), - literalEnd, - ), - ] - literalStart = length + const pathlessNode = createStaticNode(path) + pathlessNode.kind = SEGMENT_TYPE_PATHLESS + pathlessNode.parent = node + depth++ + pathlessNode.depth = depth + node.pathless ??= [] + node.pathless.push(pathlessNode) + node = pathlessNode } - } - while (cursor < length) { - const start = cursor - const next = path.indexOf('/', start) - let end = next === -1 ? length : next - const segment = parseSegment(path, start, end) - cursor = end + 1 - let nextNode: AnySegmentNode - if (typeof segment === 'string') { - if (!node) { - continue - } - let name = segment - let staticChildren: Map> - if (caseSensitive) { - staticChildren = node.static ??= new Map() - } else { - name = segment.toLowerCase() - staticChildren = node.staticInsensitive ??= new Map() - } - const existingNode = staticChildren.get(name) - if (existingNode) { - nextNode = existingNode - } else { - const next = createSegmentNode(node) - nextNode = next - staticChildren.set(name, next) - } - } else { - const kind = segment[0 /* kind */] - let prefix = segment[2 /* prefix */] - let suffix = segment[3 /* suffix */] ?? '' - if (kind === SEGMENT_TYPE_WILDCARD) { - end = length - cursor = end + 1 - } - if (interpolation && literalStart < end) { - // Retain original spelling before matcher case folding. - if (literalStart < start - 1) { - interpolation.push(path.slice(literalStart, start - 1)) - } - segment[2 /* prefix */] = '/' + prefix - if ( - kind === SEGMENT_TYPE_WILDCARD && - segment[3 /* suffix */] !== undefined && - literalEnd < length - ) { - segment[3 /* suffix */] = suffix.slice(0, -1) - } - interpolation.push(segment) - literalStart = end - } - if (!node) { - continue - } - const actuallyCaseSensitive = caseSensitive && !!(prefix || suffix) - if (!caseSensitive) { - prefix = prefix.toLowerCase() - suffix = suffix.toLowerCase() - } - const siblings = - kind === SEGMENT_TYPE_PARAM - ? (node.dynamic ??= []) - : kind === SEGMENT_TYPE_OPTIONAL_PARAM - ? (node.optional ??= []) - : (node.wildcard ??= []) - const existingNode = - // Keep wildcard aliases as separate match candidates, even when - // they have the same shape and no parser. - kind !== SEGMENT_TYPE_WILDCARD && - !parseParams && - siblings.find( - (s) => - !s.parse && - s.caseSensitive === actuallyCaseSensitive && - s.prefix === prefix && - s.suffix === suffix, - ) - if (existingNode) { - nextNode = existingNode - } else { - const next = createSegmentNode( - node, - kind, - actuallyCaseSensitive, - prefix, - suffix, - ) - nextNode = next - siblings.push(next) - if (siblings.length === 2) { - dynamicListsToSort?.push(siblings) - } - } + + const isLeaf = (route.path || !route.children) && !route.isRoot + // create index node + if (isLeaf && path.endsWith('/')) { + const indexNode = createStaticNode(path) + indexNode.kind = SEGMENT_TYPE_INDEX + indexNode.parent = node + depth++ + indexNode.depth = depth + node.index = indexNode + node = indexNode } - node = nextNode - } - if (interpolation && literalStart < literalEnd) { - interpolation.push(path.slice(literalStart, literalEnd)) - } - // Discard push()'s spare capacity before retaining this array on both owners. - const segmentData = interpolation?.slice() - if (!node) { - return segmentData! - } + node.parse = parseParams ?? null + node.priority = options?.params?.priority ?? 0 - // create pathless node - if ( - parseParams && - route.children && - !route.isRoot && - route.id && - route.id.charCodeAt(route.id.lastIndexOf('/') + 1) === 95 /* '_' */ - ) { - const pathlessNode = createSegmentNode(node, SEGMENT_TYPE_PATHLESS) - ;(node.pathless ??= []).push(pathlessNode) - node = pathlessNode - } - - const isLeaf = (route.path || !route.children) && !route.isRoot - // create index node - if (isLeaf && literalEnd < length) { - const indexNode = createSegmentNode(node, SEGMENT_TYPE_INDEX) - node.index = indexNode - node = indexNode - } - - node.parse = parseParams ?? null - node.priority = options?.params?.priority ?? 0 - // A shared candidate keeps the original names of its first terminal route. - if (!node.route) { - node.data = segmentData - if (isLeaf) { + // make node "matchable" + if (isLeaf && !node.route) { node.route = route + node.fullPath = path } } - return [node, cursor, segmentData] + if (route.children) + for (const child of route.children) { + parseSegments( + defaultCaseSensitive, + data, + child as TRouteLike, + cursor, + node, + depth, + dynamicListsToSort, + onRoute, + ) + } } function sortDynamic( @@ -333,30 +387,12 @@ function sortDynamic( return 0 } -function createSegmentNode( - parent?: AnySegmentNode, - kind?: StaticSegmentNode['kind'], -): StaticSegmentNode -function createSegmentNode( - parent: AnySegmentNode, - kind: - | typeof SEGMENT_TYPE_PARAM - | typeof SEGMENT_TYPE_WILDCARD - | typeof SEGMENT_TYPE_OPTIONAL_PARAM, - caseSensitive: boolean, - prefix: string, - suffix: string, -): DynamicSegmentNode -function createSegmentNode( - parent?: AnySegmentNode, - kind: ExtendedSegmentKind = SEGMENT_TYPE_PATHNAME, - caseSensitive?: boolean, - prefix?: string, - suffix?: string, -): SegmentNode { +function createStaticNode( + fullPath: string, +): StaticSegmentNode { return { - kind, - depth: parent ? parent.depth + 1 : 0, + kind: SEGMENT_TYPE_PATHNAME, + depth: 0, pathless: null, index: null, static: null, @@ -365,8 +401,40 @@ function createSegmentNode( optional: null, wildcard: null, route: null, - data: undefined, - parent, + fullPath, + parent: null, + parse: null, + priority: 0, + } +} + +/** + * Keys must be declared in the same order as in `SegmentNode` type, + * to ensure they are represented as the same object class in the engine. + */ +function createDynamicNode( + kind: + | typeof SEGMENT_TYPE_PARAM + | typeof SEGMENT_TYPE_WILDCARD + | typeof SEGMENT_TYPE_OPTIONAL_PARAM, + fullPath: string, + caseSensitive: boolean, + prefix: string, + suffix: string, +): DynamicSegmentNode { + return { + kind, + depth: 0, + pathless: null, + index: null, + static: null, + staticInsensitive: null, + dynamic: null, + optional: null, + wildcard: null, + route: null, + fullPath, + parent: null, parse: null, priority: 0, caseSensitive, @@ -398,9 +466,6 @@ type AnySegmentNode = type SegmentNode = { kind: ExtendedSegmentKind - prefix?: string - suffix?: string - caseSensitive?: boolean pathless: Array> | null @@ -425,10 +490,10 @@ type SegmentNode = { /** Terminal route (if this path can end here) */ route: T | null - /** Original template data for this candidate or parse gate. */ - data: RouteInterpolation | undefined + /** The full path for this segment node (will only be valid on leaf nodes) */ + fullPath: string - parent: AnySegmentNode | undefined + parent: AnySegmentNode | null depth: number @@ -440,7 +505,6 @@ type SegmentNode = { } type RouteLike = { - _interpolation?: RouteInterpolation id?: string path?: string // relative path from the parent, children?: Array // child routes, @@ -484,30 +548,11 @@ export function processRouteMasks< routeList: Array, processedTree: ProcessedTree, ) { - const segmentTree = createSegmentNode() + const segmentTree = createStaticNode('/') + const data = new Uint16Array(6) const dynamicListsToSort: Array>> = [] - function visit( - route: TRouteLike, - start: number, - parentNode: AnySegmentNode, - parentInterpolation?: RouteInterpolation, - ) { - const [node, cursor, segments] = parseSegments( - false, - route, - start, - parentNode, - dynamicListsToSort, - parentInterpolation, - ) - if (route.children) { - for (const child of route.children) { - visit(child as TRouteLike, cursor, node, segments) - } - } - } for (const route of routeList) { - visit(route, 1, segmentTree) + parseSegments(false, data, route, 1, segmentTree, 0, dynamicListsToSort) } for (const nodes of dynamicListsToSort) { nodes.sort(sortDynamic) @@ -553,8 +598,9 @@ export function findSingleMatch( if (!tree) { // single flat routes (router.matchRoute) are not eagerly processed, // if we haven't seen this route before, process it now - tree = createSegmentNode<{ from: string }>() - parseSegments(caseSensitive, { from }, 1, tree) + tree = createStaticNode<{ from: string }>('/') + const data = new Uint16Array(6) + parseSegments(caseSensitive, data, { from }, 1, tree, 0) processedTree.singleCache.set(key, tree) } return findMatch(path, tree, fuzzy) @@ -601,6 +647,11 @@ export function findRouteMatch< return result } +/** Trim trailing slashes (except preserving root '/'). */ +export function trimPathRight(path: string) { + return path === '/' ? path : path.replace(/\/{1,}$/, '') +} + export interface ProcessRouteTreeResult< TRouteLike extends Extract & { id: string }, > { @@ -617,64 +668,54 @@ export interface ProcessRouteTreeResult< * Also builds lookup maps for routes by ID and by trimmed full path. */ export function processRouteTree< - TRouteLike extends Extract & { - id: string - init: (originalIndex: number) => void - }, + TRouteLike extends Extract & { id: string }, >( /** The root of the route tree to process. */ routeTree: TRouteLike, /** Whether matching should be case sensitive by default (overridden by individual route options). */ caseSensitive: boolean = false, + /** Optional callback invoked for each route during processing. */ + initRoute?: (route: TRouteLike, index: number) => void, ): ProcessRouteTreeResult { - const segmentTree = createSegmentNode() + const segmentTree = createStaticNode(routeTree.fullPath) + const data = new Uint16Array(6) const dynamicListsToSort: Array>> = [] const routesById = {} as Record const routesByPath = {} as Record let index = 0 - function visit( - route: TRouteLike, - start: number, - parentNode: AnySegmentNode, - parentInterpolation?: RouteInterpolation, - ) { - route.init(index) + parseSegments( + caseSensitive, + data, + routeTree, + 1, + segmentTree, + 0, + dynamicListsToSort, + (route) => { + initRoute?.(route, index) - if (route.id in routesById) { - if (process.env.NODE_ENV !== 'production') { - throw new Error( - `Invariant failed: Duplicate routes found with id: ${String(route.id)}`, - ) + if (route.id in routesById) { + if (process.env.NODE_ENV !== 'production') { + throw new Error( + `Invariant failed: Duplicate routes found with id: ${String(route.id)}`, + ) + } + + invariant() } - invariant() - } + routesById[route.id] = route - routesById[route.id] = route - if (index !== 0 && route.path) { - const trimmedFullPath = trimPathRight(route.fullPath) - if (!routesByPath[trimmedFullPath] || route.fullPath.endsWith('/')) { - routesByPath[trimmedFullPath] = route + if (index !== 0 && route.path) { + const trimmedFullPath = trimPathRight(route.fullPath) + if (!routesByPath[trimmedFullPath] || route.fullPath.endsWith('/')) { + routesByPath[trimmedFullPath] = route + } } - } - index++ - const [node, cursor, segments] = parseSegments( - caseSensitive, - route, - start, - parentNode, - dynamicListsToSort, - parentInterpolation, - ) - route._interpolation = segments - if (route.children) { - for (const child of route.children) { - visit(child as TRouteLike, cursor, node, segments) - } - } - } - visit(routeTree, 1, segmentTree) + index++ + }, + ) for (const nodes of dynamicListsToSort) { nodes.sort(sortDynamic) } @@ -718,7 +759,7 @@ type ParamExtractionState = { part: number node: number path: number - param: number + segment: number } /** @@ -739,7 +780,7 @@ function extractParams( }, ): [rawParams: Record, state: ParamExtractionState] { const list = buildBranch(leaf.node) - const names = leaf.node.data && getParamNames(leaf.node.data) + let nodeParts: Array | null = null const rawParams: Record = Object.create(null) /** which segment of the path we're currently processing */ let partIndex = leaf.extract?.part ?? 0 @@ -747,14 +788,19 @@ function extractParams( let nodeIndex = leaf.extract?.node ?? 0 /** index of the 1st character of the segment we're processing in the path string */ let pathIndex = leaf.extract?.path ?? 0 - /** Next original parameter name, independent of pathless/static nodes. */ - let paramIndex = leaf.extract?.param ?? 0 - for (; nodeIndex < list.length; partIndex++, nodeIndex++, pathIndex++) { + /** which fullPath segment we're currently processing */ + let segmentCount = leaf.extract?.segment ?? 0 + for ( + ; + nodeIndex < list.length; + partIndex++, nodeIndex++, pathIndex++, segmentCount++ + ) { const node = list[nodeIndex]! // index nodes are terminating nodes, nothing to extract, just leave if (node.kind === SEGMENT_TYPE_INDEX) break // pathless nodes do not consume a path segment if (node.kind === SEGMENT_TYPE_PATHLESS) { + segmentCount-- partIndex-- pathIndex-- continue @@ -762,29 +808,44 @@ function extractParams( const part = parts[partIndex] const currentPathIndex = pathIndex if (part) pathIndex += part.length - if ( - node.kind === SEGMENT_TYPE_PARAM || - node.kind === SEGMENT_TYPE_OPTIONAL_PARAM - ) { - const name = names![paramIndex++]! - if ( - node.kind === SEGMENT_TYPE_OPTIONAL_PARAM && - leaf.skipped & (1 << nodeIndex) - ) { + if (node.kind === SEGMENT_TYPE_PARAM) { + nodeParts ??= leaf.node.fullPath.split('/') + const nodePart = nodeParts[segmentCount]! + const preLength = node.prefix.length + // we can't rely on the presence of prefix/suffix to know whether it's curly-braced or not, because `/{$param}/` is valid, but has no prefix/suffix + const isCurlyBraced = nodePart.charCodeAt(preLength) === 123 // '{' + // param name is extracted at match-time so that tree nodes that are identical except for param name can share the same node + if (isCurlyBraced) { + const sufLength = node.suffix.length + const name = nodePart.substring( + preLength + 2, + nodePart.length - sufLength - 1, + ) + const value = part!.substring(preLength, part!.length - sufLength) + rawParams[name] = decodeURIComponent(value) + } else { + const name = nodePart.substring(1) + rawParams[name] = decodeURIComponent(part!) + } + } else if (node.kind === SEGMENT_TYPE_OPTIONAL_PARAM) { + if (leaf.skipped & (1 << nodeIndex)) { partIndex-- // stay on the same part pathIndex = currentPathIndex - 1 // undo pathIndex advancement; -1 to account for loop increment continue } + nodeParts ??= leaf.node.fullPath.split('/') + const nodePart = nodeParts[segmentCount]! + const preLength = node.prefix.length + const sufLength = node.suffix.length + const name = nodePart.substring( + preLength + 3, + nodePart.length - sufLength - 1, + ) const value = node.suffix || node.prefix - ? part!.substring( - node.prefix.length, - part!.length - node.suffix.length, - ) - : part! - if (value || node.kind === SEGMENT_TYPE_PARAM) { - rawParams[name] = decodeURIComponent(value) - } + ? part!.substring(preLength, part!.length - sufLength) + : part + if (value) rawParams[name] = decodeURIComponent(value) } else if (node.kind === SEGMENT_TYPE_WILDCARD) { const n = node const value = path.substring( @@ -805,7 +866,7 @@ function extractParams( part: partIndex, node: nodeIndex, path: pathIndex, - param: paramIndex, + segment: segmentCount, }, ] } diff --git a/packages/router-core/src/path.ts b/packages/router-core/src/path.ts index 1b6288dc36..d302ee13ab 100644 --- a/packages/router-core/src/path.ts +++ b/packages/router-core/src/path.ts @@ -1,12 +1,13 @@ +import { isServer } from '@tanstack/router-core/isServer' import { last } from './utils' import { SEGMENT_TYPE_OPTIONAL_PARAM, SEGMENT_TYPE_PARAM, + SEGMENT_TYPE_PATHNAME, SEGMENT_TYPE_WILDCARD, + parseSegment, } from './new-process-route-tree' import type { SieveCache } from './sieve-cache' -import type { DynamicPathSegment } from './new-process-route-tree' -import type { AnyRoute } from './route' /** Join path segments, cleaning duplicate slashes between parts. */ export function joinPaths(paths: Array) { @@ -27,13 +28,13 @@ export function cleanPath(path: string) { /** Trim leading slashes (except preserving root '/'). */ export function trimPathLeft(path: string) { - return path === '/' ? path : path.replace(/^\/+/, '') + return path === '/' ? path : path.replace(/^\/{1,}/, '') } /** Trim trailing slashes (except preserving root '/'). */ export function trimPathRight(path: string) { const len = path.length - return len > 1 && path[len - 1] === '/' ? path.replace(/\/+$/, '') : path + return len > 1 && path[len - 1] === '/' ? path.replace(/\/{1,}$/, '') : path } /** Trim both leading and trailing slashes. */ @@ -94,19 +95,23 @@ export function exactPathTest( // /a/b/c + d = /a/b/c/d // /a/b/c + d/ = /a/b/c/d // /a/b/c + d/e = /a/b/c/d/e +interface ResolvePathOptions { + base: string + to: string + trailingSlash?: 'always' | 'never' | 'preserve' + cache?: SieveCache +} + /** * Resolve a destination path against a base, honoring trailing-slash policy * and supporting relative segments (`.`/`..`) and absolute `to` values. - * - * Internal: parameters are positional so the router's hot callers pass no - * options object. */ -export function resolvePath( - base: string, - to: string, - trailingSlash: 'always' | 'never' | 'preserve' = 'never', - cache?: SieveCache, -) { +export function resolvePath({ + base, + to, + trailingSlash = 'never', + cache, +}: ResolvePathOptions) { if (to.includes('//')) { to = cleanPath(to) } @@ -187,7 +192,7 @@ export function resolvePath( /** * Create a pre-compiled decode config from allowed characters. - * Created once for the router's fixed encoding configuration. + * This should be called once at router initialization. */ export function compileDecodeCharMap( pathParamsAllowedCharacters: ReadonlyArray, @@ -195,112 +200,229 @@ export function compileDecodeCharMap( const charMap = new Map( pathParamsAllowedCharacters.map((char) => [encodeURIComponent(char), char]), ) - // Encoded keys contain no '|', and only these four regexp metacharacters. - const regex = new RegExp( - [...charMap.keys()].join('|').replace(/[.*()]/g, '\\$&'), - 'g', - ) + // Escape special regex characters and join with | + const pattern = Array.from(charMap.keys()) + .map((key) => key.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')) + .join('|') + const regex = new RegExp(pattern, 'g') return (encoded: string) => encoded.replace(regex, (match) => charMap.get(match) ?? match) } -export type InterpolationSegment = string | DynamicPathSegment - -export type RouteInterpolation = Array & { - names?: Array +interface InterpolatePathOptions { + path?: string + params: Record + /** + * A function that decodes a path parameter value. + * Obtained from `compileDecodeCharMap(pathParamsAllowedCharacters)`. + */ + decoder?: (encoded: string) => string + /** + * @internal + * For testing only, in development mode we use the router.isServer value + */ + server?: boolean } -export function getRouteSegments(route: AnyRoute) { - return route._interpolation -} - -/** A splat is missing when it has no value; `0` and `false` are stringified like any other param. */ -function isMissingSplat(value: unknown): boolean { - return value == null || value === '' -} - -/** Devtools checks navigation availability separately from the hot formatter. */ -export function hasMissingPathParams( - segments: RouteInterpolation, - params: Record, -): boolean { - return segments.some((part) => { - if (typeof part === 'string') { - return false - } - const [kind, key] = part - return kind === SEGMENT_TYPE_WILDCARD - ? isMissingSplat(params[key]) - : kind === SEGMENT_TYPE_PARAM && !(key in params) - }) +type InterPolatePathResult = { + interpolatedPath: string + usedParams: Record + isMissingParams: boolean // true if any params were not available when being looked up in the params object } function encodeParam( key: string, - value: unknown, - decoder: ((encoded: string) => string) | undefined, -): string { - if (typeof value !== 'string') { - return '' + (value ?? undefined) - } + params: InterpolatePathOptions['params'], + decoder: InterpolatePathOptions['decoder'], +): any { + const value = params[key] + if (typeof value !== 'string') return value - const splat = key === '_splat' - // Early return if the splat contains only URL-safe characters. - if (splat && (!value || /^[a-zA-Z0-9\-._~!/]*$/.test(value))) { + if (key === '_splat') { + // Early return if value only contains URL-safe characters (performance optimization) + if (/^[a-zA-Z0-9\-._~!/]*$/.test(value)) return value + // the splat/catch-all routes shouldn't have the '/' encoded out + // Use encodeURIComponent for each segment to properly encode spaces, + // plus signs, and other special characters that encodeURI leaves unencoded return value + .split('/') + .map((segment) => encodePathParam(segment, decoder)) + .join('/') + } else { + return encodePathParam(value, decoder) } - let encoded = encodeURIComponent(value) - if (splat) { - // Splats preserve '/', but still encode spaces, '+', '?' and '#'. - // Restore separators before allowed characters can decode a literal '%2F'. - encoded = encoded.replaceAll('%2F', '/') - } - return decoder ? decoder(encoded) : encoded } -/** Substitute current values into parsed segments, optionally collecting raw params. */ -export function interpolatePath( - path: string, - segments: RouteInterpolation, - params: Record, - decoder?: (encoded: string) => string, - usedParams?: Record, -): string { - // One parsed template serves both trailing-slash variants. - const trailingSlash = path.endsWith('/') ? '/' : '' - let joined = '' - for (const part of segments) { - if (typeof part === 'string') { - joined += part - continue - } - const [kind, key, prefix, rawSuffix] = part - const splat = kind === SEGMENT_TYPE_WILDCARD - const suffix = - splat && rawSuffix !== undefined ? rawSuffix + trailingSlash : rawSuffix - let paramValue = params[key] - // An omitted optional contributes neither a segment nor used-param metadata. - if (kind === SEGMENT_TYPE_OPTIONAL_PARAM && paramValue == null) { - continue - } - if (usedParams) { - // Match identity needs current raw values, never data retained from another call. - usedParams[key] = paramValue - // TODO: Deprecate * - if (splat) { - usedParams['*'] = paramValue +/** + * Interpolate params and wildcards into a route path template. + * + * - Encodes params safely (configurable allowed characters) + * - Supports `{-$optional}` segments, `{prefix{$id}suffix}` and `{$}` wildcards + */ +export function interpolatePath({ + path, + params, + decoder, + // `server` is marked @internal and stripped from .d.ts by `stripInternal`. + // We avoid destructuring it in the function signature so the emitted + // declaration doesn't reference a property that no longer exists. + ...rest +}: InterpolatePathOptions): InterPolatePathResult { + // Tracking if any params are missing in the `params` object + // when interpolating the path + let isMissingParams = false + const usedParams: Record = Object.create(null) + + if (!path || path === '/') + return { interpolatedPath: '/', usedParams, isMissingParams } + if (!path.includes('$')) + return { interpolatedPath: path, usedParams, isMissingParams } + + if (isServer ?? rest.server) { + // Fast path for common templates like `/posts/$id` or `/files/$`. + // Braced segments (`{...}`) are more complex (prefix/suffix/optional) and are + // handled by the general parser below. + if (path.indexOf('{') === -1) { + const length = path.length + let cursor = 0 + let joined = '' + + while (cursor < length) { + // Skip slashes between segments. '/' code is 47 + while (cursor < length && path.charCodeAt(cursor) === 47) cursor++ + if (cursor >= length) break + + const start = cursor + let end = path.indexOf('/', cursor) + if (end === -1) end = length + cursor = end + + const part = path.substring(start, end) + if (!part) continue + + // `$id` or `$` (splat). '$' code is 36 + if (part.charCodeAt(0) === 36) { + if (part.length === 1) { + const splat = params._splat + usedParams._splat = splat + // TODO: Deprecate * + usedParams['*'] = splat + + if (!splat) { + isMissingParams = true + continue + } + + const value = encodeParam('_splat', params, decoder) + joined += '/' + value + } else { + const key = part.substring(1) + if (!isMissingParams && !(key in params)) { + isMissingParams = true + } + usedParams[key] = params[key] + + const value = encodeParam(key, params, decoder) ?? 'undefined' + joined += '/' + value + } + } else { + joined += '/' + part + } } + + if (path.endsWith('/')) joined += '/' + + const interpolatedPath = joined || '/' + return { usedParams, interpolatedPath, isMissingParams } } - if (splat && isMissingSplat(paramValue)) { - // A missing wildcard keeps its affixes, but omits a bare segment. - if (prefix === '/' && !suffix) { + } + + const length = path.length + let cursor = 0 + let segment + let joined = '' + while (cursor < length) { + const start = cursor + segment = parseSegment(path, start, segment) + const end = segment[5] + cursor = end + 1 + + if (start === end) continue + + const kind = segment[0] + + if (kind === SEGMENT_TYPE_PATHNAME) { + joined += '/' + path.substring(start, end) + continue + } + + if (kind === SEGMENT_TYPE_WILDCARD) { + const splat = params._splat + usedParams._splat = splat + // TODO: Deprecate * + usedParams['*'] = splat + + const prefix = path.substring(start, segment[1]) + const suffix = path.substring(segment[4], end) + + // Check if _splat parameter is missing. _splat could be missing if undefined or an empty string or some other falsy value. + if (!splat) { + isMissingParams = true + // For missing splat parameters, just return the prefix and suffix without the wildcard + // If there is a prefix or suffix, return them joined, otherwise omit the segment + if (prefix || suffix) { + joined += '/' + prefix + suffix + } continue } - paramValue = '' + + const value = encodeParam('_splat', params, decoder) + joined += '/' + prefix + value + suffix + continue } - joined += prefix + encodeParam(key, paramValue, decoder) + (suffix || '') + if (kind === SEGMENT_TYPE_PARAM) { + const key = path.substring(segment[2], segment[3]) + if (!isMissingParams && !(key in params)) { + isMissingParams = true + } + usedParams[key] = params[key] + + const prefix = path.substring(start, segment[1]) + const suffix = path.substring(segment[4], end) + const value = encodeParam(key, params, decoder) ?? 'undefined' + joined += '/' + prefix + value + suffix + continue + } + + if (kind === SEGMENT_TYPE_OPTIONAL_PARAM) { + const key = path.substring(segment[2], segment[3]) + const valueRaw = params[key] + + // Check if optional parameter is missing or undefined + if (valueRaw == null) continue + + usedParams[key] = valueRaw + + const prefix = path.substring(start, segment[1]) + const suffix = path.substring(segment[4], end) + const value = encodeParam(key, params, decoder) ?? '' + joined += '/' + prefix + value + suffix + continue + } } - return joined + trailingSlash || '/' + if (path.endsWith('/')) joined += '/' + + const interpolatedPath = joined || '/' + + return { usedParams, interpolatedPath, isMissingParams } +} + +function encodePathParam( + value: string, + decoder?: InterpolatePathOptions['decoder'], +) { + const encoded = encodeURIComponent(value) + return decoder?.(encoded) ?? encoded } diff --git a/packages/router-core/src/rewrite.ts b/packages/router-core/src/rewrite.ts index 901880104e..5c82408c00 100644 --- a/packages/router-core/src/rewrite.ts +++ b/packages/router-core/src/rewrite.ts @@ -1,4 +1,4 @@ -import { cleanPath, trimPath } from './path' +import { joinPaths, trimPath } from './path' import type { LocationRewrite } from './router' /** Compose multiple rewrite pairs into a single in/out rewrite. */ @@ -20,21 +20,22 @@ export function composeRewrites(rewrites: Array) { } /** Create a rewrite pair that strips/adds a basepath on input/output. */ -export function rewriteBasepath( - basepath: string, - caseSensitive?: boolean, - rewrite?: LocationRewrite, -) { - const trimmedBasepath = trimPath(basepath) +export function rewriteBasepath(opts: { + basepath: string + caseSensitive?: boolean +}) { + const trimmedBasepath = trimPath(opts.basepath) const normalizedBasepath = `/${trimmedBasepath}` - const checkBasepath = caseSensitive + const checkBasepath = opts.caseSensitive ? normalizedBasepath : normalizedBasepath.toLowerCase() const checkBasepathWithSlash = `${checkBasepath}/` - const basepathRewrite = { + return { input: ({ url }) => { - const pathname = caseSensitive ? url.pathname : url.pathname.toLowerCase() + const pathname = opts.caseSensitive + ? url.pathname + : url.pathname.toLowerCase() // Handle exact basepath match (e.g., /my-app -> /) if (pathname === checkBasepath) { @@ -46,22 +47,10 @@ export function rewriteBasepath( return url }, output: ({ url }) => { - // `url.pathname` always starts with "/", so only slashes already inside - // it can repeat; cleanPath keeps the joinPaths normalization. - url.pathname = cleanPath(`/${trimmedBasepath}${url.pathname}`) + url.pathname = joinPaths(['/', trimmedBasepath, url.pathname]) return url }, } satisfies LocationRewrite - - // Strip the basepath before custom input and restore it after custom output. - return rewrite - ? ({ - input: ({ url }) => - executeRewriteInput(rewrite, basepathRewrite.input({ url })), - output: ({ url }) => - basepathRewrite.output({ url: executeRewriteOutput(rewrite, url) }), - } satisfies LocationRewrite) - : basepathRewrite } /** Execute a location input rewrite if provided. */ diff --git a/packages/router-core/src/route.ts b/packages/router-core/src/route.ts index 089369b454..70bfdc46cd 100644 --- a/packages/router-core/src/route.ts +++ b/packages/router-core/src/route.ts @@ -1,10 +1,9 @@ import { invariant } from './invariant' -import { cleanPath, trimPathLeft, trimPathRight } from './path' +import { joinPaths, trimPathLeft, trimPathRight } from './path' import { notFound } from './not-found' import { redirect } from './redirect' import { rootRouteId } from './root' import type { LazyRoute } from './fileRoute' -import type { RouteInterpolation } from './path' import type { NotFoundError } from './not-found' import type { RedirectFnRoute } from './redirect' import type { NavigateOptions, ParsePathParams } from './link' @@ -727,13 +726,9 @@ export interface Route< > /** @internal */ _lazy?: Promise | true - /** @internal */ - _branch?: ReadonlyArray - /** @internal */ - _interpolation?: RouteInterpolation rank: number to: TrimPathRight - init: (originalIndex: number) => void + init: (opts: { originalIndex: number }) => void update: ( options: UpdatableRouteOptions< TParentRoute, @@ -1718,10 +1713,6 @@ export class BaseRoute< > /** @internal */ _lazy?: Promise | true - /** @internal */ - _branch?: ReadonlyArray - /** @internal */ - _interpolation?: RouteInterpolation constructor( options?: RouteOptions< TRegister, @@ -1771,10 +1762,8 @@ export class BaseRoute< THandlers > - init = (originalIndex: number): void => { - this.originalIndex = originalIndex - // Rebuilding a tree can change the ancestors of an existing route. - this._branch = undefined + init = (opts: { originalIndex: number }): void => { + this.originalIndex = opts.originalIndex const options = this.options as | (RouteOptions< @@ -1823,24 +1812,23 @@ export class BaseRoute< const customId = options?.id || path // Strip the parentId prefix from the first level of children - const id = isRoot + let id = isRoot ? rootRouteId - : cleanPath( - (this.parentRoute.id === rootRouteId ? '' : this.parentRoute.id) + - '/' + - (customId ?? ''), - ) + : joinPaths([ + this.parentRoute.id === rootRouteId ? '' : this.parentRoute.id, + customId, + ]) if (path === rootRouteId) { path = '/' } + if (id !== rootRouteId) { + id = joinPaths(['/', id]) + } + const fullPath = - id === rootRouteId - ? '/' - : path === undefined - ? this.parentRoute.fullPath - : cleanPath(this.parentRoute.fullPath + '/' + path) + id === rootRouteId ? '/' : joinPaths([this.parentRoute.fullPath, path]) this._path = path as TPath this._id = id as TId diff --git a/packages/router-core/src/router.ts b/packages/router-core/src/router.ts index ecf443168d..4ae7554d2c 100644 --- a/packages/router-core/src/router.ts +++ b/packages/router-core/src/router.ts @@ -6,7 +6,6 @@ import { import { isServer, loadServerRoute } from '@tanstack/router-core/isServer' import { DEFAULT_PROTOCOL_ALLOWLIST, - createNull, decodePath, deepEqual, encodePathLikeUrl, @@ -14,7 +13,6 @@ import { functionalUpdate, getUrlScheme, hasKeys, - hasOwn, isDangerousProtocol, last, nullReplaceEqualDeep, @@ -26,7 +24,6 @@ import { findFlatMatch, findRouteMatch, findSingleMatch, - parseSegments, processRouteMasks, processRouteTree, } from './new-process-route-tree' @@ -51,13 +48,13 @@ import { replaceRouteChunk, } from './load-client' import { + composeRewrites, executeRewriteInput, executeRewriteOutput, rewriteBasepath, } from './rewrite' import { createRouterStores } from './stores' import type { SieveCache } from './sieve-cache' -import type { RouteInterpolation } from './path' import type { ProcessRouteTreeResult, ProcessedTree, @@ -115,17 +112,17 @@ import type { CommitLocationOptions, NavigateFn, } from './RouterProvider' -import type { Manifest, ManifestRouteAssets } from './manifest' +import type { + Manifest, + ManifestRouteAssets, + RouterManagedTag, +} from './manifest' import type { AnySchema, AnyValidator } from './validators' import type { NavigateOptions, ResolveRelativePath, ToOptions } from './link' import type { AnySerializationAdapter, ValidateSerializableInput, } from './ssr/serializer/transformer' -import type { - HydrationScriptOutput, - InitialHydrationScriptTags, -} from './ssr/hydrationScripts' import type { GetStoreConfig, RouterStores } from './stores' function isExternalUrl(url: URL, origin: string) { @@ -146,6 +143,8 @@ export type ControllablePromise = Promise & { reject: (value?: any) => void } +export type InjectedHtmlEntry = Promise + export interface Register { // Lots of things on here like... // router @@ -466,12 +465,11 @@ export interface RouterOptions< /** * Configures which URI characters are allowed in path params that would ordinarily be escaped by encodeURIComponent. - * This is read only during initialization. Create a new router to change it. * * @link [API Docs](https://tanstack.com/router/latest/docs/framework/react/api/router/RouterOptionsType#pathparamsallowedcharacters-property) * @link [Guide](https://tanstack.com/router/latest/docs/framework/react/guide/path-params#allowed-characters) */ - readonly pathParamsAllowedCharacters?: ReadonlyArray< + pathParamsAllowedCharacters?: Array< ';' | ':' | '@' | '&' | '=' | '+' | '$' | ',' > @@ -752,15 +750,12 @@ export type UpdateFn< TRouterHistory extends RouterHistory, TDehydrated extends Record, > = ( - newOptions: Omit< - RouterConstructorOptions< - TRouteTree, - TTrailingSlashOption, - TDefaultStructuralSharingOption, - TRouterHistory, - TDehydrated - >, - 'pathParamsAllowedCharacters' + newOptions: RouterConstructorOptions< + TRouteTree, + TTrailingSlashOption, + TDefaultStructuralSharingOption, + TRouterHistory, + TDehydrated >, ) => void @@ -788,8 +783,6 @@ 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 = ({ @@ -828,25 +821,17 @@ export type ClearCacheFn = (opts?: { filter?: (d: MakeRouteMatchUnion) => boolean }) => void -/** - * Server-side SSR request contract. - * - * Tiering rule: the flat methods are the adapter/framework contract; - * `hydrationScripts` is transport for the core SSR stream merger only. - * New members must land on the matching tier. - */ export interface ServerSsr { - /** @internal Transport access for the core SSR stream merger. */ - readonly hydrationScripts: { - /** Request signal already observed by the live response transform. */ - requestSignal?: AbortSignal - reserveFastPath: (output?: HydrationScriptOutput) => boolean - claimOutput: () => HydrationScriptOutput - liftBarrier: () => void - isInitialTaken: () => boolean - skipInitialTake: () => void - startSerializationTimeout: (timeoutMs: number) => void - } + /** Framework-only: injects router-owned HTML into the SSR stream. */ + injectHtml: (html: string) => void + /** Framework-only: injects a router-owned script tag into the SSR stream. */ + injectScript: (script: string) => void + isDehydrated: () => boolean + isSerializationFinished: () => boolean + /** Framework-only: atomically reserves the pass-through stream path if safe. */ + reserveStreamFastPath: () => boolean + /** Framework-only. */ + onInjectedHtml: (listener: () => void) => () => void /** Framework-only. */ onRenderFinished: (listener: () => void) => void /** Framework-only. */ @@ -859,28 +844,19 @@ export interface ServerSsr { * resources whose references would otherwise pin the router (e.g. query * cache subscriptions, gcTime timers, abort controllers). * - * `settled` is true when every value the router dehydrated has settled, so - * no loader work can still be pending. It is false when the response ended - * early (abort, cancellation, timeout) or never consumed the loader data. - * * Listeners run synchronously and exactly once. Errors are caught and logged. - * A listener registered after cleanup already ran is invoked immediately. */ - onCleanup: (listener: (settled: boolean) => void) => void + onCleanup: (listener: () => void) => void /** Framework-only. */ - dehydrate: (opts?: { - requestAssets?: ManifestRouteAssets - signal?: AbortSignal - }) => Promise - /** - * Framework-only: opt this request out of hydration output entirely (for - * example a `hydrate: false` page). Call instead of `dehydrate()`, before - * rendering starts. No hydration scripts are emitted, `` renders - * no boundary, and the response takes the pass-through stream path. - */ - disableHydration: () => void + onSerializationFinished: (listener: () => void) => () => void /** Framework-only. */ - takeInitialHydrationScriptTags: () => InitialHydrationScriptTags | undefined + dehydrate: (opts?: { requestAssets?: ManifestRouteAssets }) => Promise + /** Framework-only. */ + takeBufferedScripts: () => RouterManagedTag | undefined + /** Framework-only: takes buffered router-owned HTML. */ + takeBufferedHtml: () => string | undefined + /** Framework-only. */ + liftScriptBarrier: () => void } export interface RouterSsrLifecycle { @@ -1039,12 +1015,6 @@ type LightweightRouteMatchCacheEntry = [ result: LightweightRouteMatchResult, ] -/** Indexes and caches rebuilt together when the route tree changes. */ -type RouteTreeCaches = - ProcessRouteTreeResult & { - resolvePathCache: SieveCache - } - export type CreateRouterFn = < TRouteTree extends AnyRoute, TTrailingSlashOption extends TrailingSlashOption = 'never', @@ -1074,8 +1044,8 @@ declare global { var __TSR_CACHE__: | { routeTree: AnyRoute - caseSensitive: boolean | undefined - processRouteTreeResult: RouteTreeCaches + processRouteTreeResult: ProcessRouteTreeResult + resolvePathCache: SieveCache } | undefined } @@ -1146,13 +1116,13 @@ export class RouterCore< Math.random() * 10000000, )}` _scroll: { - n: boolean // Reset scroll on the next render. + next: boolean // True until the current PUSH/REPLACE renders, so its hash owns window scroll. - h?: boolean - e?: boolean // Restoration enabled. - s?: boolean // Snapshot/lifecycle listeners installed. - r?: boolean // Render listener installed. - } = { n: true } + hash?: boolean + restoring?: boolean + restoration?: boolean + reset?: boolean + } = { next: true } subscribers = new Set>() /** Accepted off-screen loader generations keyed by match ID. */ _cache = new Map() @@ -1185,17 +1155,13 @@ export class RouterCore< routesByPath!: RoutesByPath processedTree!: ProcessedTree resolvePathCache!: SieveCache - private lightweightCache!: WeakMap< + private routeBranchCache = new WeakMap>() + private lightweightCache = new WeakMap< ParsedLocation, LightweightRouteMatchCacheEntry - > - // Locations built without reading the current location, keyed by the stable - // options object a Link owns. Links pass a new object when their values change. - // Client only: server renders never repeat an options object, so server - // bundles fold `isServer` and drop the cache entirely. - private staticLocations: WeakMap | undefined + >() isServer!: boolean - readonly pathParamsDecoder?: (encoded: string) => string + pathParamsDecoder?: (encoded: string) => string protocolAllowlist!: Set /** @@ -1212,11 +1178,6 @@ export class RouterCore< getStoreConfig: GetStoreConfig, ) { this.getStoreConfig = getStoreConfig - if (options.pathParamsAllowedCharacters?.length) { - this.pathParamsDecoder = compileDecodeCharMap( - options.pathParamsAllowedCharacters, - ) - } this.update({ defaultPreloadDelay: 50, @@ -1261,6 +1222,9 @@ export class RouterCore< } const prevOptions = this.options + const prevBasepath = this.basepath ?? prevOptions?.basepath ?? '/' + const basepathWasUnset = this.basepath === undefined + const prevRewriteOption = prevOptions?.rewrite this.options = { ...prevOptions, @@ -1269,13 +1233,14 @@ export class RouterCore< this.isServer = this.options.isServer ?? isServer ?? typeof document === 'undefined' - // `isServer` is a per-bundle constant, so server builds drop the cache. - if (!(isServer ?? this.isServer)) { - this.staticLocations = new WeakMap() - } this.protocolAllowlist = new Set(this.options.protocolAllowlist) + if (this.options.pathParamsAllowedCharacters) + this.pathParamsDecoder = compileDecodeCharMap( + this.options.pathParamsAllowedCharacters, + ) + if ( !this.history || (this.options.history && this.options.history !== this.history) @@ -1303,48 +1268,24 @@ export class RouterCore< } } - const nextBasepath = this.options.basepath ?? '/' - const nextRewriteOption = this.options.rewrite - const rewriteChanged = - this.basepath !== nextBasepath || - prevOptions?.rewrite !== nextRewriteOption || - prevOptions?.caseSensitive !== this.options.caseSensitive - - if (rewriteChanged) { - this.basepath = nextBasepath - - this.rewrite = - nextBasepath !== '/' && trimPath(nextBasepath) - ? rewriteBasepath( - nextBasepath, - this.options.caseSensitive, - nextRewriteOption, - ) - : nextRewriteOption - } - - // Parse once, with the final rewrite in place. if (this.history) { this.updateLatestLocation() } - if ( - this.options.routeTree !== this.routeTree || - ((isServer ?? this.isServer) && - prevOptions?.caseSensitive !== this.options.caseSensitive) - ) { + if (this.options.routeTree !== this.routeTree) { this.routeTree = this.options.routeTree as TRouteTree - let processRouteTreeResult: RouteTreeCaches + let processRouteTreeResult: ProcessRouteTreeResult if ( process.env.NODE_ENV !== 'development' && (isServer ?? this.isServer) && globalThis.__TSR_CACHE__ && - globalThis.__TSR_CACHE__.routeTree === this.routeTree && - globalThis.__TSR_CACHE__.caseSensitive === this.options.caseSensitive + globalThis.__TSR_CACHE__.routeTree === this.routeTree ) { const cached = globalThis.__TSR_CACHE__ + this.resolvePathCache = cached.resolvePathCache processRouteTreeResult = cached.processRouteTreeResult as any } else { + this.resolvePathCache = createSieveCache(1000) processRouteTreeResult = this.buildRouteTree() // only cache if nothing else is cached yet if ( @@ -1354,27 +1295,59 @@ export class RouterCore< ) { globalThis.__TSR_CACHE__ = { routeTree: this.routeTree, - caseSensitive: this.options.caseSensitive, processRouteTreeResult: processRouteTreeResult as any, + resolvePathCache: this.resolvePathCache, } } } this.setRoutes(processRouteTreeResult) } - if (!this.stores) { - if (this.latestLocation) { - const config = this.getStoreConfig(this) - this.batch = config.batch - this.stores = createRouterStores(this.latestLocation, config) + if (!this.stores && this.latestLocation) { + const config = this.getStoreConfig(this) + this.batch = config.batch + this.stores = createRouterStores(this.latestLocation, config) - if (!(isServer ?? this.isServer)) { - setupScrollRestoration(this) - } + if (!(isServer ?? this.isServer)) { + setupScrollRestoration(this) + } + } + + const nextBasepath = this.options.basepath ?? '/' + const nextRewriteOption = this.options.rewrite + const basepathChanged = basepathWasUnset || prevBasepath !== nextBasepath + const rewriteChanged = prevRewriteOption !== nextRewriteOption + + if (basepathChanged || rewriteChanged) { + this.basepath = nextBasepath + + const rewrites: Array = [] + const trimmed = trimPath(nextBasepath) + if (trimmed && trimmed !== '/') { + rewrites.push( + rewriteBasepath({ + basepath: nextBasepath, + }), + ) + } + if (nextRewriteOption) { + rewrites.push(nextRewriteOption) + } + + this.rewrite = + rewrites.length === 0 + ? undefined + : rewrites.length === 1 + ? rewrites[0] + : composeRewrites(rewrites) + + if (this.history) { + this.updateLatestLocation() + } + + if (this.stores) { + this.stores.location.set(this.latestLocation) } - } else if (rewriteChanged) { - // Existing stores hold the location parsed with the previous rewrite. - this.stores.location.set(this.latestLocation) } } @@ -1389,33 +1362,38 @@ export class RouterCore< ) } - buildRouteTree = (): RouteTreeCaches => { - const result = processRouteTree(this.routeTree, this.options.caseSensitive) + buildRouteTree = () => { + const result = processRouteTree( + this.routeTree, + this.options.caseSensitive, + (route, i) => { + route.init({ + originalIndex: i, + }) + }, + ) if (this.options.routeMasks) { processRouteMasks(this.options.routeMasks, result.processedTree) } - return { - ...result, - resolvePathCache: createSieveCache(1000), - } + return result } - setRoutes(caches: RouteTreeCaches) { - Object.assign(this, caches) - this.lightweightCache = new WeakMap() - if (!(isServer ?? this.isServer)) { - this.staticLocations = new WeakMap() - } + setRoutes({ + routesById, + routesByPath, + processedTree, + }: ProcessRouteTreeResult) { + this.routesById = routesById as RoutesById + this.routesByPath = routesByPath as RoutesByPath + this.processedTree = processedTree const notFoundRoute = this.options.notFoundRoute if (notFoundRoute) { - notFoundRoute.init(99999999999) - if (this.routesById[notFoundRoute.id] !== notFoundRoute) { - // Standalone legacy fallbacks are not processed by the matching tree. - notFoundRoute._interpolation = parseSegments(false, notFoundRoute, 0) - } + notFoundRoute.init({ + originalIndex: 99999999999, + }) this.routesById[notFoundRoute.id] = notFoundRoute } } @@ -1459,10 +1437,13 @@ export class RouterCore< locationToParse, previousLocation, ) => { - const parse = ( - { pathname, search, hash, href }: HistoryLocation, - state: HistoryLocation['state'], - ): ParsedLocation> => { + const parse = ({ + pathname, + search, + hash, + href, + state, + }: HistoryLocation): ParsedLocation> => { // Fast path: no rewrite configured and pathname doesn't need encoding // Characters that need encoding: space, high unicode, control chars // eslint-disable-next-line no-control-regex @@ -1485,9 +1466,11 @@ export class RouterCore< } } - // The URL constructor normalizes the encoding of the history href; an - // input rewrite may then change the URL before it is parsed. - const url = executeRewriteInput(this.rewrite, new URL(href, this.origin)) + // Before we do any processing, we need to allow rewrites to modify the URL + // build up the full URL by combining the href from history with the router's origin + const fullUrl = new URL(href, this.origin) + + const url = executeRewriteInput(this.rewrite, fullUrl) const parsedSearch = this.options.parseSearch(url.search) const searchStr = this.options.stringifySearch(parsedSearch) @@ -1495,8 +1478,10 @@ export class RouterCore< // (We were already doing this, so just keeping it for now) url.search = searchStr + const fullPath = url.href.replace(url.origin, '') + return { - href: url.href.replace(url.origin, ''), + href: fullPath, publicHref: href, // An input rewrite can expose a path like "//evil.example". // Normalize it to "/evil.example" to keep it on the current origin. @@ -1512,26 +1497,45 @@ export class RouterCore< } } - const location = parse(locationToParse, locationToParse.state) + const location = parse(locationToParse) const { __tempLocation, __tempKey } = location.state if (__tempLocation && (!__tempKey || __tempKey === this.tempLocationKey)) { - // A masked entry stores the real location in its state. That location is - // presented, adopting the committed entry's keys, while the URL that was - // written to history remains available as `maskedLocation`. - const parsedTempLocation = parse(__tempLocation, { - ...__tempLocation.state, - __tempLocation: undefined, - key: location.state.key, // TODO: Remove in v2 - use __TSR_key instead - __TSR_key: location.state.__TSR_key, - }) - parsedTempLocation.maskedLocation = location - return parsedTempLocation + // Sync up the location keys + const parsedTempLocation = parse(__tempLocation) as any + parsedTempLocation.state.key = location.state.key // TODO: Remove in v2 - use __TSR_key instead + parsedTempLocation.state.__TSR_key = location.state.__TSR_key + + delete parsedTempLocation.state.__tempLocation + + return { + ...parsedTempLocation, + maskedLocation: location, + } } return location } + /** Resolve a path using the router's trailing-slash policy. */ + resolvePathWithBase = (from: string, path: string) => { + return resolvePath({ + base: from, + to: path, + trailingSlash: this.options.trailingSlash, + cache: this.resolvePathCache, + }) + } + + private getRouteBranch(route: AnyRoute) { + let branch = this.routeBranchCache.get(route) + if (!branch) { + branch = buildRouteBranch(route) + this.routeBranchCache.set(route, branch) + } + return branch + } + matchRoutes: MatchRoutesFn = ( pathnameOrNext: string | ParsedLocation, locationSearchOrOpts?: AnySchema | MatchRoutesOpts, @@ -1659,16 +1663,12 @@ export class RouterCore< searchError ??= cause } // Match identity must only use the raw params captured from the URL. - const usedParams: Record = createNull() - const interpolatedPath = route._interpolation - ? interpolatePath( - route.fullPath, - route._interpolation, - rawParams, - this.pathParamsDecoder, - usedParams, - ) - : route.fullPath + const { interpolatedPath, usedParams } = interpolatePath({ + path: route.fullPath, + params: rawParams, + decoder: this.pathParamsDecoder, + server: this.isServer, + }) // Seed planning from the accepted same-ID cache generation first, then // from the committed generation for this route. Presentation stores are @@ -1855,8 +1855,10 @@ export class RouterCore< params = lastStateMatch.params } else { // Parse params through the route chain - // getMatchedRoutes already copied the cached raw params. - const strictParams: Record = rawParams + const strictParams: Record = Object.assign( + Object.create(null), + rawParams, + ) for (const route of matchedRoutes) { try { extractStrictParams(route, strictParams) @@ -1880,24 +1882,11 @@ export class RouterCore< /** * Build the next ParsedLocation from navigation options without committing. * Resolves `to`/`from`, params/search/hash/state, applies search validation - * and middlewares, and returns a stringified location object. The built - * `search` and `state` are not structurally shared with the current - * location; `parseLocation` stabilizes them once the location is committed. + * and middlewares, and returns a stable, stringified location object. * * @link https://tanstack.com/router/latest/docs/framework/react/api/router/RouterType#buildlocation-method */ buildLocation: BuildLocationFn = (opts) => { - if (!(isServer ?? this.isServer)) { - const cached = this.staticLocations!.get(opts) - if (cached) { - return cached - } - } - - // Set by `current()` whenever a build reads the current location. A - // location built without it depends only on `opts` and the route tree. - let usedCurrent = false - const build = ( dest: BuildNextOptions & { unmaskOnReload?: boolean @@ -1916,21 +1905,13 @@ export class RouterCore< } } - // We allow the caller to override the current location. Masks build - // from the same location as the destination they mask. + // We allow the caller to override the current location const currentLocation = - opts._fromLocation || this._pendingLocation || this.latestLocation + dest._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 - // objects) is only computed when a build actually reads it. - let lightweight: LightweightRouteMatchResult | undefined - const current = () => { - usedCurrent = true - return currentLocation - } - const currentMatch = () => - (lightweight ??= this.matchRoutesLightweight(current())) + // Use lightweight matching - only computes what buildLocation needs + // (fullPath, search, params) without creating full match objects + const lightweightResult = this.matchRoutesLightweight(currentLocation) // check that from path exists in the current route tree // do this check only on navigations during test or development @@ -1940,14 +1921,16 @@ export class RouterCore< dest._isNavigate ) { const [allFromMatches] = this.getMatchedRoutes(dest.from) - const [matchedRoutes, fullPath] = currentMatch() - const matchedFrom = findLast(matchedRoutes, (d) => { - return comparePaths(d.fullPath, dest.from!) - }) + const matchedFrom = findLast( + lightweightResult[0 /* matchedRoutes */], + (d) => { + return comparePaths(d.fullPath, dest.from!) + }, + ) const matchedCurrent = findLast(allFromMatches, (d) => { - return comparePaths(d.fullPath, fullPath) + return comparePaths(d.fullPath, lightweightResult[1 /* fullPath */]) }) // for from to be invalid it shouldn't just be unmatched to currentLocation @@ -1957,28 +1940,32 @@ export class RouterCore< } } - const to = dest.to ? `${dest.to}` : '.' - const nextTo = resolvePath( - // Absolute destinations resolve without a base. - to[0] === '/' - ? '' - : dest.unsafeRelative === 'path' - ? current().pathname - : (dest.from ?? currentMatch()[1 /* fullPath */]), - to, - this.options.trailingSlash, - this.resolvePathCache, + const defaultedFromPath = + dest.unsafeRelative === 'path' + ? currentLocation.pathname + : (dest.from ?? lightweightResult[1 /* fullPath */]) + + // From search should always use the current location + const fromSearch = lightweightResult[2 /* search */] + // Same with params. It can't hurt to provide as many as possible + const fromParams = lightweightResult[3 /* params */] + + const nextTo = this.resolvePathWithBase( + defaultedFromPath, + dest.to ? `${dest.to}` : '.', ) + // Resolve the next params + let nextParams = resolveNextParams(dest.params, fromParams) + const destRoute = this.routesByPath[ trimPathRight(nextTo) as keyof typeof this.routesByPath ] as AnyRoute | undefined - const isTemplate = nextTo.includes('$') let destRoutes: ReadonlyArray if (destRoute) { - destRoutes = destRoute._branch ??= buildRouteBranch(destRoute) - } else if (isTemplate) { + destRoutes = this.getRouteBranch(destRoute) + } else if (nextTo.includes('$')) { // Route templates must match routesByPath exactly. A miss here is a // typed destination mismatch, not a concrete URL to route-match. destRoutes = [] @@ -1995,60 +1982,41 @@ export class RouterCore< } } - // One parsed template serves both trailing-slash variants. - const interpolation = isTemplate - ? (destRoute?._interpolation ?? - parseSegments(false, { fullPath: nextTo }, 0)) - : undefined - - let nextParams: Record | undefined - for (const route of destRoutes) { - const fn = - route.options.params?.stringify ?? route.options.stringifyParams - if (fn) { - // Stringifiers receive the merged params, so they always see inherited ones. - const fromParams = currentMatch()[3 /* params */] - nextParams ??= resolveNextParams(dest.params, fromParams) - if (!hasKeys(nextParams)) { - break - } - if (nextParams === fromParams) { - nextParams = Object.assign( - createNull() as Record, - nextParams, - ) - } - try { - Object.assign(nextParams, fn(nextParams)) - } catch { - // Ignore errors here. When a paired parseParams is defined, - // extractStrictParams will re-throw during route matching, - // storing the error on the match and allowing the route's - // errorComponent to render. If no parseParams is defined, - // the stringify error is silently dropped. + // If there are any params, we need to stringify them + if (destRoutes.length && hasKeys(nextParams)) { + for (const route of destRoutes) { + const fn = + route.options.params?.stringify ?? route.options.stringifyParams + if (fn) { + if (nextParams === fromParams) { + nextParams = Object.assign(Object.create(null), nextParams) + } + try { + Object.assign(nextParams, fn(nextParams)) + } catch { + // Ignore errors here. When a paired parseParams is defined, + // extractStrictParams will re-throw during route matching, + // storing the error on the match and allowing the route's + // errorComponent to render. If no parseParams is defined, + // the stringify error is silently dropped. + } } } } - nextParams ??= resolveNextParams( - dest.params, - needsInheritedParams(dest.params, interpolation) - ? currentMatch()[3 /* params */] - : EMPTY_RECORD, - ) const nextPathname = opts.leaveParams ? // Keep path params uninterpolated for matchRoute/template matching. nextTo - : normalizeProtocolRelative( - decodePath( - interpolation - ? interpolatePath( - nextTo, - interpolation, - nextParams, - this.pathParamsDecoder, - ) - : nextTo, + : decodePath( + // A splat can produce a path like "//evil.example". + // Normalize it to "/evil.example" to keep it on the current origin. + normalizeProtocolRelative( + interpolatePath({ + path: nextTo, + params: nextParams, + decoder: this.pathParamsDecoder, + server: this.isServer, + }).interpolatedPath, ), ) @@ -2071,43 +2039,36 @@ export class RouterCore< } // Resolve the next search - const middlewares = getSearchMiddlewares( + let nextSearch = fromSearch + if (opts._includeValidateSearch && this.options.search?.strict) { + const validatedSearch = {} + destRoutes.forEach((route) => { + if (route.options.validateSearch) { + try { + Object.assign( + validatedSearch, + validateSearch(route.options.validateSearch, { + ...validatedSearch, + ...nextSearch, + }), + ) + } catch { + // ignore errors here because they are already handled in matchRoutes + } + } + }) + nextSearch = validatedSearch + } + + nextSearch = applySearchMiddleware( + nextSearch, + dest, destRoutes, opts._includeValidateSearch, ) - const fromSearch = () => { - let search = currentMatch()[2 /* search */] - if (opts._includeValidateSearch && this.options.search?.strict) { - const validatedSearch = {} - destRoutes.forEach((route) => { - if (route.options.validateSearch) { - try { - Object.assign( - validatedSearch, - validateSearch(route.options.validateSearch, { - ...validatedSearch, - ...search, - }), - ) - } catch { - // ignore errors here because they are already handled in matchRoutes - } - } - }) - search = validatedSearch - } - return search - } - // A literal search never reads the current one. The result is not - // structurally shared with the current search: `parseLocation` keeps - // equal nested values stable once the location is committed. - const nextSearch: Record = middlewares.length - ? applySearchMiddleware(middlewares, fromSearch(), dest) - : dest.search === true - ? fromSearch() - : typeof dest.search === 'function' - ? dest.search(fromSearch()) - : (dest.search as Record) || EMPTY_RECORD + + // Replace the equal deep + nextSearch = nullReplaceEqualDeep(fromSearch, nextSearch) // Stringify the next search const searchStr = this.options.stringifySearch(nextSearch) @@ -2115,23 +2076,26 @@ export class RouterCore< // Resolve the next hash const hash = dest.hash === true - ? current().hash - : typeof dest.hash === 'function' - ? dest.hash(current().hash) - : dest.hash || undefined + ? currentLocation.hash + : dest.hash + ? functionalUpdate(dest.hash, currentLocation.hash) + : undefined // Resolve the next hash string const hashStr = hash ? `#${hash}` : '' - // Resolve the next state. A literal state never reads the current one - // and, like the search, is not shared with it here. - const nextState: HistoryState = !dest.state - ? EMPTY_RECORD - : dest.state === true - ? current().state - : typeof dest.state === 'function' - ? dest.state(current().state) - : dest.state + // Resolve the next state + let nextState = + dest.state === true + ? currentLocation.state + : dest.state + ? functionalUpdate(dest.state, currentLocation.state) + : {} + + // Replace the equal deep + if (dest.state) { + nextState = replaceEqualDeep(currentLocation.state, nextState) + } // Create the full path of the location const fullPath = `${nextPathname}${searchStr}${hashStr}` @@ -2192,7 +2156,7 @@ export class RouterCore< this.processedTree, ) if (match) { - const params = Object.assign(createNull(), match.rawParams) + const params = Object.assign(Object.create(null), match.rawParams) const { from: _from, params: maskParams, ...maskProps } = match.route // If mask has a params function, call it with the matched params as context @@ -2207,13 +2171,6 @@ export class RouterCore< } } - // 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) - } - return next } @@ -2228,10 +2185,6 @@ export class RouterCore< ignoreBlocker, ...next }) => { - if (isServer ?? this.isServer) { - return - } - const nextLocation = next.maskedLocation ?? next if (nextLocation.external && !(isServer ?? this.isServer)) { return documentNavigation(this, nextLocation.publicHref, { @@ -2300,11 +2253,8 @@ export class RouterCore< } } - nextHistory.state = { - ...nextHistory.state, - __hashScrollIntoViewOptions: - hashScrollIntoView ?? this.options.defaultHashScrollIntoView ?? true, - } + nextHistory.state.__hashScrollIntoViewOptions = + hashScrollIntoView ?? this.options.defaultHashScrollIntoView ?? true this.shouldViewTransition = viewTransition @@ -2323,7 +2273,7 @@ export class RouterCore< } } - this._scroll.n = next.resetScroll ?? true + this._scroll.next = next.resetScroll ?? true return this._commitPromise } @@ -2337,10 +2287,6 @@ export class RouterCore< ignoreBlocker, ...rest }: BuildNextOptions & CommitLocationOptions = {}): Promise => { - if (isServer ?? this.isServer) { - return Promise.resolve() - } - const location = this.buildLocation({ ...(rest as any), _includeValidateSearch: true, @@ -2384,10 +2330,6 @@ export class RouterCore< publicHref, ...rest }) => { - if (isServer ?? this.isServer) { - return - } - const hrefScheme = href ? getUrlScheme(href) : undefined if (hrefScheme || reloadDocument) { @@ -2425,7 +2367,7 @@ export class RouterCore< this.updateLatestLocation() if (opts?.action) { - this._scroll.h = + this._scroll.hash = opts.action.type === 'PUSH' || opts.action.type === 'REPLACE' } await loadClientRoute(this, opts) @@ -2504,21 +2446,23 @@ export class RouterCore< const committedMatches = this._committed const filter = opts?.filter const preloads = this._preloads - const invalidIds = new Set() - const consider = (match: AnyRouteMatch) => { - if (!filter || filter(match as MakeRouteMatchUnion)) { - invalidIds.add(match.id) - } - } - committedMatches.forEach(consider) - this._cache.forEach(consider) - preloads?.forEach((matches) => matches.forEach(consider)) - this._tx?.[3 /* matches */].forEach(consider) - const abort: Array = [] + const invalidIds = new Set( + [ + ...committedMatches, + ...this._cache.values(), + ...[...(preloads?.values() ?? [])].flat(), + ...(this._tx?.[3 /* matches */] ?? []), + ] + .filter( + (match) => !filter || filter(match as MakeRouteMatchUnion), + ) + .map((match) => match.id), + ) + const discardedPreloads: Array = [] for (const [controller, matches] of preloads ?? []) { if (matches.some((match) => invalidIds.has(match.id))) { preloads!.delete(controller) - abort.push(controller) + discardedPreloads.push(controller) } } const invalidate = (d: MakeRouteMatch) => { @@ -2555,14 +2499,9 @@ export class RouterCore< // The superseding load must not discover any same-ID generation selected // for replacement. Existing owners release it in their normal order. for (const id of invalidIds) { - const flight = this._flights?.get(id) this._flights?.delete(id) - // A reserved discovery has no remaining match owner to retire it later. - if (flight && !flight[2 /* leases */]) { - abort.push(flight[1 /* controller */]) - } } - for (const controller of abort) { + for (const controller of discardedPreloads) { controller.abort() } @@ -2682,12 +2621,7 @@ export class RouterCore< const matchLocation = { ...location, to: location.to - ? resolvePath( - location.from || '', - location.to as string, - this.options.trailingSlash, - this.resolvePathCache, - ) + ? this.resolvePathWithBase(location.from || '', location.to as string) : undefined, params: location.params || {}, leaveParams: true, @@ -2718,13 +2652,13 @@ export class RouterCore< } if (location.params) { - if (!deepEqual(match.rawParams, location.params, true)) { + if (!deepEqual(match.rawParams, location.params, { partial: true })) { return false } } if (opts?.includeSearch ?? true) { - return deepEqual(baseLocation.search, next.search, true) + return deepEqual(baseLocation.search, next.search, { partial: true }) ? match.rawParams : false } @@ -2869,60 +2803,16 @@ function validateSearch(validateSearch: AnyValidator, input: unknown): unknown { return {} } -function resolveNextParams( - spec: unknown, - base: Record, -): Record { - if (spec === undefined || spec === true) { - return base - } - const next = Object.create(null) - if (spec === false || spec === null) { - return next - } - if (typeof spec === 'function') { - Object.assign(next, base) - return Object.assign(next, spec(next)) - } - return Object.assign(next, base, spec) -} - -// Inherited params are read by param updaters and by template keys the -// destination leaves open. `interpolation` is undefined without template keys. -function needsInheritedParams( - spec: unknown, - interpolation: RouteInterpolation | undefined, -) { - if (typeof spec === 'function') { - return true - } - if (!interpolation || spec === false || spec === null) { - return false - } - return ( - spec === undefined || - spec === true || - interpolation.some( - (part) => - typeof part !== 'string' && !hasOwn.call(spec, part[1 /* key */]), - ) - ) -} - -const EMPTY_RECORD: Record = Object.freeze({}) - -// Keep this separate from recursive execution to limit JIT compiler memory. -// A counted loop instead of `for...of`: Maglev's inlined array iteration -// deoptimizes on route option shapes and recompiles later, whereas indexed -// reads stay optimized once compiled. -function getSearchMiddlewares( +function applySearchMiddleware( + search: any, + dest: BuildNextOptions, destRoutes: ReadonlyArray, includeValidateSearch: boolean | undefined, ) { const middlewares = [] as Array> - for (let i = 0; i < destRoutes.length; i++) { - const routeOptions = destRoutes[i]!.options + for (const route of destRoutes) { + const routeOptions = route.options if ('search' in routeOptions) { if (routeOptions.search?.middlewares) { middlewares.push(...routeOptions.search.middlewares) @@ -2975,14 +2865,6 @@ function getSearchMiddlewares( } } - return middlewares -} - -function applySearchMiddleware( - middlewares: Array>, - search: any, - dest: BuildNextOptions, -) { const applyNext = ( index: number, currentSearch: any, @@ -3040,6 +2922,20 @@ function findGlobalNotFoundRouteId( return rootRouteId } +function resolveNextParams( + spec: unknown, + base: Record, +): Record { + if (spec === false || spec === null) { + return Object.create(null) + } + if ((spec ?? true) === true) { + return base + } + const next = Object.assign(Object.create(null), base) + return Object.assign(next, functionalUpdate(spec as any, next)) +} + function extractStrictParams( route: AnyRoute, accumulatedParams: Record, diff --git a/packages/router-core/src/scroll-restoration.ts b/packages/router-core/src/scroll-restoration.ts index 972da92da1..5e4ae0d3ee 100644 --- a/packages/router-core/src/scroll-restoration.ts +++ b/packages/router-core/src/scroll-restoration.ts @@ -38,6 +38,21 @@ function createScrollRestorationCache() { } } +function persistScrollRestorationCache() { + try { + safeSessionStorage?.setItem( + storageKey, + JSON.stringify(scrollRestorationCache), + ) + } catch { + if (process.env.NODE_ENV !== 'production') { + console.warn( + '[ts-router] Could not persist scroll restoration state to sessionStorage.', + ) + } + } +} + const scrollRestorationCache = /* @__PURE__ */ createScrollRestorationCache() const scrollRestorationIdAttribute = 'data-scroll-restoration-id' @@ -154,7 +169,7 @@ export function setupScrollRestoration(router: AnyRouter, force?: boolean) { const scroll = router._scroll if (shouldSetupScrollRestoration) { - scroll.e = true + scroll.restoring = true } if (isServer ?? router.isServer) { @@ -182,8 +197,8 @@ export function setupScrollRestoration(router: AnyRouter, force?: boolean) { } } - if (shouldSetupScrollRestoration && !scroll.s) { - scroll.s = true + if (shouldSetupScrollRestoration && !scroll.restoration) { + scroll.restoration = true ignoreScroll = false history.scrollRestoration = 'manual' @@ -205,57 +220,31 @@ export function setupScrollRestoration(router: AnyRouter, force?: boolean) { trackedScrollTargets.clear() }) addEventListener('pagehide', () => { - // Allow native restoration on reload or a later return to this entry. - // Reset even when entering BFCache: the cached document may be evicted. - // Do this first so a failing getKey/snapshot cannot leave it in manual mode. - history.scrollRestoration = 'auto' - - // Save positions for our own restoration if a new document loads. snapshotCurrentScrollTargets( getKey( router.stores.resolvedLocation.get() ?? router.stores.location.get(), ), ) - try { - safeSessionStorage?.setItem( - storageKey, - JSON.stringify(scrollRestorationCache), - ) - } catch { - if (process.env.NODE_ENV !== 'production') { - console.warn( - '[ts-router] Could not persist scroll restoration state to sessionStorage.', - ) - } - } - }) - - addEventListener('pageshow', (event) => { - if (event.persisted) { - // BFCache resumes the existing document without rerunning router setup. - // Reclaim restoration so the browser and router don't both control it. - // Fresh documents already set manual mode during setup. - history.scrollRestoration = 'manual' - } + persistScrollRestorationCache() }) } - if (scroll.r) { + if (scroll.reset) { return } - scroll.r = true + scroll.reset = true // Restore destination scroll after the new route has rendered. router.subscribe('onRendered', (event) => { const behavior = router.options.scrollRestorationBehavior const scrollToTopSelectors = router.options.scrollToTopSelectors - const shouldResetScroll = scroll.n - const hashNavigation = scroll.h + const shouldResetScroll = scroll.next + const hashNavigation = scroll.hash let scrollToTopElements: Set | undefined trackedScrollTargets.clear() - scroll.n = true - scroll.h = false + scroll.next = true + scroll.hash = false if ( typeof router.options.scrollRestoration === 'function' && @@ -267,7 +256,7 @@ export function setupScrollRestoration(router: AnyRouter, force?: boolean) { const cacheKey = getKey(event.toLocation) const fromCacheKey = event.fromLocation && getKey(event.fromLocation) - if (scroll.e && fromCacheKey && fromCacheKey !== cacheKey) { + if (scroll.restoring && fromCacheKey && fromCacheKey !== cacheKey) { const fromElementEntries = scrollRestorationCache[fromCacheKey] if (fromElementEntries) { @@ -320,7 +309,7 @@ export function setupScrollRestoration(router: AnyRouter, force?: boolean) { const skipWindowRestore = hash && hashScrollIntoViewOptions && hashNavigation - const elementEntries = scroll.e + const elementEntries = scroll.restoring ? scrollRestorationCache[cacheKey] : undefined diff --git a/packages/router-core/src/searchParams.ts b/packages/router-core/src/searchParams.ts index 19155586e8..926e4e53dd 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.slice(1) + searchStr = searchStr.substring(1) } const query: Record = decode(searchStr) diff --git a/packages/router-core/src/ssr/STREAMING.md b/packages/router-core/src/ssr/STREAMING.md deleted file mode 100644 index 12d3bd7b08..0000000000 --- a/packages/router-core/src/ssr/STREAMING.md +++ /dev/null @@ -1,617 +0,0 @@ -# SSR streaming - -This document explains how TanStack Router adds hydration scripts to server-rendered HTML. -It describes the transport in `router-core` and the React, Solid, and Vue adapters. - -## Main terms - -The renderer and Seroval produce output independently. - -- The **application output** is the HTML from the framework renderer. -- A **hydration source** is one complete JavaScript source string from the router or Seroval. -- An **initial tag** is a hydration `` as a safe point. -After the boundary, each such sequence must be a position where script insertion is valid. - -These rules are application and adapter contracts. -The byte scanner cannot tell structural markup from matching text. - -## The boundary - -The boundary is a private transport marker emitted by ``. -The boundary script removes itself in the browser. - -The transform scans for the boundary only after the initial take. -Before that take, it forwards consumed application bytes without a boundary scan. - -When the transform finds the boundary, it enters the `Merge` phase and lifts the hydration barrier. -Queued late sources then become eligible for output. - -If application EOF arrives before the boundary, hydration-enabled merge mode releases the initial sources as late records. -The transform then drains them after the delivered document, as it does for any EOF safe point. -The page cannot hydrate without the route scripts that `` renders, but the response completes. -Disabled hydration and initial pass-through do not require a boundary. - -## Transform paths - -One stream implementation serves every request. -It starts in pass-through when the hydration state can reserve the fast path before any application output. -Otherwise it starts in merge mode and can change to pass-through later. -Both entries use the same `PassThrough` phase. - -### Initial pass-through - -The hydration state reserves initial pass-through only when all these conditions are true: - -- The state is live and has no failure. -- Serialization is complete. -- The initial take or `disableHydration()` committed the initial output. -- No queued or active hydration output remains. -- No consumer or earlier fast-path reservation conflicts with this reservation. - -The stream then never claims the hydration output and never scans. -It forwards each `Uint8Array` from the renderer unchanged. -It does not scan, copy, or move those bytes. - -A Node renderer can also send string records. -The path encodes one string record at a time in chunks of at most 64 KiB. -It does not join separate string records. - -At application EOF, the path marks rendering as complete and closes normally. - -### Disabled hydration - -`serverSsr.disableHydration()` disables router hydration output for one request. -Call it instead of `dehydrate()`, before rendering starts. - -The runtime also rejects calls after any of these events: - -- `dehydrate()` starts. -- The first `` take commits initial output. -- The transform claims the hydration output. -- The hydration producer completes or starts an active record. - -The call removes the queued bootstrap sources. -It commits the initial state, lifts the barrier, and marks the producer as complete. - -The request emits no hydration tags or router boundary. -`` can still render normal route and manifest scripts. -The transform can use initial pass-through. - -### Merge mode - -The transform uses merge mode when it cannot reserve initial pass-through. -Merge mode claims the request hydration output for one consumer. -A second consumer causes an error. - -Merge mode recognizes these universal byte patterns: - -1. The fixed router boundary suffix. -2. The exact canonical close. - -An adapter can add one safe-point profile: - -- `script-close` matches exact lowercase ``. -- `record-end` uses the end of a complete renderer record. - -The core does not select a profile from a framework name. -The adapter selects it. - -The boundary and script-close matchers keep partial matches across input chunks. -Their patterns have a unique first byte. - -The canonical close repeats its first byte. -The transform uses an exact search and a carry of at most 13 bytes for that pattern. - -### Merge phases - -| Phase | Meaning | -| ---------------- | -------------------------------------------------------------- | -| `BeforeBoundary` | Forward application output and wait for the one-time boundary. | -| `Merge` | Find safe points and the canonical close. | -| `HeldClose` | Keep the canonical close while later output drains. | -| `PassThrough` | Forward all later application output without scanning. | - -A stream starts in `PassThrough` when initial pass-through is reserved; otherwise only `Merge` can enter it. -`HeldClose` must preserve final document order, so it cannot enter that phase. - -A ready late record starts only after the boundary and at a safe point. -An active late record drains completely before application output resumes. - -### Dynamic pass-through - -Merge mode can stop scanning after the boundary. -It does this only when all these conditions are true: - -- The hydration output is `Done`. -- No hydration source or active record remains. -- The transform holds no partial canonical close. -- The hydration state can reserve the fast path for the current consumer. - -After the switch, all later application output passes through unchanged. -The transform does not scan or move later document closes. - -## Adapter safe points - -| Adapter or path | Additional safe point | -| --------------- | --------------------------------- | -| React | Exact lowercase `` | -| Solid | End of a complete renderer record | -| Vue | None | -| Eager string | None | - -The boundary and canonical close are safe points for every adapter. -Ordinary EOF is also a safe point after the boundary. -A partial canonical close at EOF is forwarded as ordinary content, as described below. - -### React - -The transform treats React chunk boundaries as arbitrary. -It does not use them as safe points. - -The script-close profile lets a late record follow a complete React patch script. -It can also emit router data while React waits for later Suspense work. - -The adapter uses `renderToReadableStream` when that function exists. -Otherwise, it uses `renderToPipeableStream`. -Both paths use the same script-close profile. -Both paths set `progressiveChunkSize` to positive infinity so React does not split completed Suspense boundaries into separate patches based only on output size. -The adapter does not inspect the React version. - -### Solid - -The Solid adapter preserves each complete shell or patch string as one renderer record. -It uses the end of that record as a safe point. - -An internal 64 KiB encoding chunk is not a record end. -The safe point occurs only after the complete source record drains. - -### Vue - -The Vue adapter does not treat renderer record ends as safe points. -It uses only the boundary, the canonical close, and eligible EOF. - -The Vue application output must have one `` element as its outer root. -An outer Vue Fragment or root array is not supported. -Its closing marker follows ``, and the transform does not preserve that position. -Fragments inside `` are supported. - -## Canonical document close - -Merge mode recognizes only this exact adjacent lowercase sequence: - -```html - -``` - -While the transform remains in the `Merge` phase, the first matching sequence after the boundary becomes the held canonical close. -The transform emits preceding application bytes and holds the 14-byte close. - -A match inside one byte chunk advances past the close without copying it. -The transform can emit the preceding prefix as a view of that chunk. -A match across chunks uses the carry and one small combined buffer. -The transform caches the search result for the current byte chunk, including a missing match. -Returning from a renderer safe point reuses that result; advancing to another byte chunk clears it. - -The transform continues to process renderer patches and late records after it holds the close. -All other application bytes keep their order. -Late records keep FIFO order. -The two streams can interleave only at safe points. - -After successful completion, the transform emits a fresh 14-byte copy of the held close last. -On failure or cancellation, the transform does not emit the held close. -Bytes already delivered to the consumer remain delivered. - -The match is case-sensitive and byte-exact. -Whitespace or a text node between `` and `` prevents a match. - -If the transform completes successfully without a canonical match, it preserves all application bytes. -A later record can then appear after ``. -This can happen at a React script close, a Solid record end, or EOF. - -Supporting every equivalent HTML form requires an HTML parser. -This transport uses exact byte matching instead. - -Initial and dynamic pass-through never move a document close. -They also preserve bytes that follow ``. - -### EOF rules - -After the boundary, ordinary EOF can provide the final safe point. -If a late record is `Active`, it drains first. -These rules apply after no record is active: - -- If output is `Ready`, the transform drains ready late records at EOF. -- If output is `Waiting`, the transform waits for a state change. -- If normal serialization reaches `Done`, the transform completes. -- If output is `Failed`, the transform fails immediately. - -A partial canonical-close prefix at EOF is ordinary application content. -The transform forwards those bytes first and then applies the rules above. -A late record can follow them, exactly as after a document without a canonical close. - -Server cleanup terminates the transform instead of using these `Done` rules. - -## Hydration output states - -`claimOutput()` creates one pull view for merge mode. -The view has five states: - -| State | Meaning | -| --------- | ---------------------------------------------------------------------------------- | -| `Waiting` | No late record is eligible. The queue can still contain blocked sources. | -| `Ready` | Queued sources can start at the next safe point. | -| `Active` | One late record is in progress and must finish. | -| `Done` | Normal output drained, hydration is disabled, or cleanup made the output inactive. | -| `Failed` | The response must fail immediately. | - -The hydration output permits one consumer claim. -While it is live, it permits one active subscriber at a time. -Another subscriber can register after the first subscriber unregisters. -After cleanup, subscription returns a function that does nothing. - -The transform calls `pullChunk()` only from a response-stream pull. -Each call returns at most 64 KiB of bytes. - -## Late record framing - -`hydrationScripts.ts` owns the complete framing of every late record. -The framing includes the opening tag, escaped nonce, separators, self-removal source, and closing tag. - -A late record has this logical form: - -```text - -``` - -The nonce attribute is absent when the request has no nonce. -The code escapes `&`, double quotes, single quotes, `<`, and `>` in a dynamic nonce. - -The transform does not inspect this framing. - -### Late record size - -The hydration output selects a FIFO source prefix for each late record. -Its target is at most 64 Ki UTF-16 code units for the complete framed record. - -The hydration output never splits one hydration source across script tags. -Therefore, one large source can create a record above the target. - -If a complete record is at most 16 Ki code units, the hydration output joins and encodes it once. -The hydration output encodes larger records in bounded parts with `encodeInto()`. - -Every returned byte chunk is at most 64 KiB. -Application output cannot appear inside an active record. - -### Queue ownership - -The queue uses one source array and a head index. -When it selects the complete unconsumed array, it can reuse that array internally. - -For a partial selection, it copies the selected prefix. -It replaces consumed queue slots with empty slots instead of shifting the live suffix. - -The queue removes its backing array when it becomes empty. -For a busy queue, it can compact after at least 1,024 consumed entries. -The consumed prefix must also be at least as large as the live suffix. - -Compaction keeps FIFO order. - -The hydration output releases a source from backlog accounting after its text finishes encoding. -The record stays `Active` until its separators and closing code drain. - -The boundary does not move or copy queued source strings. -It only makes them eligible for a pull. - -Normal serialization adds `$_TSR.e()` as the final hydration source. -The hydration output becomes `Done` after that source and all earlier sources drain. - -A backlog error changes the state to `Failed`, drops queued and active sources, -and causes Router to dispose of the SSR serializer. -Cleanup clears the queue and changes a claimed output to `Done`. - -## Backpressure and memory limits - -One downstream pull emits at most one output chunk. -The transform starts at most one application read ahead. - -The merge path can retain these main values: - -- One current application record and its encoder cursor, or one in-flight or prefetched nonterminal application read. -- One encoded application-string chunk of at most 64 KiB. The current input string record can be larger. -- At most 13 bytes from a partial canonical close. -- One active late record with its selected sources. -- One queue of later hydration sources. -- One hydration output buffer of at most 64 KiB. - -The hydration state permits at most 4,096 retained sources across initial, queued, and active output. -It also permits at most 16,777,216 UTF-16 code units of regular retained source text. - -These limits include constructor seeds and later sources. -They apply before and after the initial take. - -The limits apply to the pending backlog, not to total response output. -Initial-source accounting ends at the initial take. -Late-source accounting ends when each source finishes encoding. - -One source can exceed the 16 Mi-code-unit limit. -This exception supports one large loader or query value. -A second oversized source cannot be retained while the first is queued or being encoded. - -Cleanup clears source arrays, active encoder state, callbacks, timers, and stored errors. - -New eligible output and failures can wake the transform through one subscription. -`pullChunk()` does not notify the subscriber about successful state transitions. -When a producer update or barrier transition changes the output state, the hydration state still notifies the transform. -This notification can occur while a response-stream pull is pending. -Server cleanup terminates through a separate cleanup listener. -Application reads wake the transform separately. -The transform uses one waiting resolver at a time. -It does not create `Promise.race()` handlers in its pump. - -## Unicode and string input - -Built-in streaming adapters send UTF-8 `Uint8Array` records. -The transform forwards application bytes without decoding them. -A UTF-8 character can span byte records. - -A Node pipeable stream can also send string records. -The transform encodes each string record independently in chunks of at most 64 KiB. - -It does not repair a surrogate pair that spans two separate string records. -A record-end safe point occurs after the complete string, not after an internal encoding chunk. - -Each hydration source is one complete JavaScript string. -A semicolon separates adjacent sources in one tag. -HTML markup separates sources in different tags. - -`TextEncoder` and `encodeInto()` do not split a valid surrogate pair inside one source. -The implementation does not cut sources at estimated UTF-16 offsets. - -### Eager string output - -The eager helper uses the same merge path when initial pass-through is unavailable. -It encodes `` and the HTML string in bounded parts. - -It decodes merged output incrementally with `TextDecoder`. -It does not first collect one complete byte buffer or call `Response.text()`. - -When initial pass-through is available, the helper returns `` plus the original HTML string. -It then cleans the server state in a `finally` block. - -## Completion and cleanup - -The streaming paths use one finalizer. -The eager fast path uses its own `try` and `finally` because it has no response stream. - -| Result | Response output | Application reader | `onAbort` | -| ------------------------ | --------------- | ------------------ | --------- | -| Natural completion | Close | Release | No | -| Request abort | Error | Cancel | Yes | -| Consumer cancellation | No extra signal | Cancel | Yes | -| Stream or output failure | Error | Cancel | Yes | -| Serialization timeout | Error | Cancel | Yes | -| Lifetime timeout | Error | Cancel | Yes | -| External server cleanup | Error | Cancel | Yes | - -The terminal guard makes cleanup run once. -A non-success result calls the adapter `onAbort` function at most once. - -After natural completion, the transform releases the application reader. -After another result, it cancels the reader. -Reader cancellation can finish after router cleanup. - -Finally, server cleanup disposes of the SSR serializer and clears Router-owned hydration state. -It also stops the reader pump that Router's SSR RawStream bridge creates. -It clears the request router's `router.ssr` and `router.serverSsr` slots. - -Cleanup listeners receive one boolean, `settled`. -It is true when every value the router dehydrated has settled. -Rejected hydration output, including a backlog failure, stops serialization without marking deferred values as settled. -Router aborts the request's route-match controllers only when `settled` is false, because only then can loader work still be pending. - -Canceling a RawStream that the SSR or JSON bridge reconstructs removes Router's Seroval-stream listener. -Seroval and its official plugins remain responsible for work that they create. - -### Timeouts - -In merge mode, application EOF starts the serialization timeout and calls `setRenderFinished()`. -This happens as soon as a prefetched read reports EOF, even if the consumer pauses. -The default serialization timeout is 60 seconds. - -The timeout runs only while Seroval remains active. -It changes hydration output to `Failed` when it expires. - -Every live streaming transform also has a lifetime timeout. -Its default is twice the serialization timeout. - -Some Web runtimes return numeric timer IDs with no `unref()` method. -The code calls `unref()` only when the returned timer handle provides it. - -The serialization timeout stays referenced because it protects active work after application rendering ends. - -### External cleanup and response disposal - -`ServerSsr.cleanup()` notifies each live transform. -The transform then fails with an `AbortError`, cancels its reader, and calls the adapter abort function. - -A stream response also provides an idempotent `dispose()` function. -Disposal removes router ownership before it cancels the response body. -A renderer can ignore that body cancellation. - -After response handoff, request-abort binding has four cases: - -- If the request is already aborted, handoff disposes the stream immediately. -- If the live transform already observes the same request signal, handoff reuses its listener. On request abort, SSR cleanup also disposes the final response, including a body wrapped by middleware. -- Otherwise, with live router SSR state, handoff adds a listener to dispose the stream, and SSR cleanup removes that listener. -- Without live router SSR state, abort still disposes the stream. The one-time listener ends with the request signal. - -### Adapter cancellation limits - -Every streaming adapter rejects a request that is already aborted before renderer setup. -The adapters and core transform also detect an abort during synchronous setup before they return a response. - -The React readable path passes the request signal to `renderToReadableStream`. -The React pipeable path passes `abort()` to the transform. - -For Solid, cancelling the transform's reader errors the writable used by its renderer. -Vue pipes its public readable renderer stream into the transform, so reader cancellation propagates to Vue. -Neither renderer provides a disposal handle for unresolved component work. - -The adapters stop outgoing bytes and release router-owned state. -An unresolved Solid or Vue resource can retain its renderer closure until that resource settles. - -React and Solid bot-readiness waits observe an adapter signal that the transform aborts on failure or cancellation, including request abort, lifetime expiry, and external SSR cleanup. -These waits cannot keep the response promise pending after the transform terminates. -The extra controller is allocated only for bot waits on the readable-stream paths. -Each wait removes its listener when the wait ends. - -## Test coverage - -Unit tests cover every byte split of the boundary and script-close patterns. -They also cover every internal split of the canonical close. - -Hydration-state tests cover initial ownership, exact framing, nonce escaping, FIFO order, size limits, completion, failure, and cleanup. - -Transform tests cover safe points, content after ``, EOF, close carry, ordering, cancellation, timeouts, Unicode, and stream errors. - -Adapter tests make sure that React, Solid, and Vue select the documented safe-point profiles. -Real-renderer tests cover React 19 script closes and Solid record ends. - -React and Solid browser suites cover CSP for ordinary SSR output. -No browser CSP test forces a late dynamic hydration record. -Vue has no equivalent browser CSP suite. - -Normal unit tests cover backpressure correctness and lost-record prevention. -Slow-consumer memory tests run only when `RUN_BACKPRESSURE_PERF=1`. - -Browser tests cover hydration data, interaction, data order, and removal of initial hydration tags and the boundary. - -The [SSR streaming benchmark](../../benchmarks/ssr-streaming/README.md) measures throughput and retained memory. -Use interleaved warm runs for latency comparisons. -Use isolated processes with forced garbage collection for memory comparisons. - -Treat machine-specific measurements as supporting evidence. -They are not part of the transport contract. diff --git a/packages/router-core/src/ssr/bodyScripts.ts b/packages/router-core/src/ssr/bodyScripts.ts deleted file mode 100644 index b2472ec30b..0000000000 --- a/packages/router-core/src/ssr/bodyScripts.ts +++ /dev/null @@ -1,57 +0,0 @@ -import { _getAssetMatches } from '../load-client' -import type { Manifest, RouterManagedTag } from '../manifest' -import type { AnyRouteMatch } from '../Matches' -import type { InitialHydrationScriptTags } from './hydrationScripts' - -type ScriptTags = Array -export type SsrBodyScriptParts = readonly [ScriptTags, ScriptTags] - -export function getSsrBodyScriptParts( - matches: Array, - manifest: Manifest | undefined, - nonce: string | undefined, - routeScriptAttrs?: Record, -): SsrBodyScriptParts { - const assetMatches = _getAssetMatches(matches) - const routeScripts: ScriptTags = [] - const manifestScripts: ScriptTags = [] - for (const match of assetMatches) { - for (const script of Array.isArray(match.scripts) ? match.scripts : []) { - if (!script) { - continue - } - const { children, ...attrs } = script - routeScripts.push({ - tag: 'script', - attrs: { ...attrs, ...routeScriptAttrs, nonce }, - children, - }) - } - } - if (manifest) { - for (const match of assetMatches) { - for (const asset of manifest.routes[match.routeId]?.scripts ?? []) { - manifestScripts.push({ - tag: 'script', - attrs: { ...asset.attrs, nonce }, - children: asset.children, - }) - } - } - } - return [routeScripts, manifestScripts] -} -export function composeSsrBodyScripts( - [routeScripts, manifestScripts]: SsrBodyScriptParts, - initialHydrationScripts?: InitialHydrationScriptTags, -): Array { - if (!initialHydrationScripts) { - return [...routeScripts, ...manifestScripts] - } - return [ - ...initialHydrationScripts.before, - ...routeScripts, - ...manifestScripts, - initialHydrationScripts.boundary, - ] -} diff --git a/packages/router-core/src/ssr/client.ts b/packages/router-core/src/ssr/client.ts index dc769e7495..79ed2f1e8a 100644 --- a/packages/router-core/src/ssr/client.ts +++ b/packages/router-core/src/ssr/client.ts @@ -4,11 +4,3 @@ export type { JsonResponse } from './json' export { hydrate } from './ssr-client' export * from './ssr-client' export type { TsrSsrGlobal, DehydratedMatch, DehydratedRouter } from './types' -export { - createDefaultSerovalPlugins, - defaultSerovalPlugins, - defaultSerovalDeserializerPlugins, -} from './serializer/seroval-plugins' -export { makeSerovalPlugin } from './serializer/makeSerovalPlugin' -export type { AnySerializationAdapter } from './serializer/transformer' -export { createRawStreamDeserializePlugin } from './serializer/RawStreamRPCPlugin' diff --git a/packages/router-core/src/ssr/constants.ts b/packages/router-core/src/ssr/constants.ts index 8ce3dcfa0d..59d6c16100 100644 --- a/packages/router-core/src/ssr/constants.ts +++ b/packages/router-core/src/ssr/constants.ts @@ -1,2 +1,3 @@ export const GLOBAL_TSR = '$_TSR' export declare const GLOBAL_SEROVAL: '$R' +export const TSR_SCRIPT_BARRIER_ID = '$tsr-stream-barrier' diff --git a/packages/router-core/src/ssr/createRequestHandler.ts b/packages/router-core/src/ssr/createRequestHandler.ts index 21e48ca242..a945effd01 100644 --- a/packages/router-core/src/ssr/createRequestHandler.ts +++ b/packages/router-core/src/ssr/createRequestHandler.ts @@ -1,6 +1,5 @@ -import { createServerHistory } from '@tanstack/history' +import { createMemoryHistory } from '@tanstack/history' import { _getRenderedMatches } from '../load-client' -import { waitForReason as waitForRequest } from '../await-signal' import { mergeHeaders } from './headers' import { attachRouterServerSsrUtils, @@ -9,8 +8,7 @@ import { } from './ssr-server' import { bindSsrResponseToRequest, - disposeSsrResponse, - isSsrResponse, + disposeSsrResponseDetached, } from './handlerCallback' import type { HandlerCallback } from './handlerCallback' import type { AnyHeaders } from './headers' @@ -21,14 +19,77 @@ export type RequestHandler = ( cb: HandlerCallback, ) => Promise -export { waitForRequest } +type RequestWaiter = ((reason: unknown) => void) | undefined -function createLateResponseDisposer(signal: AbortSignal) { - return (result: unknown) => { - if (result instanceof Response || isSsrResponse(result)) { - disposeSsrResponse(result, signal.reason) - } +const requestWaiters = new WeakMap>() + +function removeRequestWaiter( + waiters: Array, + index: number, + reject: (reason: unknown) => void, +) { + if (waiters[index] !== reject) { + return } + if (index !== waiters.length - 1) { + waiters[index] = undefined + return + } + + waiters.pop() + while (waiters.length && waiters[waiters.length - 1] === undefined) { + waiters.pop() + } +} + +export function waitForRequest( + value: T | PromiseLike, + signal: AbortSignal, + onLate?: (value: T) => void, +): Promise { + const promise = Promise.resolve(value) + if (signal.aborted) { + void promise.then(onLate, () => {}) + return Promise.reject(signal.reason) + } + + return new Promise((resolve, reject) => { + let waiters = requestWaiters.get(signal) + let index: number + if (waiters) { + index = waiters.push(reject) - 1 + } else { + const newWaiters: Array = [reject] + waiters = newWaiters + index = 0 + requestWaiters.set(signal, newWaiters) + signal.addEventListener( + 'abort', + () => { + requestWaiters.delete(signal) + for (const rejectWaiter of newWaiters) { + rejectWaiter?.(signal.reason) + } + newWaiters.length = 0 + }, + { once: true }, + ) + } + void promise.then( + (result) => { + removeRequestWaiter(waiters, index, reject) + if (signal.aborted) { + onLate?.(result) + } else { + resolve(result) + } + }, + (error) => { + removeRequestWaiter(waiters, index, reject) + reject(error) + }, + ) + }) } export function createRequestHandler({ @@ -41,19 +102,14 @@ export function createRequestHandler({ getRouterManifest?: () => ServerManifest | Promise }): RequestHandler { return async (cb) => { - const signal = request.signal - signal.throwIfAborted() - const manifest = getRouterManifest - ? await waitForRequest(getRouterManifest(), signal) - : undefined - signal.throwIfAborted() + request.signal.throwIfAborted() const router = createRouter() let responseOwnsCleanup = false try { attachRouterServerSsrUtils({ router, - manifest, + manifest: await waitForRequest(getRouterManifest?.(), request.signal), }) // normalizing and sanitizing the pathname here for server, so we always deal with the same format during SSR. @@ -62,7 +118,9 @@ export function createRequestHandler({ const href = url.href.replace(url.origin, '') // Create a history for the router - const history = createServerHistory(href) + const history = createMemoryHistory({ + initialEntries: [href], + }) // Update the router with the history and context router.update({ @@ -71,37 +129,40 @@ export function createRequestHandler({ }) await router.load({ - _signal: signal, - _skipLocationUpdate: true, + _signal: request.signal, }) - signal.throwIfAborted() + request.signal.throwIfAborted() const result = router._serverResult if (result?.type === 'redirect') { return result.redirect } - await router.serverSsr?.dehydrate({ signal }) - signal.throwIfAborted() + await waitForRequest(router.serverSsr?.dehydrate(), request.signal) + request.signal.throwIfAborted() const responseHeaders = getRequestHeaders({ router, }) - signal.throwIfAborted() - const disposeLate = createLateResponseDisposer(signal) + request.signal.throwIfAborted() const response = await waitForRequest( cb({ request, router, responseHeaders, }), - signal, - disposeLate, - disposeLate, + request.signal, + (late) => { + disposeSsrResponseDetached(late, request.signal.reason) + }, ) - const ssrResponse = bindSsrResponseToRequest(router, response, signal) - signal.throwIfAborted() + const ssrResponse = bindSsrResponseToRequest( + router, + response, + request.signal, + ) + request.signal.throwIfAborted() responseOwnsCleanup = ssrResponse.serverSsrCleanup === 'stream' return ssrResponse.response } finally { diff --git a/packages/router-core/src/ssr/handlerCallback.ts b/packages/router-core/src/ssr/handlerCallback.ts index 45f3255c5b..368c8a2a61 100644 --- a/packages/router-core/src/ssr/handlerCallback.ts +++ b/packages/router-core/src/ssr/handlerCallback.ts @@ -8,91 +8,89 @@ export type SsrResponse = | { response: Response serverSsrCleanup: 'stream' - dispose: (reason?: unknown) => undefined + dispose: (reason?: unknown) => Promise } 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 ( - value.serverSsrCleanup === 'stream' && - 'dispose' in value && - typeof value.dispose === 'function' + typeof value === 'object' && + value !== null && + 'response' in value && + 'serverSsrCleanup' in value ) } export function normalizeSsrResponse( result: HandlerCallbackResult, ): SsrResponse { - 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 { - const body = response.body - if (!body) { - return - } - void body.cancel(reason).catch(console.error) + return isSsrResponse(result) + ? result + : { response: result, serverSsrCleanup: 'none' } } export function disposeSsrResponse( - result: HandlerCallbackResult, + response: SsrResponse, reason?: unknown, -): undefined { - const response = normalizeSsrResponse(result) - if (response.serverSsrCleanup === 'stream') { - response.dispose(reason) - } else { - cancelResponseBody(response.response, reason) +): Promise { + if (response.serverSsrCleanup !== 'stream') { + return Promise.resolve() + } + try { + return Promise.resolve(response.dispose(reason)) + } catch (error) { + return Promise.reject(error) } } -/** The HTTP status that Router's server load selected for this render. */ -export function getSsrStatus(router: AnyRouter) { - return router._serverResult?.type === 'render' - ? router._serverResult.status - : 200 +export function disposeSsrResponseDetached( + result: HandlerCallbackResult, + reason?: unknown, + onError: (error: unknown) => void = console.error, +): void { + const ssrResponse = normalizeSsrResponse(result) + if (ssrResponse.serverSsrCleanup === 'stream') { + void disposeSsrResponse(ssrResponse, reason).catch(onError) + return + } + + if (ssrResponse.response.body) { + try { + void ssrResponse.response.body.cancel(reason).catch(onError) + } catch (error) { + onError(error) + } + } } -export function createSsrStreamResponse( - router: AnyRouter, +export function createSsrStreamResponse( + router: TRouter, response: Response, -): Extract { - const body = response.body - if (!body) { +): SsrResponse { + if (!response.body) { throw new Error('Invariant failed: SSR stream response requires a body') } + let disposed = false return { response, serverSsrCleanup: 'stream', - dispose(reason?: unknown): undefined { + async dispose(reason?: unknown) { + if (disposed) { + return + } + disposed = true + // Sever router ownership before asking user/renderer stream machinery to // cancel. A custom stream is allowed to ignore cancellation forever. router.serverSsr?.cleanup() - void body.cancel(reason).catch(() => {}) + try { + await response.body!.cancel(reason) + } catch { + // Cleanup above already released router SSR state. + } }, } } @@ -105,57 +103,46 @@ export function bindSsrResponseToRequest( const ssrResponse = normalizeSsrResponse(result) if (ssrResponse.serverSsrCleanup !== 'stream') { if (signal.aborted) { - disposeSsrResponse(result, signal.reason) + disposeSsrResponseDetached(result, signal.reason) } return ssrResponse } + const failed = (error: unknown) => { + router?.serverSsr?.cleanup() + console.error(error) + } const abort = () => { - disposeSsrResponse(ssrResponse, signal.reason) + disposeSsrResponseDetached(ssrResponse, signal.reason, failed) } if (signal.aborted) { abort() return ssrResponse } - const serverSsr = router?.serverSsr - if (serverSsr?.hydrationScripts.requestSignal === signal) { - // The transform already observes this request. Its cleanup must also - // dispose the final response, including any middleware-owned body. - serverSsr.onCleanup(() => { - if (signal.aborted) { - abort() - } - }) - return ssrResponse - } - signal.addEventListener('abort', abort, { once: true }) - if (!serverSsr) { - return ssrResponse - } - - serverSsr.onCleanup(() => { + router?.serverSsr?.onCleanup(() => { signal.removeEventListener('abort', abort) }) return ssrResponse } -export function replaceSsrResponse( +export async function replaceSsrResponse( result: HandlerCallbackResult, response: Response, reason?: unknown, -): Extract { - disposeSsrResponse(result, reason) +): Promise { + const ssrResponse = normalizeSsrResponse(result) + await disposeSsrResponse(ssrResponse, reason) return { response, serverSsrCleanup: 'none' } } -export function stripSsrResponseBody( +export async function stripSsrResponseBody( result: HandlerCallbackResult, reason?: unknown, -): Extract { +): Promise { const ssrResponse = normalizeSsrResponse(result) - disposeSsrResponse(ssrResponse, reason) + await disposeSsrResponse(ssrResponse, reason) return { response: new Response(null, ssrResponse.response), serverSsrCleanup: 'none', diff --git a/packages/router-core/src/ssr/htmlBoundaryScanner.ts b/packages/router-core/src/ssr/htmlBoundaryScanner.ts deleted file mode 100644 index 4a46f7c55f..0000000000 --- a/packages/router-core/src/ssr/htmlBoundaryScanner.ts +++ /dev/null @@ -1,138 +0,0 @@ -const textEncoder = new TextEncoder() - -const DOCUMENT_CLOSE = '' -export const SCRIPT_CLOSE = '' -export const DOCUMENT_CLOSE_ANCHOR_INDEX = DOCUMENT_CLOSE.indexOf('y') -export const SCRIPT_CLOSE_ANCHOR_INDEX = SCRIPT_CLOSE.indexOf('p') - -export const DOCUMENT_CLOSE_BYTES = textEncoder.encode(DOCUMENT_CLOSE) -export const SCRIPT_CLOSE_BYTES = textEncoder.encode(SCRIPT_CLOSE) - -export function encodeIntoBoundedChunk( - source: string, - sourceOffset: number, - output: Uint8Array, - outputOffset = 0, -) { - // encodeInto() stops before a code point that does not fit, so it never - // splits a surrogate pair across chunks. - return textEncoder.encodeInto( - sourceOffset === 0 ? source : source.slice(sourceOffset), - outputOffset === 0 ? output : output.subarray(outputOffset), - ) -} - -/** - * State for matching a fixed ASCII sequence across input chunks. - * - * The pattern must be non-empty, its first byte must be unique, and the anchor - * index must point inside the pattern. - */ -export type ByteMatcherState = { - readonly pattern: Uint8Array - readonly anchorIndex: number - matched: number -} - -/** Advance matcher state and return the local offset after a complete match. */ -export function advanceByteMatcher( - matcher: ByteMatcherState, - value: Uint8Array, - startIndex = 0, - findLast = false, -) { - const { pattern, anchorIndex } = matcher - let matched = matcher.matched - let lastMatchEnd: number | undefined - let index = startIndex - while (index < value.length) { - if (matched === 0) { - if (anchorIndex > 0 && index < value.length - anchorIndex) { - const anchor = value.indexOf(pattern[anchorIndex]!, index + anchorIndex) - if (anchor < 0) { - index = value.length - anchorIndex - continue - } - index = anchor - anchorIndex - } else { - index = value.indexOf(pattern[0]!, index) - if (index < 0) { - matcher.matched = matched - return lastMatchEnd - } - } - } - - const byte = value[index]! - if (byte === pattern[matched]) { - matched++ - } else { - matched = byte === pattern[0] ? 1 : 0 - } - index++ - - if (matched === pattern.length) { - matched = 0 - if (!findLast) { - matcher.matched = matched - return index - } - lastMatchEnd = index - } - } - matcher.matched = matched - return lastMatchEnd -} - -/** Find a complete fixed sequence that is contained in one byte chunk. */ -export function findExactBytes( - value: Uint8Array, - pattern: Uint8Array, - startIndex = 0, - anchorIndex = 0, -) { - let anchor = value.indexOf(pattern[anchorIndex]!, startIndex + anchorIndex) - while (anchor >= 0) { - const candidate = anchor - anchorIndex - if (candidate + pattern.length > value.length) { - return -1 - } - let patternIndex = 0 - while ( - patternIndex < pattern.length && - value[candidate + patternIndex] === pattern[patternIndex] - ) { - patternIndex++ - } - if (patternIndex === pattern.length) { - return candidate - } - anchor = value.indexOf(pattern[anchorIndex]!, anchor + 1) - } - return -1 -} - -/** - * Find the longest suffix that can become the fixed sequence in the next - * chunk. The returned index starts that suffix. - */ -export function getExactBytesPrefixAtEnd( - value: Uint8Array, - pattern: Uint8Array, - startIndex = 0, -) { - candidate: for ( - let length = Math.min(pattern.length - 1, value.length - startIndex); - length > 0; - length-- - ) { - const candidateStart = value.length - length - for (let index = 0; index < length; index++) { - if (value[candidateStart + index] !== pattern[index]) { - continue candidate - } - } - return candidateStart - } - return undefined -} diff --git a/packages/router-core/src/ssr/hydrationScripts.ts b/packages/router-core/src/ssr/hydrationScripts.ts deleted file mode 100644 index 79222e5d73..0000000000 --- a/packages/router-core/src/ssr/hydrationScripts.ts +++ /dev/null @@ -1,689 +0,0 @@ -/* eslint-disable @typescript-eslint/triple-slash-reference */ -/// - -import { getCrossReferenceHeader } from 'seroval' -import { invariant } from '../invariant' -import minifiedTsrBootStrapScript from './tsrScript?script-string' -import { GLOBAL_TSR } from './constants' -import { encodeIntoBoundedChunk } from './htmlBoundaryScanner' -import type { RouterManagedTag } from '../manifest' - -export const SSR_SERIALIZATION_SCOPE_ID = 'tsr' -const HYDRATION_SCRIPT_BOUNDARY_TAIL = ';/*$tsr-stream-boundary*/' - -const encoder = new TextEncoder() -const SOURCE_SEPARATOR = ';' -const MAX_INITIAL_SOURCE_CODE_UNITS = 16 * 1024 -const MAX_BACKLOG_CODE_UNITS = 16 * 1024 * 1024 -const MAX_BACKLOG_SOURCES = 4_096 -const MIN_OUTPUT_BYTES = 256 -const MAX_DIRECT_CODE_UNITS = 16 * 1024 -export const MAX_HYDRATION_OUTPUT_CHUNK_BYTES = 64 * 1024 -const MAX_DYNAMIC_RECORD_CODE_UNITS = MAX_HYDRATION_OUTPUT_CHUNK_BYTES - -const STREAM_PART_ATTRIBUTE = 'data-tsr-stream-part' -const INITIAL_CLEANUP_SOURCE = `{let s=document.currentScript,p;while((p=s.previousElementSibling)&&p.hasAttribute('${STREAM_PART_ATTRIBUTE}'))p.remove();s.remove()}` -const INITIAL_CLEANUP_SUFFIX = SOURCE_SEPARATOR + INITIAL_CLEANUP_SOURCE -const DYNAMIC_CLOSE_SOURCE = 'document.currentScript.remove()' -const HYDRATION_SCRIPT_BOUNDARY_SOURCE = - `document.currentScript.remove()` + HYDRATION_SCRIPT_BOUNDARY_TAIL -const HYDRATION_SCRIPT_BOUNDARY_SUFFIX = - HYDRATION_SCRIPT_BOUNDARY_TAIL + '' -export const HYDRATION_SCRIPT_BOUNDARY_ANCHOR_INDEX = - HYDRATION_SCRIPT_BOUNDARY_SUFFIX.lastIndexOf('*') -export const HYDRATION_SCRIPT_BOUNDARY_BYTES = encoder.encode( - HYDRATION_SCRIPT_BOUNDARY_SUFFIX, -) - -const ROUTER_PREFIX = GLOBAL_TSR + '.router=' -const PROMISE_PREFIX = GLOBAL_TSR + '.p(()=>' -const DEFAULT_INITIAL_SOURCES = [ - getCrossReferenceHeader(SSR_SERIALIZATION_SCOPE_ID), - minifiedTsrBootStrapScript, -] - -export const HydrationScriptOutputState = { - Waiting: 0, - Ready: 1, - Active: 2, - Done: 3, - Failed: 4, -} as const - -export type HydrationScriptOutputState = - (typeof HydrationScriptOutputState)[keyof typeof HydrationScriptOutputState] - -/** A request-local, single-consumer stream of complete records. */ -export type HydrationScriptOutput = { - readonly state: HydrationScriptOutputState - readonly error: unknown - pullChunk: () => Uint8Array - subscribe: (onChange: () => void) => () => void -} - -type ConsumerOwnership = - | HydrationScriptOutput - | 'fast-path' - | 'cleaned' - | undefined - -/** The one-time initial `` take: hydration tags plus the boundary. */ -export type InitialHydrationScriptTags = { - before: Array - boundary: RouterManagedTag -} - -function escapeAttribute(value: string) { - return value.replace(/[&"'<>]/g, (char) => `&#${char.charCodeAt(0)};`) -} - -function createInitialTags( - sources: ReadonlyArray, - nonce: string | undefined, -): InitialHydrationScriptTags { - const before: Array = [] - for (const source of sources) { - if (!source) { - continue - } - const previous = before[before.length - 1] - if ( - previous?.children && - previous.children.length + SOURCE_SEPARATOR.length + source.length <= - MAX_INITIAL_SOURCE_CODE_UNITS - ) { - previous.children += SOURCE_SEPARATOR + source - } else { - before.push({ - tag: 'script', - attrs: { nonce, [STREAM_PART_ATTRIBUTE]: '' }, - children: source, - }) - } - } - // Cleanup runs before route and asset scripts. If hydration code fails, its - // transport tags can remain because that page cannot hydrate successfully. - const lastHydrationTag = before[before.length - 1] - if (lastHydrationTag) { - const lastSource = lastHydrationTag.children! - if ( - lastSource.length + INITIAL_CLEANUP_SUFFIX.length <= - MAX_INITIAL_SOURCE_CODE_UNITS - ) { - lastHydrationTag.children = lastSource + INITIAL_CLEANUP_SUFFIX - } else { - // Do not concatenate onto a large source. A renderer could flatten the - // result and temporarily retain a second copy of the hydration payload. - before.push({ - tag: 'script', - attrs: { nonce, [STREAM_PART_ATTRIBUTE]: '' }, - children: INITIAL_CLEANUP_SOURCE, - }) - } - } - return { - before, - boundary: { - tag: 'script', - attrs: { nonce }, - children: HYDRATION_SCRIPT_BOUNDARY_SOURCE, - } satisfies RouterManagedTag, - } -} - -type HydrationScripts = { - pushSerializedSource: ( - data: string, - initial: boolean, - wrap: boolean, - ) => boolean - pushSource: (nextSource: string) => boolean - fail: (reason: unknown) => void - finish: () => void - takeInitialHydrationScriptTags: () => InitialHydrationScriptTags | undefined - disableHydration: () => void - isInitialTaken: () => boolean - skipInitialTake: () => void - liftBarrier: () => void - claimOutput: () => HydrationScriptOutput - reserveFastPath: (output?: HydrationScriptOutput) => boolean - startSerializationTimeout: (timeoutMs: number) => void - cleanup: () => void -} - -class HydrationScriptsOwner implements HydrationScriptOutput { - private queuedSources: Array = [] - private queuedSourceHead = 0 - private initialTaken = false - private barrierLifted = false - private producerDone = false - private consumer: ConsumerOwnership - private listener: (() => void) | undefined - - private active: Array | undefined - private retainedSources = 0 - private regularCodeUnits = 0 - private hasOversizedSource = false - - private segmentIndex = 0 - private closingSegmentIndex = 0 - private source = '' - private sourceOffset = 0 - private outputCapacity = MIN_OUTPUT_BYTES - - private outputState: HydrationScriptOutputState = - HydrationScriptOutputState.Waiting - private outputError: unknown - private timeout: ReturnType | undefined - private opening: string | undefined - - constructor( - private readonly nonce: string | undefined, - initialSources?: ReadonlyArray, - ) { - // ServerSsr exposes this method as a bare callback, so keep this single - // method bound while all other owner operations live on the prototype. - this.takeInitialHydrationScriptTags = - this.takeInitialHydrationScriptTags.bind(this) - - const seedSources = initialSources ?? DEFAULT_INITIAL_SOURCES - for (const seedSource of seedSources) { - if (!this.account(seedSource)) { - break - } - this.queuedSources.push(seedSource) - } - } - - get state() { - return this.outputState - } - - get error() { - return this.outputError - } - - private notify() { - try { - this.listener?.() - } catch (listenerError) { - console.error('Hydration script output listener error:', listenerError) - } - } - - private refresh(notifyChange = true) { - const next = - this.outputState === HydrationScriptOutputState.Failed - ? HydrationScriptOutputState.Failed - : this.active - ? HydrationScriptOutputState.Active - : typeof this.consumer === 'object' && - this.initialTaken && - this.barrierLifted && - !this.queueIsEmpty() - ? HydrationScriptOutputState.Ready - : this.producerDone && this.initialTaken && this.queueIsEmpty() - ? HydrationScriptOutputState.Done - : HydrationScriptOutputState.Waiting - if (this.outputState !== next) { - this.outputState = next - if (notifyChange) { - this.notify() - } - } - } - - private clearTimeoutIfSet() { - if (this.timeout !== undefined) { - clearTimeout(this.timeout) - this.timeout = undefined - } - } - - private queueIsEmpty() { - return this.queuedSourceHead === this.queuedSources.length - } - - private clearQueue() { - this.queuedSources = [] - this.queuedSourceHead = 0 - } - - private dropBufferedOutput() { - this.clearQueue() - this.active = undefined - this.retainedSources = 0 - this.regularCodeUnits = 0 - this.hasOversizedSource = false - this.segmentIndex = 0 - this.closingSegmentIndex = 0 - this.source = '' - this.sourceOffset = 0 - this.outputCapacity = MIN_OUTPUT_BYTES - this.opening = undefined - } - - fail(reason: unknown) { - if ( - this.consumer === 'cleaned' || - this.outputState === HydrationScriptOutputState.Failed - ) { - return - } - this.outputError = reason - this.clearTimeoutIfSet() - this.dropBufferedOutput() - this.outputState = HydrationScriptOutputState.Failed - this.notify() - } - - private rejectBacklog(kind: 'source-part' | 'code-unit') { - this.fail(new Error(`SSR hydration backlog exceeded maximum ${kind} count`)) - return false - } - - private account(nextSource: string) { - if (this.retainedSources === MAX_BACKLOG_SOURCES) { - return this.rejectBacklog('source-part') - } - if (nextSource.length > MAX_BACKLOG_CODE_UNITS) { - if (this.hasOversizedSource) { - return this.rejectBacklog('code-unit') - } - this.hasOversizedSource = true - } else if ( - this.regularCodeUnits + nextSource.length > - MAX_BACKLOG_CODE_UNITS - ) { - return this.rejectBacklog('code-unit') - } else { - this.regularCodeUnits += nextSource.length - } - this.retainedSources++ - return true - } - - private releaseSource(part: string) { - this.retainedSources-- - if (part.length > MAX_BACKLOG_CODE_UNITS) { - this.hasOversizedSource = false - } else { - this.regularCodeUnits -= part.length - } - } - - private releaseAccounting(batch: ReadonlyArray) { - for (const part of batch) { - if (part !== undefined) { - this.releaseSource(part) - } - } - } - - liftBarrier() { - if (this.consumer !== 'cleaned' && !this.barrierLifted) { - this.barrierLifted = true - this.refresh() - } - } - - private producerCanWrite() { - return ( - this.consumer !== 'cleaned' && - this.outputState !== HydrationScriptOutputState.Failed && - !this.producerDone - ) - } - - pushSource(nextSource: string) { - if (!this.producerCanWrite()) { - return false - } - if (this.account(nextSource)) { - this.queuedSources.push(nextSource) - if (this.initialTaken) { - this.refresh() - } - } else { - return false - } - // A notification can synchronously fail or clean up this owner. - return this.producerCanWrite() - } - - private takeQueuedBatch(batchLength: number) { - if ( - this.queuedSourceHead === 0 && - batchLength === this.queuedSources.length - ) { - const batch = this.queuedSources - this.clearQueue() - return batch - } - const end = this.queuedSourceHead + batchLength - const batch = this.queuedSources.slice(this.queuedSourceHead, end) - for (let index = this.queuedSourceHead; index < end; index++) { - this.queuedSources[index] = undefined - } - this.queuedSourceHead = end - if (this.queueIsEmpty()) { - this.clearQueue() - } else if ( - this.queuedSourceHead >= 1024 && - this.queuedSourceHead >= this.queuedSources.length - this.queuedSourceHead - ) { - this.queuedSources = this.queuedSources.slice(this.queuedSourceHead) - this.queuedSourceHead = 0 - } - return batch - } - - private release(batch: Array) { - this.releaseAccounting(batch) - this.active = undefined - this.source = '' - this.sourceOffset = 0 - this.refresh(false) - } - - private advanceSource() { - const batch = this.active! - if (this.segmentIndex > 0 && this.segmentIndex < this.closingSegmentIndex) { - const partIndex = (this.segmentIndex - 1) >> 1 - if (this.segmentIndex % 2 === 1) { - const part = batch[partIndex] - if (part !== undefined) { - this.releaseSource(part) - batch[partIndex] = undefined - } - } - } - this.segmentIndex++ - // Segment 0 is the opening tag. Sources and separators alternate until - // the closing segment. The next advance releases the complete record. - if (this.segmentIndex < this.closingSegmentIndex) { - const partIndex = (this.segmentIndex - 1) >> 1 - this.source = - this.segmentIndex % 2 === 1 ? batch[partIndex]! : SOURCE_SEPARATOR - } else if (this.segmentIndex === this.closingSegmentIndex) { - this.source = DYNAMIC_CLOSE_SOURCE - } else { - this.release(batch) - } - this.sourceOffset = 0 - } - - private pullActive() { - const bytes = new Uint8Array(this.outputCapacity) - let offset = 0 - while (this.active) { - if (this.sourceOffset === this.source.length) { - this.advanceSource() - } else if (offset === bytes.length) { - break - } else { - const result = encodeIntoBoundedChunk( - this.source, - this.sourceOffset, - bytes, - offset, - ) - if (result.read === 0) { - break - } - this.sourceOffset += result.read - offset += result.written - } - } - if (offset === 0) { - throw new Error('SSR router script record produced no output') - } - if (offset === bytes.length) { - return bytes - } - // A subarray view pins the whole output buffer. Copy mostly-empty tail - // chunks (typically the final close-tag remnant) so the large buffer can - // be collected immediately. - return offset * 2 < bytes.length - ? bytes.slice(0, offset) - : bytes.subarray(0, offset) - } - - private pullReady() { - const scriptOpening = (this.opening ??= this.nonce - ? `` + serverSsr.injectHtml(html) + }, + dehydrate: async (opts?: { requestAssets?: ManifestRouteAssets }) => { + if (_dehydrated) { if (process.env.NODE_ENV !== 'production') { - throw new Error( - dehydrationPhase === 'disabled' - ? 'Invariant failed: hydration is disabled for this request!' - : 'Invariant failed: router is already dehydrated!', - ) + throw new Error('Invariant failed: router is already dehydrated!') } invariant() } - opts?.signal?.throwIfAborted() - dehydrationPhase = 'started' let matchesToDehydrate = _getRenderedMatches(router.stores.matches.get()) const isShell = router.isShell() if (isShell) { @@ -445,192 +515,210 @@ export function attachRouterServerSsrUtils({ cacheKey, ) - manifestToDehydrate = composeManifest( - manifest.scriptFormat, - preparedManifest.inlineCssHrefs - ? createInlineCssPlaceholderAsset() - : undefined, - preparedManifest.routes, - opts?.requestAssets, - ) + manifestToDehydrate = { + ...(manifest.scriptFormat + ? { scriptFormat: manifest.scriptFormat } + : {}), + ...(preparedManifest.inlineCssHrefs + ? { inlineStyle: createInlineCssPlaceholderAsset() } + : {}), + routes: preparedManifest.routes, + } + + // Merge request-scoped assets into root route (without mutating cached manifest) + const requestAssets = opts?.requestAssets + if (hasRequestAssets(requestAssets)) { + const existingRoot = manifestToDehydrate.routes[rootRouteId] + manifestToDehydrate.routes = { + ...manifestToDehydrate.routes, + [rootRouteId]: mergeRequestAssetsIntoRootRoute( + existingRoot, + requestAssets, + ), + } + } } const dehydratedRouter: DehydratedRouter = { manifest: manifestToDehydrate, matches, } - const dehydrate = router.options.dehydrate - const dehydratedData = dehydrate - ? opts?.signal - ? await waitForReason(dehydrate.call(router.options), opts.signal) - : await dehydrate.call(router.options) - : undefined - opts?.signal?.throwIfAborted() + const dehydratedData = await router.options.dehydrate?.() if (cleanupStarted) { return } - if (dehydratedData !== undefined) { + if (dehydratedData) { dehydratedRouter.dehydratedData = dehydratedData } + _dehydrated = true + const trackPlugins = { didRun: false } - const serializationAdapters = router.options.serializationAdapters + const serializationAdapters = router.options.serializationAdapters as + | Array + | undefined const plugins = serializationAdapters - ? [ - ...serializationAdapters.map((adapter) => - makeSsrSerovalPlugin(adapter, trackPlugins), - ), - ...ssrSerovalPlugins, - ] - : ssrSerovalPlugins + ? serializationAdapters + .map((t) => makeSsrSerovalPlugin(t, trackPlugins)) + .concat(defaultSerovalPlugins) + : defaultSerovalPlugins let serializationCompleteSignaled = false - let initialSerialized = false - const completeScriptSerialization = ( - result: boolean | { error: unknown }, - ) => { - if (serializationCompleteSignaled || cleanupStarted) { - return - } + const signalSerializationComplete = () => { + if (serializationCompleteSignaled || cleanupStarted) return serializationCompleteSignaled = true - const dispose = disposeSerialization - disposeSerialization = undefined - if (result === true) { - settled = true - hydrationScripts.finish() - } else if (result) { - hydrationScripts.fail(result.error) - } - if (dispose) { - // Seroval invokes completion callbacks before it marks its stream as - // inactive. Clear ownership before notifying the hydration consumer, - // which can synchronously clean up this request, then dispose later. - queueMicrotask(() => disposeSerializationSafely(dispose)) + _serializationFinished = true + + const listeners = serializationFinishedListeners.slice() + serializationFinishedListeners.length = 0 + + for (const l of listeners) { + try { + l() + } catch (err) { + console.error('Serialization listener error:', err) + } } } - let synchronousFailure: { error: unknown } | undefined - const dispose = crossSerializeStream(dehydratedRouter, { + const finishScriptSerialization = () => { + if (serializationCompleteSignaled || cleanupStarted) return + scriptBuffer.enqueue(GLOBAL_TSR + '.e()') + // Must synchronously notify injected HTML listeners before signaling + // completion; otherwise the held tail could flush ahead of the + // end script. + scriptBuffer.flush() + signalSerializationComplete() + } + + crossSerializeStream(dehydratedRouter, { refs: new Map(), plugins, onSerialize: (data, initial) => { - if (serializationCompleteSignaled || cleanupStarted) { - return - } - initialSerialized ||= initial - if ( - !hydrationScripts.pushSerializedSource( - data, - initial, - trackPlugins.didRun, - ) - ) { - // Rejected output stops the producer while deferred work may remain. - completeScriptSerialization(false) + let serialized = initial ? TSR_PREFIX + data : data + if (trackPlugins.didRun) { + serialized = P_PREFIX + serialized + P_SUFFIX } + scriptBuffer.enqueue(serialized) }, onError: (err: unknown) => { - if (serializationCompleteSignaled || cleanupStarted) { - return - } console.error('Serialization error:', err) - synchronousFailure = { error: err } - completeScriptSerialization({ error: err }) - }, - scopeId: SSR_SERIALIZATION_SCOPE_ID, - onDone: () => { - if (initialSerialized) { - completeScriptSerialization(true) + if (err && (err as any).stack) { + console.error((err as any).stack) } + finishScriptSerialization() + }, + scopeId: SCOPE_ID, + onDone: () => { + finishScriptSerialization() }, }) - // Seroval can call onDone synchronously before it returns dispose(). - if (cleanupStarted || serializationCompleteSignaled) { - disposeSerializationSafely(dispose) - } else { - disposeSerialization = dispose - } - if (synchronousFailure) { - throw synchronousFailure.error + }, + isDehydrated() { + return _dehydrated + }, + isSerializationFinished() { + return _serializationFinished + }, + reserveStreamFastPath() { + if ( + !cleanupStarted && + _serializationFinished && + !streamFastPathReserved && + renderFinishedListeners.length === 0 && + !injectedHtmlBuffer && + !scriptBuffer.hasPending() + ) { + streamFastPathReserved = true + return true } + return false + }, + onInjectedHtml: (listener) => { + if (cleanupStarted) return () => {} + injectedHtmlListeners.push(listener) + return () => removeListener(injectedHtmlListeners, listener) }, onRenderFinished: (listener) => { - if (cleanupStarted) { - return - } - if (renderFinished) { - try { - listener() - } catch (error) { - console.error('Error in render finished listener:', error) - } - return - } + if (cleanupStarted || streamFastPathReserved) return renderFinishedListeners.push(listener) }, - onCleanup: (listener) => { - if (cleanupStarted) { - // Cleanup already happened (or is running). Invoke immediately so - // late registrants can still release their resources instead of - // silently retaining them (standard disposer convention). + onSerializationFinished: (listener) => { + if (cleanupStarted) return () => {} + if (_serializationFinished && !cleanupStarted) { try { - listener(settled) - } catch (error) { - console.error('Error in SSR cleanup listener:', error) + listener() + } catch (err) { + console.error('Serialization listener error:', err) } - return + return () => {} } + serializationFinishedListeners.push(listener) + return () => removeListener(serializationFinishedListeners, listener) + }, + onCleanup: (listener) => { + if (cleanupStarted) return cleanupListeners.push(listener) }, setRenderFinished: () => { - if (cleanupStarted || renderFinished) { - return - } - renderFinished = true - hydrationScripts.liftBarrier() - notifyAndClearListeners( - renderFinishedListeners, - 'Error in render finished listener:', - undefined, - ) - }, - disableHydration: () => { - if (cleanupStarted || dehydrationPhase === 'disabled') { - return - } - if (dehydrationPhase !== 'idle') { - if (process.env.NODE_ENV !== 'production') { - throw new Error( - 'Invariant failed: cannot disable hydration after dehydrate()!', - ) + if (cleanupStarted) return + scriptBuffer.liftBarrier() + const listeners = renderFinishedListeners.slice() + renderFinishedListeners.length = 0 + for (const l of listeners) { + try { + l() + } catch (err) { + console.error('Error in render finished listener:', err) } - - invariant() } - // The owner rejects later takes/claims; guard order matters so a - // throwing owner does not leave the phase half-set. - hydrationScripts.disableHydration() - dehydrationPhase = 'disabled' + if (_serializationFinished) { + scriptBuffer.flush() + } + }, + takeBufferedScripts() { + const scripts = scriptBuffer.takeAll() + if (!scripts) return undefined + const serverBufferedScript: RouterManagedTag = { + tag: 'script', + attrs: { + nonce: router.options.ssr?.nonce, + className: '$tsr', + id: TSR_SCRIPT_BARRIER_ID, + }, + children: scripts, + } + return serverBufferedScript + }, + liftScriptBarrier() { + scriptBuffer.liftBarrier() + }, + takeBufferedHtml() { + if (!injectedHtmlBuffer) { + return undefined + } + const buffered = injectedHtmlBuffer + injectedHtmlBuffer = '' + return buffered }, - takeInitialHydrationScriptTags: - hydrationScripts.takeInitialHydrationScriptTags, cleanup() { // Guard against multiple/reentrant cleanup calls. A listener could call // cleanup() again indirectly; snapshot + clear before invoking so each // listener runs exactly once and reentry is a no-op. - if (cleanupStarted) { - return - } + if (cleanupStarted) return cleanupStarted = true - hydrationScripts.cleanup() - const dispose = disposeSerialization - disposeSerialization = undefined - disposeSerializationSafely(dispose) - notifyAndClearListeners( - cleanupListeners, - 'Error in SSR cleanup listener:', - settled, - ) + const listeners = cleanupListeners.slice() + cleanupListeners.length = 0 + for (const l of listeners) { + try { + l() + } catch (err) { + console.error('Error in SSR cleanup listener:', err) + } + } renderFinishedListeners.length = 0 - router.ssr = undefined + injectedHtmlListeners.length = 0 + serializationFinishedListeners.length = 0 + injectedHtmlBuffer = '' + scriptBuffer.cleanup() router.serverSsr = undefined }, } @@ -673,10 +761,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) { - // 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 + // ensure backslashes are encoded correctly in the URL + if (typeof url === 'string') url = url.replace('\\', '%5C') + + const rawUrl = new URL(url, base) // 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/src/ssr/transformStreamWithRouter.ts b/packages/router-core/src/ssr/transformStreamWithRouter.ts index d253034073..03c6ecf2e1 100644 --- a/packages/router-core/src/ssr/transformStreamWithRouter.ts +++ b/packages/router-core/src/ssr/transformStreamWithRouter.ts @@ -1,53 +1,32 @@ +import { ReadableStream } from 'node:stream/web' import { Readable } from 'node:stream' -import { - DOCUMENT_CLOSE_ANCHOR_INDEX, - DOCUMENT_CLOSE_BYTES, - SCRIPT_CLOSE_ANCHOR_INDEX, - SCRIPT_CLOSE_BYTES, - advanceByteMatcher, - encodeIntoBoundedChunk, - findExactBytes, - getExactBytesPrefixAtEnd, -} from './htmlBoundaryScanner' -import { - HYDRATION_SCRIPT_BOUNDARY_ANCHOR_INDEX, - HYDRATION_SCRIPT_BOUNDARY_BYTES, - HydrationScriptOutputState, -} from './hydrationScripts' -import type { ReadableStream as NodeReadableStream } from 'node:stream/web' +import { TSR_SCRIPT_BARRIER_ID } from './constants' import type { AnyRouter } from '../router' -import type { ByteMatcherState } from './htmlBoundaryScanner' -import type { HydrationScriptOutput } from './hydrationScripts' export type TransformStreamWithRouterOptions = { + /** The request lifetime that owns this response stream. */ + signal?: AbortSignal /** Timeout for serialization to complete after app render finishes (default: 60000ms) */ timeoutMs?: number - /** Maximum lifetime of the stream transform. Defaults to twice timeoutMs. */ + /** Maximum lifetime of the stream transform (default: 120000ms). Safety net for cleanup. */ lifetimeMs?: number - /** Cancels the transform and releases SSR state when the request ends. */ - signal?: AbortSignal - /** - * Additional point after which the renderer guarantees that a router script - * can be inserted. This is an adapter contract, not a user streaming policy. - * The router boundary, canonical document close, and EOF are always safe. - */ - rendererSafePoint?: 'script-close' | 'record-end' /** * Called exactly once when the stream is torn down due to abort/error/ * cancel/timeout — NOT on natural successful completion. Use this to - * abort a hidden producer upstream of any stream passed to this transform. + * abort a hidden producer upstream of any PassThrough you passed in + * (e.g. React `renderToPipeableStream`'s `abort()`). * Errors thrown from this callback are swallowed. */ onAbort?: (reason?: unknown) => void } -type AppStreamValue = Uint8Array | string -/** Renderer output: UTF-8 bytes, or string records from a Node pipeable. */ -type AppStream = - | ReadableStream - | ReadableStream - | ReadableStream - | NodeReadableStream +export function transformReadableStreamWithRouter( + router: AnyRouter, + routerStream: ReadableStream, + opts?: TransformStreamWithRouterOptions, +) { + return transformStreamWithRouter(router, routerStream, opts) +} export function transformPipeableStreamWithRouter( router: AnyRouter, @@ -55,913 +34,880 @@ export function transformPipeableStreamWithRouter( opts?: TransformStreamWithRouterOptions, ) { return Readable.fromWeb( - transformReadableStreamWithRouter( - router, - Readable.toWeb(routerStream) as AppStream, - opts, - ) as NodeReadableStream, + transformStreamWithRouter(router, Readable.toWeb(routerStream), opts), ) } -export async function transformHtmlStringWithRouter( - router: AnyRouter, - html: string, - opts?: TransformStreamWithRouterOptions, -) { - const serverSsr = router.serverSsr - if (!serverSsr) { - throw new Error('Invariant failed: router.serverSsr is required') - } - const hydrationScripts = serverSsr.hydrationScripts - if (hydrationScripts.reserveFastPath()) { - try { - opts?.signal?.throwIfAborted() - serverSsr.setRenderFinished() - return '' + html - } catch (error) { - try { - opts?.onAbort?.(error) - } catch { - // User cleanup must not block SSR cleanup. - } - throw error - } finally { - serverSsr.cleanup() - } - } +// Minimum length of a valid closing tag:
= 4 characters +const MIN_CLOSING_TAG_LENGTH = 4 - // The merge path chunks string records itself. - const appStream = new ReadableStream({ - start(controller) { - controller.enqueue('') - controller.enqueue(html) - controller.close() - }, - }) - const output = transformReadableStreamWithRouter(router, appStream, opts) - return readUtf8Stream(output) -} +// Default timeout values (in milliseconds) +const DEFAULT_SERIALIZATION_TIMEOUT_MS = 60000 +const DEFAULT_LIFETIME_TIMEOUT_MS = DEFAULT_SERIALIZATION_TIMEOUT_MS * 2 +const MAX_LEFTOVER_CHARS = 2048 +const MAX_TAIL_CHARS = 64 * 1024 +const MAX_ROUTER_HTML_CHARS = 16 * 1024 * 1024 +const MAX_PENDING_WRITE_CHARS = 16 * 1024 * 1024 -async function readUtf8Stream(stream: ReadableStream) { - const reader = stream.getReader() - const decoder = new TextDecoder() - let text = '' - try { - for (;;) { - const { done, value } = await reader.read() - if (done) { - break - } - text += decoder.decode(value, { stream: true }) - } - return text + decoder.decode() - } finally { - reader.releaseLock() - } -} - -const DEFAULT_SERIALIZATION_TIMEOUT_MS = 60_000 -const MIN_APPLICATION_STRING_CHUNK_BYTES = 256 -const MAX_APPLICATION_STRING_CHUNK_BYTES = 64 * 1024 - -const ApplicationPhase = { - BeforeBoundary: 0, - Merge: 1, - HeldClose: 2, - PassThrough: 3, +// Merge lifecycle: body bytes can stream, router HTML must precede tail, +// terminal states own close/error/cleanup exactly once. +const MergeState = { + ReadingBody: 0, + HoldingTail: 1, + AppDone: 2, + Draining: 3, + Done: 4, } as const -type ApplicationPhase = (typeof ApplicationPhase)[keyof typeof ApplicationPhase] -type Termination = 'complete' | 'cancel' | 'failure' -type AppStreamReader = ReadableStreamDefaultReader +type MergeState = (typeof MergeState)[keyof typeof MergeState] -function releaseReader(reader: AppStreamReader) { +// Module-level encoder (stateless, safe to reuse) +const textEncoder = new TextEncoder() + +const noop = () => {} +const resolvedPromise = Promise.resolve() + +// Returns -bodyEndIndex - 2 when is found; otherwise returns +// the position after the last valid closing tag, or -1 when none exists. +function findHtmlBoundary(str: string): number { + let lastClosingTagEnd = -1 + let searchFrom = str.length - MIN_CLOSING_TAG_LENGTH + + while (searchFrom >= 0) { + const openSlash = str.lastIndexOf('. Negative return encodes the + // body start index without allocating a result object. + if ( + (str.charCodeAt(openSlash + 2) | 32) === 98 && + (str.charCodeAt(openSlash + 3) | 32) === 111 && + (str.charCodeAt(openSlash + 4) | 32) === 100 && + (str.charCodeAt(openSlash + 5) | 32) === 121 && + str.charCodeAt(openSlash + 6) === 62 + ) { + return -openSlash - 2 + } + + if (lastClosingTagEnd === -1) { + let i = openSlash + 2 + const startCode = str.charCodeAt(i) + if ( + (startCode >= 97 && startCode <= 122) || + (startCode >= 65 && startCode <= 90) + ) { + i++ + while (i < str.length) { + const code = str.charCodeAt(i) + if ( + (code >= 97 && code <= 122) || // a-z + (code >= 65 && code <= 90) || // A-Z + (code >= 48 && code <= 57) || // 0-9 + code === 95 || // _ + code === 58 || // : + code === 46 || // . + code === 45 // - + ) { + i++ + } else { + break + } + } + + if (str.charCodeAt(i) === 62) { + lastClosingTagEnd = i + 1 + } + } + } + + searchFrom = openSlash - 1 + } + + return lastClosingTagEnd +} + +/** + * Releasing the lock can throw if a pending read is still settling or if the + * lock was already released. + */ +type ReaderOps = { + cancel: (reason?: unknown) => Promise + releaseLock: () => void +} + +function safeReleaseReader(reader: ReaderOps) { try { reader.releaseLock() + return true } catch { - // A nonstandard reader may still reject lock release. + return false } } -function cancelReader(reader: AppStreamReader, reason?: unknown) { - const cancelled = reader.cancel(reason).catch(() => {}) - // Native readers close synchronously when cancel() starts. Release the lock - // before an arbitrary underlying cancel promise has a chance to park. - releaseReader(reader) - return cancelled -} - -function finalizeSsrStream( - kind: Termination, - reason: unknown, - controller: ReadableStreamDefaultController, - reader: AppStreamReader, - serverSsr: NonNullable, - onAbort?: (reason?: unknown) => void, -) { +/** + * Cancel a reader without producing an unhandled rejection. `reader.cancel()` + * can reject (e.g. when the underlying source's cancel() throws), and + * downstream cancel() should still wait for upstream teardown when possible. + */ +function safeCancelReader(reader: ReaderOps, reason?: unknown): Promise { + let cancelPromise: Promise | undefined try { - if (kind === 'complete') { - controller.close() - } else if (kind === 'failure') { - controller.error(reason) - } + cancelPromise = reader.cancel(reason) } catch { - // The stream already reached a terminal state. + // ignore } - const aborted = kind !== 'complete' - if (aborted) { + if (!safeReleaseReader(reader) && cancelPromise) { + return cancelPromise.then(noop, noop).then(() => { + safeReleaseReader(reader) + }) + } + + return cancelPromise ? cancelPromise.then(noop, noop) : resolvedPromise +} + +function createReaderState(appStream: ReadableStream) { + const reader = appStream.getReader() + let released = false + + return { + reader, + cancel: (reason?: unknown) => { + if (released) return resolvedPromise + released = true + return safeCancelReader(reader, reason) + }, + release: () => { + if (released) return + released = true + safeReleaseReader(reader) + }, + } +} + +function createAbortNotifier(opts?: TransformStreamWithRouterOptions) { + let abortNotified = false + return (reason?: unknown) => { + if (abortNotified) return + abortNotified = true try { - onAbort?.(reason) + opts?.onAbort?.(reason) } catch { - // User cleanup must not block SSR cleanup. + // swallow user errors } } - - const readerDone = aborted - ? cancelReader(reader, reason) - : releaseReader(reader) - serverSsr.cleanup() - return readerDone } -function getLifetimeMs(opts?: TransformStreamWithRouterOptions) { - return ( - opts?.lifetimeMs ?? - (opts?.timeoutMs ?? DEFAULT_SERIALIZATION_TIMEOUT_MS) * 2 - ) -} - -// External serverSsr.cleanup() severs router ownership. The transform must -// release the renderer, timers, listeners, and buffers immediately instead of -// retaining them until the lifetime backstop fires. AbortError identifies this -// intentional cancellation to downstream consumers. -function createCleanupAbortError() { - const error = new Error('SSR stream transform aborted by router SSR cleanup') - error.name = 'AbortError' - return error -} - -function listenForAbort( +function listenToAbort( signal: AbortSignal | undefined, - onAbort: (reason: unknown) => void, + onAbort: (reason?: unknown) => void, ) { if (!signal) { - return undefined + return + } + if (signal.aborted) { + onAbort(signal.reason) + return } const listener = () => onAbort(signal.reason) signal.addEventListener('abort', listener, { once: true }) return () => signal.removeEventListener('abort', listener) } -/** - * Create a timer that does not keep the Node.js process alive when this - * last-resort stream backstop is the only remaining work. - * - * Node's global `setTimeout()` returns a `Timeout` object with `unref()`. - * Web-standard runtimes return a numeric timer ID instead. Cloudflare Workers - * retain that Web behavior for global timers even when `nodejs_compat` is - * enabled. Accessing an optional property on a numeric ID is safe, so timer - * creation can normalize the Node-only capability without allocating a - * wrapper object. The native handle is returned unchanged for `clearTimeout`. - */ -function setUnrefTimeout(callback: () => void, timeoutMs: number) { - const handle = setTimeout(callback, timeoutMs) - const portableHandle = handle as typeof handle & { unref?: () => void } - portableHandle.unref?.() - return handle -} - -/** - * Arm the shared teardown triggers of a transform stream: the lifetime - * backstop timer, the request-abort listener, and the external-cleanup - * listener. Returns a disarm function that `terminate()` calls exactly once; - * teardown ordering must stay identical between the fast and merge paths. - */ -function armStreamLifecycle( - serverSsr: NonNullable, - opts: TransformStreamWithRouterOptions | undefined, - isTerminal: () => boolean, - terminate: (kind: Termination, reason?: unknown) => unknown, -) { - const signal = opts?.signal - let lifetimeTimeoutHandle: ReturnType | undefined - let stopAbortListener: (() => void) | undefined - const disarm = () => { - stopAbortListener?.() - stopAbortListener = undefined - if (signal && serverSsr.hydrationScripts.requestSignal === signal) { - serverSsr.hydrationScripts.requestSignal = undefined - } - if (lifetimeTimeoutHandle !== undefined) { - clearTimeout(lifetimeTimeoutHandle) - lifetimeTimeoutHandle = undefined - } - } - - const lifetimeMs = getLifetimeMs(opts) - lifetimeTimeoutHandle = setUnrefTimeout(() => { - if (isTerminal()) { - return - } - const error = new Error('Stream lifetime exceeded') - console.warn( - `SSR stream transform exceeded maximum lifetime (${lifetimeMs}ms), forcing cleanup`, - ) - terminate('failure', error) - }, lifetimeMs) - stopAbortListener = listenForAbort(signal, (reason) => { - terminate('failure', reason) - }) - if (signal) { - serverSsr.hydrationScripts.requestSignal = signal - } - // External serverSsr.cleanup() must release the reader, renderer, timer, - // and buffers promptly — a parked pump only wakes through its own - // subscriptions, and a discarded response never pulls at all. - serverSsr.onCleanup(() => { - if (!isTerminal()) { - terminate('failure', createCleanupAbortError()) - } - }) - return disarm -} - -function cleanupFailedStreamCreation( - serverSsr: NonNullable, - onAbort: TransformStreamWithRouterOptions['onAbort'], - error: unknown, -) { - try { - onAbort?.(error) - } catch { - // User cleanup must not block SSR cleanup. - } - serverSsr.cleanup() -} - -function encodeStringSource(value: string, offset: number) { - const remaining = value.length - offset - const capacity = Math.min( - MAX_APPLICATION_STRING_CHUNK_BYTES, - Math.max( - MIN_APPLICATION_STRING_CHUNK_BYTES, - Math.min(value.length, remaining * 3), - ), - ) - const output = new Uint8Array(capacity) - const { read, written } = encodeIntoBoundedChunk(value, offset, output) - return { - bytes: written === output.length ? output : output.subarray(0, written), - read, - } -} - -export function transformReadableStreamWithRouter( +export function transformStreamWithRouter( router: AnyRouter, - appStream: AppStream, + appStream: ReadableStream, opts?: TransformStreamWithRouterOptions, ) { const serverSsr = router.serverSsr if (!serverSsr) { throw new Error('Invariant failed: router.serverSsr is required') } - const hydrationScripts = serverSsr.hydrationScripts - - let reader: AppStreamReader - try { - reader = appStream.getReader() as AppStreamReader - } catch (error) { - cleanupFailedStreamCreation(serverSsr, opts?.onAbort, error) - throw error + if (serverSsr.reserveStreamFastPath()) { + return makeFastPathStream(appStream, opts, serverSsr) } - try { - opts?.signal?.throwIfAborted() - if (hydrationScripts.reserveFastPath()) { - // Hydration already drained: pass application output through from the - // first byte. The merge stream handles this with the same pass-through - // it uses after hydration finishes mid-stream. - return makeMergeStream(serverSsr, reader, undefined, opts) - } - const hydrationOutput = hydrationScripts.claimOutput() - if (hydrationOutput.state === HydrationScriptOutputState.Failed) { - throw hydrationOutput.error - } - return makeMergeStream(serverSsr, reader, hydrationOutput, opts) - } catch (error) { - void cancelReader(reader, error) - cleanupFailedStreamCreation(serverSsr, opts?.onAbort, error) - throw error - } + return makeMainStream(serverSsr, appStream, opts) } -// The merge path searches only router- and renderer-owned ASCII delimiters. -// Application bytes otherwise leave through zero-copy subarray views. -// Without a hydration output the stream starts in pass-through. -function makeMergeStream( - serverSsr: NonNullable, - reader: AppStreamReader, - hydrationOutput: HydrationScriptOutput | undefined, +// ===================================================================== +// Fast path: passthrough with cleanup + backpressure on app reads. +// ===================================================================== +function makeFastPathStream( + appStream: ReadableStream, opts?: TransformStreamWithRouterOptions, + serverSsr?: NonNullable, ) { - const hydrationScripts = serverSsr.hydrationScripts - let controller!: ReadableStreamDefaultController - let terminal = false - let appDone = false - let applicationPhase: ApplicationPhase = hydrationOutput - ? ApplicationPhase.BeforeBoundary - : ApplicationPhase.PassThrough - let insertionBoundary = false + let cleanedUp = false + let controller: ReadableStreamDefaultController | undefined + let state: MergeState = MergeState.ReadingBody + let lifetimeTimeoutHandle: ReturnType | undefined + let stopListeningToAbort: (() => void) | undefined + let stopListeningToInjectedHtml: (() => void) | undefined + const readerState = createReaderState(appStream) + const notifyAbort = createAbortNotifier(opts) + const isDone = () => state === MergeState.Done + let renderFinished = false - let stopHydrationOutputListener: (() => void) | undefined - let appReadPending = false - let settledAppRead: ReadableStreamReadValueResult | undefined - - let appBytes: Uint8Array | undefined - let appOffset = 0 - let documentCloseIndex: number | undefined - let appString: string | undefined - let appStringOffset = 0 - - const useScriptCloseSafePoints = opts?.rendererSafePoint === 'script-close' - const useRecordEndSafePoints = opts?.rendererSafePoint === 'record-end' - - // Both matchers are created on first use; pass-through never needs them. - let barrierMatcher: ByteMatcherState | undefined - let safePointMatcher: ByteMatcherState | undefined - // Split document closes carry at most 13 bytes across chunks. This uses - // findExactBytes + getExactBytesPrefixAtEnd instead of advanceByteMatcher - // because `` repeats its first byte (`<` at 0 and 7), which - // violates the matcher's unique-first-byte resync precondition. - let closeCarry: Uint8Array | undefined - - let wakeResolve: (() => void) | undefined - // Assigned after the stream exists; `terminate` can run before that when an - // already-cleaned owner fires its cleanup listener synchronously. - let disarmLifecycle = (): void => {} - - function waitForWake() { - return new Promise((resolve) => { - wakeResolve = resolve - }) - } - - function wakePump() { - const resolve = wakeResolve - wakeResolve = undefined - resolve?.() - } - - // Returns true when a chunk was enqueued. Every process* function - // propagates this boolean so pump() emits at most one chunk per downstream - // pull — the backpressure contract of this transform. - function enqueueAppBytes(value: Uint8Array) { - if (value.length === 0) { - return false - } - controller.enqueue(value) - return true - } - - function finishAppChunk() { - appBytes = undefined - documentCloseIndex = undefined - if ( - appString === undefined && - useRecordEndSafePoints && - closeCarry === undefined - ) { - insertionBoundary = true - } - } - - function emitAppRange( - end: number, - safePoint: boolean, - finishCurrentChunk = end === appBytes!.length, - ) { - const value = appBytes! - const output = - appOffset === 0 && end === value.length - ? value - : value.subarray(appOffset, end) - appOffset = end - if (safePoint) { - insertionBoundary = true - } - if (finishCurrentChunk) { - finishAppChunk() - } - return enqueueAppBytes(output) - } - - function loadNextAppStringChunk() { - const value = appString! - const encoded = encodeStringSource(value, appStringOffset) - appStringOffset += encoded.read - appBytes = encoded.bytes - appOffset = 0 - if (appStringOffset === value.length) { - appString = undefined - } - } - - function processUntilBarrier() { - const value = appBytes! - if (!hydrationScripts.isInitialTaken()) { - // The rendered boundary can only exist after the initial script take, - // so earlier renderer bytes pass through without scanning. This skips - // the barrier scan for the whole pre- document and prevents - // barrier-lookalike bytes in application content from lifting the - // barrier early. - return emitAppRange(value.length, false) - } - const matchEnd = advanceByteMatcher( - (barrierMatcher ??= { - pattern: HYDRATION_SCRIPT_BOUNDARY_BYTES, - anchorIndex: HYDRATION_SCRIPT_BOUNDARY_ANCHOR_INDEX, - matched: 0, - }), - value, - appOffset, - ) - if (matchEnd === undefined) { - return emitAppRange(value.length, false) - } - - applicationPhase = ApplicationPhase.Merge - hydrationScripts.liftBarrier() - return emitAppRange(matchEnd, true) - } - - // Advance past a canonical close that ends `consumed` bytes into the current - // chunk and hold it until the transform completes. - function enterHeldClose(consumed: number, prefix: Uint8Array | undefined) { - appOffset = consumed - applicationPhase = ApplicationPhase.HeldClose - if (safePointMatcher) { - // The removed close breaks byte continuity with later renderer bytes. - safePointMatcher.matched = 0 - } - insertionBoundary = true - if (appOffset === appBytes!.length) { - finishAppChunk() - } - return prefix ? enqueueAppBytes(prefix) : false - } - - function holdDocumentClose(matchStart: number) { - const value = appBytes! - return enterHeldClose( - matchStart + DOCUMENT_CLOSE_BYTES.length, - matchStart === appOffset - ? undefined - : value.subarray(appOffset, matchStart), - ) - } - - function processUntilSafePoint(endIndex: number) { - const value = appBytes! - const matchEnd = findSafePointEnd(value, appOffset, endIndex) - if (matchEnd === undefined) { - return false - } - - return emitAppRange(matchEnd, true) - } - - function findSafePointEnd( - value: Uint8Array, - startIndex: number, - endIndex: number, - ) { - // Merge-only: pass-through never scans for safe points. - const hydrationState = hydrationOutput!.state - if ( - endIndex === startIndex || - hydrationState === HydrationScriptOutputState.Done - ) { - return undefined - } - - const scanValue = - endIndex === value.length ? value : value.subarray(0, endIndex) - const matcher = (safePointMatcher ??= { - pattern: SCRIPT_CLOSE_BYTES, - anchorIndex: SCRIPT_CLOSE_ANCHOR_INDEX, - matched: 0, - }) - // Active drains before app bytes, Done is excluded above, and Failed - // terminates through the subscriber; only Ready and Waiting reach here. - const waiting = hydrationState === HydrationScriptOutputState.Waiting - const matchEnd = advanceByteMatcher(matcher, scanValue, startIndex, waiting) - if (matchEnd === undefined) { - return undefined - } - if (waiting) { - // Bytes after the last match are processed again on the next pull. - matcher.matched = 0 - } - return matchEnd - } - - function processCloseCarry() { - const value = appBytes! - const carry = closeCarry! - const headLength = Math.min( - value.length - appOffset, - DOCUMENT_CLOSE_BYTES.length, - ) - const combined = new Uint8Array(carry.length + headLength) - combined.set(carry) - combined.set( - value.subarray(appOffset, appOffset + headLength), - carry.length, - ) - - const matchStart = findExactBytes( - combined, - DOCUMENT_CLOSE_BYTES, - 0, - DOCUMENT_CLOSE_ANCHOR_INDEX, - ) - const partial = - matchStart < 0 - ? getExactBytesPrefixAtEnd(combined, DOCUMENT_CLOSE_BYTES) - : undefined - const safeEnd = matchStart >= 0 ? matchStart : (partial ?? combined.length) - - if (useScriptCloseSafePoints) { - const safePointEnd = findSafePointEnd(combined, 0, safeEnd) - if (safePointEnd !== undefined) { - appOffset += safePointEnd - carry.length - closeCarry = undefined - insertionBoundary = true - if (appOffset === value.length) { - finishAppChunk() - } - return enqueueAppBytes(combined.subarray(0, safePointEnd)) - } - } - - if (matchStart >= 0) { - closeCarry = undefined - return enterHeldClose( - appOffset + matchStart + DOCUMENT_CLOSE_BYTES.length - carry.length, - matchStart === 0 ? undefined : combined.subarray(0, matchStart), - ) - } - - closeCarry = partial === undefined ? undefined : combined.slice(partial) - appOffset += headLength - return enqueueAppBytes( - safeEnd === combined.length ? combined : combined.subarray(0, safeEnd), - ) - } - - function processUntilDocumentClose() { - const value = appBytes! - - if (closeCarry) { - if (processCloseCarry()) { - return true - } - if (applicationPhase === ApplicationPhase.HeldClose) { - return false - } - if (appOffset >= value.length) { - finishAppChunk() - return false - } - } - - // Safe points only advance within this chunk, so keep its close or miss. - const matchStart = (documentCloseIndex ??= findExactBytes( - value, - DOCUMENT_CLOSE_BYTES, - appOffset, - DOCUMENT_CLOSE_ANCHOR_INDEX, - )) - if (matchStart >= 0) { - if (useScriptCloseSafePoints && processUntilSafePoint(matchStart)) { - return true - } - return holdDocumentClose(matchStart) - } - - const partial = getExactBytesPrefixAtEnd( - value, - DOCUMENT_CLOSE_BYTES, - appOffset, - ) - const safeEnd = partial ?? value.length - if (useScriptCloseSafePoints && processUntilSafePoint(safeEnd)) { - return true - } - closeCarry = partial === undefined ? undefined : value.slice(partial) - return emitAppRange(safeEnd, false, true) - } - - function processAppChunk() { - if (appOffset >= appBytes!.length) { - finishAppChunk() - return false - } - insertionBoundary = false - if (applicationPhase === ApplicationPhase.BeforeBoundary) { - return processUntilBarrier() - } - if (applicationPhase === ApplicationPhase.Merge) { - return processUntilDocumentClose() - } - const value = appBytes! - if (useScriptCloseSafePoints && processUntilSafePoint(value.length)) { - return true - } - - return emitAppRange(value.length, false) - } - - function terminate(kind: Termination, reason?: unknown) { - if (terminal) { - return - } - terminal = true - - stopHydrationOutputListener?.() - stopHydrationOutputListener = undefined - disarmLifecycle() - - settledAppRead = undefined - appBytes = undefined - documentCloseIndex = undefined - appString = undefined - closeCarry = undefined - wakePump() - - return finalizeSsrStream( - kind, - reason, - controller, - reader, - serverSsr, - opts?.onAbort, - ) - } - - function startAppRead() { - if (appReadPending || settledAppRead || terminal) { - return - } - appReadPending = true - void reader.read().then( - (result) => { - appReadPending = false - if (!terminal) { - if (result.done) { - acceptAppRead(result) - } else { - settledAppRead = result - } - wakePump() - } - }, - (error) => { - appReadPending = false - if (!terminal) { - handlePumpError(error) - } - }, - ) - } - - function acceptAppRead(result: ReadableStreamReadResult) { - if (result.done) { - appDone = true - insertionBoundary = closeCarry === undefined - // The serialization deadline is a transport concern of this merge - // path; the lifecycle signal below stays a plain notification. - hydrationScripts.startSerializationTimeout( - opts?.timeoutMs ?? DEFAULT_SERIALIZATION_TIMEOUT_MS, - ) - serverSsr.setRenderFinished() - return - } - const value = result.value - if (typeof value === 'string') { - if (value.length === 0) { - return - } - appString = value - appStringOffset = 0 - insertionBoundary = false - loadNextAppStringChunk() - return - } - if (value.byteLength === 0) { - return - } - appBytes = value - appOffset = 0 - insertionBoundary = false - } - - async function loadNextAppChunk() { - if (appString !== undefined) { - loadNextAppStringChunk() - return - } - if (settledAppRead) { - const settled = settledAppRead - settledAppRead = undefined - acceptAppRead(settled) - return - } - - const scriptsCanInterruptRead = - applicationPhase !== ApplicationPhase.BeforeBoundary && - insertionBoundary && - hydrationOutput!.state !== HydrationScriptOutputState.Done - if (!scriptsCanInterruptRead && !appReadPending) { - const result = await reader.read() - if (terminal) { - return - } - acceptAppRead(result) - return - } - - const wake = waitForWake() - startAppRead() - await wake - } - - // Pass-through forwards application records unchanged and only encodes - // string records; it skips the merge bookkeeping entirely. - async function pumpPassThrough() { + const finishSsrRendering = () => { + if (!serverSsr || renderFinished) return true + renderFinished = true try { - for (;;) { - if (appBytes) { - const remainder = - appOffset === 0 ? appBytes : appBytes.subarray(appOffset) - appBytes = undefined - if (enqueueAppBytes(remainder)) { - return - } - continue - } - if (appString !== undefined) { - loadNextAppStringChunk() - continue - } - if (appDone) { - terminate('complete') - return - } - if (appReadPending) { - // A merge-phase prefetch is still in flight; it wakes the pump. - await waitForWake() - continue - } - let result: ReadableStreamReadResult | undefined = - settledAppRead - if (result) { - settledAppRead = undefined - } else { - result = await reader.read() - if (terminal) { - return - } - } - if (result.done || typeof result.value === 'string') { - acceptAppRead(result) - continue - } - if (result.value.byteLength > 0) { - controller.enqueue(result.value) - return - } - } + serverSsr.setRenderFinished() + return true } catch (error) { - handlePumpError(error) + safeError(error) + cleanup(error) + return false } } - async function pump() { - const output = hydrationOutput! - while (!terminal) { - const hydrationState = output.state - if (hydrationState === HydrationScriptOutputState.Active) { - controller.enqueue(output.pullChunk()) - return - } - if ( - applicationPhase !== ApplicationPhase.BeforeBoundary && - insertionBoundary && - hydrationState === HydrationScriptOutputState.Ready - ) { - if (!appDone && !appBytes && appString === undefined) { - startAppRead() - } - controller.enqueue(output.pullChunk()) - return - } - if ( - applicationPhase === ApplicationPhase.Merge && - hydrationState === HydrationScriptOutputState.Done && - closeCarry === undefined && - hydrationScripts.reserveFastPath(output) - ) { - applicationPhase = ApplicationPhase.PassThrough - stopHydrationOutputListener?.() - stopHydrationOutputListener = undefined - return pumpPassThrough() - } - if (appBytes) { - if (processAppChunk()) { - return - } - continue - } + const cleanup = (reason?: unknown, cancelReader = true) => { + if (cleanedUp) return resolvedPromise + cleanedUp = true - if (appDone) { - if (applicationPhase === ApplicationPhase.BeforeBoundary) { - // No boundary was rendered. The document is already - // delivered, so emit the hydration sources after it instead of - // failing the response. - hydrationScripts.skipInitialTake() - applicationPhase = ApplicationPhase.Merge - insertionBoundary = true - continue - } - if (closeCarry) { - // A close prefix that never completed is ordinary content, exactly - // like a document without a canonical close. - const carry = closeCarry - closeCarry = undefined - insertionBoundary = true - if (enqueueAppBytes(carry)) { - return - } - continue - } - if (hydrationState === HydrationScriptOutputState.Waiting) { - await waitForWake() - continue - } - if (applicationPhase === ApplicationPhase.HeldClose) { - controller.enqueue(DOCUMENT_CLOSE_BYTES.slice()) - terminate('complete') - return - } - terminate('complete') - return - } + if (lifetimeTimeoutHandle !== undefined) { + clearTimeout(lifetimeTimeoutHandle) + lifetimeTimeoutHandle = undefined + } + stopListeningToAbort?.() + stopListeningToAbort = undefined + try { + stopListeningToInjectedHtml?.() + } catch { + // ignore + } + stopListeningToInjectedHtml = undefined - await loadNextAppChunk() + if (cancelReader) { + // Notify the producer immediately. Reader cancellation may take time to + // settle, and upstream renderers must tolerate abort + cancel overlap. + notifyAbort(reason) + } + const readerDone = cancelReader + ? readerState.cancel(reason) + : (readerState.release(), resolvedPromise) + if (serverSsr) { + try { + serverSsr.cleanup() + } catch (error) { + console.error('Error in SSR cleanup:', error) + } + } + return readerDone + } + + const safeClose = () => { + if (isDone()) return + state = MergeState.Done + try { + controller?.close() + } catch { + // ignore } } - function handlePumpError(error: unknown) { - if (terminal) { - return + const safeError = (error: unknown) => { + if (isDone()) return + state = MergeState.Done + try { + controller?.error(error) + } catch { + // ignore } - console.error('Error processing appStream:', error) - terminate('failure', error) } + if (serverSsr) { + stopListeningToInjectedHtml = serverSsr.onInjectedHtml(() => { + const err = new Error('SSR router HTML injected during fast path') + safeError(err) + cleanup(err) + }) + } + + const lifetimeMs = opts?.lifetimeMs ?? DEFAULT_LIFETIME_TIMEOUT_MS + lifetimeTimeoutHandle = setTimeout(() => { + if (!cleanedUp && !isDone()) { + const err = new Error('Stream lifetime exceeded') + console.warn( + `SSR stream transform exceeded maximum lifetime (${lifetimeMs}ms), forcing cleanup`, + ) + safeError(err) + cleanup(err) + } + }, lifetimeMs) + const stream = new ReadableStream({ start(c) { controller = c }, - pull() { - // One async frame per pull: pass-through must stay as cheap as a plain - // read-and-forward loop. - return applicationPhase === ApplicationPhase.PassThrough - ? pumpPassThrough() - : pump().catch(handlePumpError) + async pull(c) { + if (cleanedUp || isDone()) return + try { + const { done, value } = await readerState.reader.read() + if (!done) { + if (!cleanedUp && !isDone()) { + c.enqueue(value) + } + return + } + + if (cleanedUp || isDone()) return + + if (!finishSsrRendering()) return + safeClose() + return cleanup(undefined, false) + } catch (error) { + if (cleanedUp) return + console.error('Error reading appStream:', error) + if (state < MergeState.AppDone) { + try { + serverSsr?.setRenderFinished() + } catch { + // ignore + } + } + safeError(error) + return cleanup(error) + } finally { + if (cleanedUp || isDone()) { + readerState.release() + } + } }, cancel(reason) { - return terminate('cancel', reason) + state = MergeState.Done + return cleanup(reason) }, }) - if (hydrationOutput) { - stopHydrationOutputListener = hydrationOutput.subscribe(() => { - if (hydrationOutput.state === HydrationScriptOutputState.Failed) { - terminate('failure', hydrationOutput.error) + stopListeningToAbort = listenToAbort(opts?.signal, (reason) => { + safeError(reason) + cleanup(reason) + }) + + return stream +} + +// ===================================================================== +// Main path: scan + inject router HTML/scripts with full backpressure. +// +// ALL output (app chunks AND router-injected HTML/scripts) flows through a +// single pendingWrites queue and is only enqueued onto the downstream +// controller when desiredSize > 0. This prevents native-memory growth of +// queued Uint8Arrays under slow HTTP consumers. +// ===================================================================== +function makeMainStream( + serverSsr: NonNullable, + appStream: ReadableStream, + opts?: TransformStreamWithRouterOptions, +) { + let stopListeningToInjectedHtml: (() => void) | undefined + let stopListeningToSerializationFinished: (() => void) | undefined + let serializationTimeoutHandle: ReturnType | undefined + let lifetimeTimeoutHandle: ReturnType | undefined + let stopListeningToAbort: (() => void) | undefined + let cleanedUp = false + + let controller: ReadableStreamDefaultController | undefined + let closeWhenDrained = false + let state: MergeState = MergeState.ReadingBody + + const readerState = createReaderState(appStream) + const notifyAbort = createAbortNotifier(opts) + + // Single output queue: app chunks + router-injected HTML/scripts. + // Stored as STRINGS to avoid holding native-backed Uint8Arrays in our queue + // while waiting for downstream capacity. Encoding happens at enqueue time + // (drainPending) so the bytes live only inside the controller's internal + // queue, not in two places. + // + // Uses an index pointer instead of Array.prototype.shift() (which is O(n)) + // so many small router-injected script chunks stay O(1) per chunk. + const pendingWrites: Array = [] + let pendingWriteHead = 0 + let pendingWriteChars = 0 + + function clearPending() { + pendingWrites.length = 0 + pendingWriteHead = 0 + pendingWriteChars = 0 + } + + // Backpressure: pull() resolves drainResolve to let the read loop advance. + let drainResolve: (() => void) | null = null + const waitForDrain = () => + new Promise((r) => { + drainResolve = r + }) + const signalDrain = () => { + if (drainResolve) { + const r = drainResolve + drainResolve = null + r() + } + } + + const isDone = () => state === MergeState.Done + + function drainPending() { + if (!controller || isDone()) return + while (pendingWriteHead < pendingWrites.length) { + const ds = controller.desiredSize + if (ds !== null && ds <= 0) return + const next = pendingWrites[pendingWriteHead]! + // Release reference for GC; compact when fully drained. + pendingWrites[pendingWriteHead] = '' + pendingWriteHead++ + pendingWriteChars -= next.length + try { + controller.enqueue(textEncoder.encode(next)) + } catch (error) { + safeError(error) + cleanup(error) + return + } + } + // Fully drained: reset array so it doesn't grow unbounded across SSR. + if (pendingWriteHead >= pendingWrites.length) { + pendingWrites.length = 0 + pendingWriteHead = 0 + } + // If we've flushed everything and tryFinish requested close, close now. + if (closeWhenDrained && pendingWriteHead >= pendingWrites.length) { + closeWhenDrained = false + safeClose() + cleanup(undefined, false) + } + } + + /** + * Enqueue a string chunk through the backpressure queue. Stored as a + * string and encoded only when the downstream actually accepts the chunk + * — keeps native-memory pressure inside the controller's queue (which + * honors desiredSize) rather than ours. + */ + function writeChunk(chunk: string) { + if (cleanedUp || isDone()) return + if (!chunk.length) return + if (pendingWriteChars + chunk.length > MAX_PENDING_WRITE_CHARS) { + const err = new Error('SSR stream pending output exceeded maximum buffer') + safeError(err) + cleanup(err) + return + } + pendingWrites.push(chunk) + pendingWriteChars += chunk.length + drainPending() + } + + function safeClose() { + if (isDone()) return + state = MergeState.Done + try { + controller?.close() + } catch { + // ignore + } + } + + function safeError(error: unknown) { + if (isDone()) return + state = MergeState.Done + try { + controller?.error(error) + } catch { + // ignore + } + } + + /** + * Cleanup with guards; must be idempotent. + */ + function cleanup(reason?: unknown, cancelReader = true) { + if (cleanedUp) return resolvedPromise + cleanedUp = true + + try { + stopListeningToInjectedHtml?.() + stopListeningToSerializationFinished?.() + } catch { + // ignore + } + stopListeningToInjectedHtml = undefined + stopListeningToSerializationFinished = undefined + stopListeningToAbort?.() + stopListeningToAbort = undefined + + if (serializationTimeoutHandle !== undefined) { + clearTimeout(serializationTimeoutHandle) + serializationTimeoutHandle = undefined + } + if (lifetimeTimeoutHandle !== undefined) { + clearTimeout(lifetimeTimeoutHandle) + lifetimeTimeoutHandle = undefined + } + + clearPendingRouterHtml() + leftover = '' + pendingTail = '' + clearPending() + + if (cancelReader) { + // Notify the producer immediately. Reader cancellation may take time to + // settle, and upstream renderers must tolerate abort + cancel overlap. + notifyAbort(reason) + } + const readerDone = cancelReader + ? readerState.cancel(reason) + : (readerState.release(), resolvedPromise) + signalDrain() + try { + serverSsr.cleanup() + } catch (error) { + console.error('Error in SSR cleanup:', error) + } + return readerDone + } + + const textDecoder = new TextDecoder() + + // Router-injected scripts/HTML waiting for the next safe body boundary. + // Keep chunks separate so flushing does not flatten a large rope string. + const pendingRouterHtml: Array = [] + let pendingRouterHtmlChars = 0 + + // between-chunk text buffer; keep bounded to avoid unbounded memory + let leftover = '' + + // captured bytes from onward; must stay behind router scripts. + let pendingTail = '' + + let streamBarrierLifted = false + let streamBarrierMarkerSeen = false + let serializationFinished = false + + function noteBarrierMarker(chunk: string) { + if (streamBarrierMarkerSeen) return + if (chunk.includes(TSR_SCRIPT_BARRIER_ID)) { + streamBarrierMarkerSeen = true + } + } + + function liftBarrierAfterBoundary() { + if (streamBarrierLifted) return + if (!streamBarrierMarkerSeen) return + streamBarrierLifted = true + serverSsr.liftScriptBarrier() + } + + const stream = new ReadableStream({ + start(c) { + controller = c + // If anything queued before start (shouldn't happen but be safe), drain. + drainPending() + }, + pull() { + // Consumer has capacity; flush queue then unblock read loop. + drainPending() + signalDrain() + }, + cancel(reason) { + state = MergeState.Done + return cleanup(reason) + }, + }) + + function drainRouterHtml() { + if (cleanedUp || isDone()) return + let html: string | undefined + try { + html = serverSsr.takeBufferedHtml() + } catch (error) { + safeError(error) + cleanup(error) + return + } + if (!html) return + if (state >= MergeState.Draining) { + // At this point final tail/close has already been queued. Emitting late + // router HTML would put scripts after or drop them silently. + const err = new Error( + 'SSR router HTML injected after stream finalization', + ) + safeError(err) + cleanup(err) + return + } + if (state === MergeState.HoldingTail) { + flushPendingRouterHtml() + writeChunk(html) + } else { + if (pendingRouterHtmlChars + html.length > MAX_ROUTER_HTML_CHARS) { + const err = new Error('SSR router HTML exceeded maximum buffer') + safeError(err) + cleanup(err) return } - wakePump() - }) + pendingRouterHtml.push(html) + pendingRouterHtmlChars += html.length + } + } + + function flushPendingRouterHtml() { + if (!pendingRouterHtml.length) return + for (const html of pendingRouterHtml) { + writeChunk(html) + } + clearPendingRouterHtml() + } + + function clearPendingRouterHtml() { + pendingRouterHtml.length = 0 + pendingRouterHtmlChars = 0 + } + + function appendTail(chunk: string) { + pendingTail += chunk + if (pendingTail.length > MAX_TAIL_CHARS) { + throw new Error('SSR stream tail exceeded maximum buffer') + } + } + + function waitForBackpressure() { + return !!( + controller && + controller.desiredSize !== null && + controller.desiredSize <= 0 + ) + } + + function startSerializationTimeout() { + if (cleanedUp || isDone()) return + if (serializationTimeoutHandle !== undefined) return + const timeoutMs = opts?.timeoutMs ?? DEFAULT_SERIALIZATION_TIMEOUT_MS + serializationTimeoutHandle = setTimeout(() => { + if (!cleanedUp && !isDone()) { + const err = new Error('Serialization timeout after app render finished') + console.error('Serialization timeout after app render finished') + safeError(err) + cleanup(err) + } + }, timeoutMs) + } + + /** + * Finish only when app done and serialization complete. Queues final + * output and requests close-when-drained so we don't close ahead of + * pending writes still waiting on downstream capacity. + */ + function tryFinish() { + if (state !== MergeState.AppDone || !serializationFinished) return + if (cleanedUp || isDone()) return + + if (serializationTimeoutHandle !== undefined) { + clearTimeout(serializationTimeoutHandle) + serializationTimeoutHandle = undefined + } + + drainRouterHtml() + if (cleanedUp || isDone()) return + + // Flush any remaining bytes in the TextDecoder + const decoderRemainder = textDecoder.decode() + + if (leftover) writeChunk(leftover) + if (cleanedUp || isDone()) return + if (decoderRemainder) writeChunk(decoderRemainder) + if (cleanedUp || isDone()) return + flushPendingRouterHtml() + if (cleanedUp || isDone()) return + if (pendingTail) writeChunk(pendingTail) + if (cleanedUp || isDone()) return + + leftover = '' + pendingTail = '' + + state = MergeState.Draining + closeWhenDrained = true + // Try immediately; if queue not drained yet, pull() will retry. + drainPending() + } + + function finishAppRendering() { + if (state >= MergeState.AppDone) return + state = MergeState.AppDone + try { + serverSsr.setRenderFinished() + } catch (error) { + safeError(error) + cleanup(error) + return + } + drainRouterHtml() + if (cleanedUp || isDone()) return + serializationFinished = + serializationFinished || serverSsr.isSerializationFinished() + if (serializationFinished) { + tryFinish() + } else { + startSerializationTimeout() + } } - disarmLifecycle = armStreamLifecycle( - serverSsr, - opts, - () => terminal, - terminate, + + // Safety net: cleanup even if consumer never reads + const timeoutMs = opts?.timeoutMs ?? DEFAULT_SERIALIZATION_TIMEOUT_MS + const lifetimeMs = opts?.lifetimeMs ?? timeoutMs * 2 + lifetimeTimeoutHandle = setTimeout(() => { + if (!cleanedUp && !isDone()) { + const err = new Error('Stream lifetime exceeded') + console.warn( + `SSR stream transform exceeded maximum lifetime (${lifetimeMs}ms), forcing cleanup`, + ) + safeError(err) + cleanup(err) + } + }, lifetimeMs) + + stopListeningToInjectedHtml = serverSsr.onInjectedHtml(() => { + drainRouterHtml() + }) + + stopListeningToSerializationFinished = serverSsr.onSerializationFinished( + () => { + serializationFinished = true + drainRouterHtml() + tryFinish() + }, ) + + // Subscriptions are installed before snapshots, so missed events are + // recovered by these synchronous drains/rechecks. + drainRouterHtml() + if (cleanedUp || isDone()) return stream + serializationFinished = + serializationFinished || serverSsr.isSerializationFinished() + if (serializationFinished) { + drainRouterHtml() + if (cleanedUp || isDone()) return stream + } + + stopListeningToAbort = listenToAbort(opts?.signal, (reason) => { + safeError(reason) + cleanup(reason) + }) + if (cleanedUp || isDone()) + return stream + + // Transform the appStream + ;(async () => { + try { + while (true) { + // Backpressure: pause upstream reads while downstream is full. + if (waitForBackpressure()) { + await waitForDrain() + if (cleanedUp || isDone()) return + } + + const { done, value } = await readerState.reader.read() + if (done) break + + if (cleanedUp || isDone()) return + + const text = + typeof value === 'string' + ? value + : textDecoder.decode(value as ArrayBufferView, { stream: true }) + + const chunkString = leftover ? leftover + text : text + + // If we already saw , everything else is tail. Keep it bounded + // and held until router scripts are ready so injection remains before . + if (state >= MergeState.HoldingTail) { + appendTail(chunkString) + leftover = '' + continue + } + + const boundary = findHtmlBoundary(chunkString) + if (boundary < -1) { + const bodyEndIndex = -boundary - 2 + state = MergeState.HoldingTail + appendTail(chunkString.slice(bodyEndIndex)) + const bodyChunk = chunkString.slice(0, bodyEndIndex) + writeChunk(bodyChunk) + if (cleanedUp || isDone()) return + noteBarrierMarker(bodyChunk) + liftBarrierAfterBoundary() + if (cleanedUp || isDone()) return + flushPendingRouterHtml() + leftover = '' + continue + } + + const lastClosingTagEnd = boundary + + if (lastClosingTagEnd > 0) { + const safeChunk = chunkString.slice(0, lastClosingTagEnd) + writeChunk(safeChunk) + if (cleanedUp || isDone()) return + noteBarrierMarker(safeChunk) + liftBarrierAfterBoundary() + if (cleanedUp || isDone()) return + flushPendingRouterHtml() + + leftover = chunkString.slice(lastClosingTagEnd) + if (leftover.length > MAX_LEFTOVER_CHARS) { + // Ensure bounded memory even if a consumer streams long text sequences + // without any closing tags. This may reduce injection granularity but is correct. + noteBarrierMarker(leftover) + const flushed = leftover.slice( + 0, + leftover.length - MAX_LEFTOVER_CHARS, + ) + writeChunk(flushed) + leftover = leftover.slice(-MAX_LEFTOVER_CHARS) + } + } else { + // No closing tag found; keep small tail to handle split closing tags, + // but stream older bytes to prevent unbounded buffering. + const combined = chunkString + if (combined.length > MAX_LEFTOVER_CHARS) { + noteBarrierMarker(combined) + const flushUpto = combined.length - MAX_LEFTOVER_CHARS + const flushed = combined.slice(0, flushUpto) + writeChunk(flushed) + leftover = combined.slice(flushUpto) + } else { + leftover = combined + } + } + } + + if (cleanedUp || isDone()) return + + finishAppRendering() + } catch (error) { + if (cleanedUp) return + console.error('Error reading appStream:', error) + if (state < MergeState.AppDone) { + try { + serverSsr.setRenderFinished() + } catch { + // ignore + } + } + safeError(error) + cleanup(error) + } finally { + readerState.release() + } + })().catch((error) => { + if (cleanedUp) return + console.error('Error in stream transform:', error) + safeError(error) + cleanup(error) + }) return stream } diff --git a/packages/router-core/src/utils.ts b/packages/router-core/src/utils.ts index 63aa518695..9b1b3c411a 100644 --- a/packages/router-core/src/utils.ts +++ b/packages/router-core/src/utils.ts @@ -209,6 +209,7 @@ export function functionalUpdate( } export const hasOwn = Object.prototype.hasOwnProperty +const isEnumerable = Object.prototype.propertyIsEnumerable export function hasKeys(obj: Record) { for (const key in obj) { @@ -218,146 +219,140 @@ export function hasKeys(obj: Record) { } export const createNull = () => Object.create(null) -// Search and params objects use null prototypes so keys like `__proto__` stay data. export const nullReplaceEqualDeep: typeof replaceEqualDeep = (prev, next) => - replaceEqualDeep(prev, next, true) + replaceEqualDeep(prev, next, createNull) /** - * Reuse equal children between immutable plain objects and dense arrays. - * Return `prev` for deeply equal values; otherwise return an object already - * containing the resolved children or create a copy with the shared children. - * Getters and own `__proto__` keys in ordinary object copies are unsupported. - * Do not use this with signals. + * This function returns `prev` if `_next` is deeply equal. + * If not, it will replace any deeply equal children of `b` with those of `a`. + * This can be used for structural sharing between immutable JSON values for example. + * Do not use this with signals */ export function replaceEqualDeep( prev: any, - next: T, - _nullProto?: boolean, - _depth?: number, -): T -export function replaceEqualDeep( - prev: any, - next: any, - _nullProto?: boolean, + _next: T, + _makeObj = () => ({}), _depth = 0, -): any { +): T { if (isServer) { - return next + return _next } - if (prev === next) { + if (prev === _next) { return prev } - if (_depth++ > 500) { - return next + if (_depth > 500) return _next + + const next = _next as any + + const array = isPlainArray(prev) && isPlainArray(next) + + if (!array && !(isPlainObject(prev) && isPlainObject(next))) return next + + const prevItems = array ? prev : getEnumerableOwnKeys(prev) + if (!prevItems) return next + const nextItems = array ? next : getEnumerableOwnKeys(next) + if (!nextItems) return next + const prevSize = prevItems.length + const nextSize = nextItems.length + const copy: any = array ? new Array(nextSize) : _makeObj() + + let equalItems = 0 + + for (let i = 0; i < nextSize; i++) { + const key = array ? i : (nextItems[i] as any) + const p = prev[key] + const n = next[key] + + if (p === n) { + copy[key] = p + if (array ? i < prevSize : hasOwn.call(prev, key)) equalItems++ + continue + } + + if ( + p === null || + n === null || + typeof p !== 'object' || + typeof n !== 'object' + ) { + copy[key] = n + continue + } + + const v = replaceEqualDeep(p, n, _makeObj, _depth + 1) + copy[key] = v + if (v === p) equalItems++ } - const array = Array.isArray(prev) && Array.isArray(next) - - if (!array && !(isPlainObject(prev) && isPlainObject(next))) { - return next - } - - const prevKeys: Array = Object.keys(prev) - const previousCount = prevKeys.length - const nextKeys: Array = Object.keys(next) - const length = nextKeys.length - // Hidden object keys and symbols on next make the value opaque. Arrays - // must have only dense enumerable indices: a hole and an extra key can - // cancel out in the count, so also check the last key of both arrays. - if ( - array - ? previousCount !== prev.length || - length !== next.length || - (previousCount && last(prevKeys) !== `${previousCount - 1}`) || - (length && last(nextKeys) !== `${length - 1}`) - : previousCount !== Object.getOwnPropertyNames(prev).length || - length !== Object.getOwnPropertyNames(next).length || - Object.getOwnPropertySymbols(next).length - ) { - return next - } - - let i = 0 - let child: any - let previous: any - let key: any - - if (array) { - // Entries before the first difference already resolve to prev. - for (; i < length; i++) { - key = i - previous = prev[key] - child = next[key] - child = - previous === child - ? previous - : typeof previous === 'object' - ? replaceEqualDeep(previous, child, _nullProto, _depth) - : child - if (child !== previous) { - break - } - } - if (i === length && previousCount === length) { - return prev - } - } else { - let equal = previousCount === length - let unchanged = true - for (; i < length; i++) { - key = nextKeys[i]! - previous = prev[key] - const incoming = next[key] - child = - previous === incoming - ? previous - : typeof previous === 'object' - ? replaceEqualDeep(previous, incoming, _nullProto, _depth) - : incoming - equal &&= - child === previous && (prevKeys[i] === key || hasOwn.call(prev, key)) - unchanged &&= Object.is(child, incoming) - // This key has been checked; its private slot can hold the result. - prevKeys[i] = child - } - if (equal) { - return Object.getOwnPropertySymbols(prev).length ? next : prev - } - if (unchanged) { - return next - } - } - - // Reuse the validated array key list; it is private and has the right length. - const copy: any = array ? nextKeys.fill(0) : _nullProto ? createNull() : {} - for (let j = 0; j < length; j++) { - key = array ? j : nextKeys[j]! - if (array) { - previous = prev[key] - if (j > i) { - child = next[key] - child = - previous === child - ? previous - : typeof previous === 'object' - ? replaceEqualDeep(previous, child, _nullProto, _depth) - : child - } - copy[key] = j < i ? previous : child - } else { - copy[key] = prevKeys[j] - } - } - return copy + return prevSize === nextSize && equalItems === prevSize ? prev : copy } -export function isPlainObject(o: unknown): boolean { - if (!o || typeof o !== 'object') { +/** + * Equivalent to `Reflect.ownKeys`, but ensures that objects are "clone-friendly": + * will return false if object has any non-enumerable properties. + * + * Optimized for the common case where objects have no symbol properties. + */ +function getEnumerableOwnKeys(o: object) { + // `Object.keys` returns only enumerable own string keys natively (no per-key + // JS callback). If it has fewer entries than `getOwnPropertyNames` (all own + // string keys), the object has a non-enumerable own string prop and is not + // "clone-friendly" -> bail. This replaces an O(n) loop of + // `propertyIsEnumerable` calls with two native calls. + const keys = Object.keys(o) + if (keys.length !== Object.getOwnPropertyNames(o).length) { return false } - // An own constructor is data, so classify the actual prototype. - return (Object.getPrototypeOf(o)?.constructor ?? Object) === Object + + // Only check symbols if the object has any (most plain objects don't) + const symbols = Object.getOwnPropertySymbols(o) + + // Fast path: no symbols, return enumerable string keys directly + if (symbols.length === 0) { + return keys + } + + // Slow path: has symbols, include only enumerable ones, bail on any + // non-enumerable symbol so it round-trips like the string-key check above. + for (const symbol of symbols) { + if (!isEnumerable.call(o, symbol)) { + return false + } + ;(keys as Array).push(symbol) + } + return keys +} + +// Copied from: https://github.com/jonschlinkert/is-plain-object +export function isPlainObject(o: any) { + if (!hasObjectPrototype(o)) { + return false + } + + // If has modified constructor + const ctor = o.constructor + if (typeof ctor === 'undefined') { + return true + } + + // If has modified prototype + const prot = ctor.prototype + if (!hasObjectPrototype(prot)) { + return false + } + + // If constructor does not have an Object-specific method + if (!prot.hasOwnProperty('isPrototypeOf')) { + return false + } + + // Most likely a plain Object + return true +} + +function hasObjectPrototype(o: any) { + return Object.prototype.toString.call(o) === '[object Object]' } /** @@ -368,48 +363,44 @@ export function isPlainArray(value: unknown): value is Array { } /** - * Perform a deep equality check optimized for router state comparisons. - * - * - `partial`: `b` may omit keys that `a` has (arrays stay length-exact). - * - `explicitUndefined`: keys holding `undefined` take part in the comparison - * instead of being ignored. - * - * Internal: the flags are positional so hot callers pass no options object. + * Perform a deep equality check with options for partial comparison and + * ignoring `undefined` values. Optimized for router state comparisons. */ export function deepEqual( a: any, b: any, - partial?: boolean, - explicitUndefined?: boolean, + opts?: { partial?: boolean; ignoreUndefined?: boolean }, ): boolean { if (a === b) { return true } + if (typeof a !== typeof b) { + return false + } + if (Array.isArray(a) && Array.isArray(b)) { if (a.length !== b.length) return false for (let i = 0, l = a.length; i < l; i++) { - const av = a[i] - const bv = b[i] - if (av !== bv && !deepEqual(av, bv, partial, explicitUndefined)) { - return false - } + if (!deepEqual(a[i], b[i], opts)) return false } return true } if (isPlainObject(a) && isPlainObject(b)) { - if (partial) { + const ignoreUndefined = opts?.ignoreUndefined ?? true + + if (opts?.partial) { for (const k in b) { - if (explicitUndefined || b[k] !== undefined) { - if (!deepEqual(a[k], b[k], partial, explicitUndefined)) return false + if (!ignoreUndefined || b[k] !== undefined) { + if (!deepEqual(a[k], b[k], opts)) return false } } return true } let aCount = 0 - if (explicitUndefined) { + if (!ignoreUndefined) { aCount = Object.keys(a).length } else { for (const k in a) { @@ -417,18 +408,15 @@ export function deepEqual( } } + let bCount = 0 for (const k in b) { - if (explicitUndefined || b[k] !== undefined) { - if ( - aCount-- === 0 || - !deepEqual(a[k], b[k], partial, explicitUndefined) - ) { - return false - } + if (!ignoreUndefined || b[k] !== undefined) { + bCount++ + if (bCount > aCount || !deepEqual(a[k], b[k], opts)) return false } } - return aCount === 0 + return aCount === bCount } return false @@ -720,12 +708,11 @@ export function decodePath(path: string) { * encodePathLikeUrl('/path/already%20encoded') // '/path/already%20encoded' (preserved) */ export function encodePathLikeUrl(path: string): string { - // Encode whitespace and non-ASCII characters that browsers encode in URLs. - // The test uses one character class: it matches the same code units as the - // replacement pattern below and is cheaper than the alternation. - if (!/[\s\u0080-\uFFFF]/.test(path)) { - return path - } + // Encode whitespace and non-ASCII characters that browsers encode in URLs + + // biome-ignore lint/suspicious/noControlCharactersInRegex: intentional ASCII range check + // eslint-disable-next-line no-control-regex + if (!/\s|[^\u0000-\u007F]/.test(path)) return path // biome-ignore lint/suspicious/noControlCharactersInRegex: intentional ASCII range check // eslint-disable-next-line no-control-regex return path.replace(/\s|[^\u0000-\u007F]/gu, encodeURIComponent) diff --git a/packages/router-core/tests/RawStream.test.ts b/packages/router-core/tests/RawStream.test.ts index aa3a2aca48..106f0a7c21 100644 --- a/packages/router-core/tests/RawStream.test.ts +++ b/packages/router-core/tests/RawStream.test.ts @@ -1,100 +1,10 @@ -import { describe, expect, it, vi } from 'vitest' +import { describe, expect, it } from 'vitest' +import { toCrossJSONAsync, fromCrossJSON } from 'seroval' import { - createStream, - crossSerializeStream, - toCrossJSONAsync, - toCrossJSONStream, - fromCrossJSON, -} from 'seroval' -import type { SerovalNode } from 'seroval' -import { RawStream } from '../src/ssr/serializer/RawStream' -import { - RawStreamJSONDeserializePlugin, - RawStreamJSONPlugin, - createRawStreamJSONPlugin, -} from '../src/ssr/serializer/RawStreamJSONPlugin' -import { - createRawStreamDeserializePlugin, + RawStream, createRawStreamRPCPlugin, -} from '../src/ssr/serializer/RawStreamRPCPlugin' -import { RawStreamSSRPlugin } from '../src/ssr/serializer/RawStreamSSRPlugin' -import { - defaultSerovalDeserializerPlugins, - defaultSerovalPlugins, -} from '../src/ssr/serializer/seroval-plugins' - -type EncodedStream = ReturnType> -type EncodedStreamListener = Parameters[0] -type RawStreamFactory = (stream: EncodedStream) => ReadableStream - -function getRawStreamFactory( - pluginIndex: number, - emitted: boolean, -): RawStreamFactory { - if (emitted) { - const plugin = RawStreamSSRPlugin.extends![pluginIndex]! - const source = (plugin.serialize as () => string)() - return new Function(`return ${source}`)() as RawStreamFactory - } - - return (stream) => { - const textNode = {} as SerovalNode - const streamNode = {} as SerovalNode - return (RawStreamJSONDeserializePlugin.deserialize as any)( - { text: textNode, stream: streamNode }, - { - deserialize(node: SerovalNode) { - return node === textNode ? pluginIndex === 1 : stream - }, - }, - ) - } -} - -function createTrackedEncodedStream() { - const listeners = new Set() - let unsubscribeCalls = 0 - const stream: EncodedStream = { - __SEROVAL_STREAM__: true, - on(listener) { - listeners.add(listener) - let subscribed = true - return () => { - if (subscribed) { - subscribed = false - unsubscribeCalls++ - listeners.delete(listener) - } - } - }, - next(value) { - for (const listener of listeners) { - listener.next(value) - } - }, - throw(value) { - for (const listener of listeners) { - listener.throw(value) - } - listeners.clear() - }, - return(value) { - for (const listener of listeners) { - listener.return(value) - } - listeners.clear() - }, - } - return { - stream, - get listenerCount() { - return listeners.size - }, - get unsubscribeCalls() { - return unsubscribeCalls - }, - } -} + createRawStreamDeserializePlugin, +} from '../src/ssr/serializer/RawStream' describe('RawStream', () => { describe('RawStream class', () => { @@ -135,7 +45,7 @@ describe('RawStream', () => { }) describe('createRawStreamRPCPlugin', () => { - it('should call onRawStream callback with stream id and stream', () => { + it('should call onRawStream callback with stream id and stream', async () => { const collectedStreams = new Map>() const plugin = createRawStreamRPCPlugin((id, stream) => { @@ -151,10 +61,9 @@ describe('RawStream', () => { const rawStream = new RawStream(testStream) - toCrossJSONStream(rawStream, { + await toCrossJSONAsync(rawStream, { refs: new Map(), plugins: [plugin], - onParse() {}, }) expect(collectedStreams.size).toBe(1) @@ -164,19 +73,15 @@ describe('RawStream', () => { expect(streamEntry![1]).toBe(testStream) }) - it('should serialize with tss/RawStream tag', () => { + it('should serialize with tss/RawStream tag', async () => { const plugin = createRawStreamRPCPlugin(() => {}) const testStream = new ReadableStream() const rawStream = new RawStream(testStream) - const serialized = new Array() - toCrossJSONStream(rawStream, { + const serialized = await toCrossJSONAsync(rawStream, { refs: new Map(), plugins: [plugin], - onParse(value) { - serialized.push(value) - }, }) // The serialized output should have the plugin tag and contain streamId @@ -185,7 +90,7 @@ describe('RawStream', () => { expect(jsonStr).toContain('streamId') }) - it('should collect multiple streams with unique ids', () => { + it('should collect multiple streams with unique ids', async () => { const collectedStreams = new Map>() const plugin = createRawStreamRPCPlugin((id, stream) => { @@ -200,10 +105,9 @@ describe('RawStream', () => { second: new RawStream(stream2), } - toCrossJSONStream(data, { + await toCrossJSONAsync(data, { refs: new Map(), plugins: [plugin], - onParse() {}, }) expect(collectedStreams.size).toBe(2) @@ -212,190 +116,62 @@ describe('RawStream', () => { }) }) - describe('round-trip serialization', () => { - it('does not acquire the source reader when hint parsing fails', async () => { - const getReader = vi.fn() - const stream = { getReader } as unknown as ReadableStream - const failure = new Error('hint parse failed') - const parse = RawStreamJSONPlugin.parse.async! as any - - await expect( - parse(new RawStream(stream), { - parse: () => Promise.reject(failure), - }), - ).rejects.toBe(failure) - expect(getReader).not.toHaveBeenCalled() - }) - - it('does not acquire the source reader when request serialization is already aborted', async () => { - const getReader = vi.fn() - const stream = { getReader } as unknown as ReadableStream - const controller = new AbortController() - const reason = new Error('request aborted') - controller.abort(reason) - - await expect( - toCrossJSONAsync(new RawStream(stream), { - refs: new Map(), - plugins: [createRawStreamJSONPlugin(controller.signal)], - }), - ).rejects.toMatchObject({ cause: reason }) - expect(getReader).not.toHaveBeenCalled() - }) - - it('preserves malformed UTF-8 and BOM bytes in text chunks', async () => { - const cancel = vi.fn() - const stream = new ReadableStream({ + describe('createRawStreamDeserializePlugin', () => { + it('should reconstruct stream from getOrCreateStream function', () => { + const mockStream = new ReadableStream({ start(controller) { - controller.enqueue(Uint8Array.of(0x41, 0xe2)) - controller.enqueue(Uint8Array.of(0x28)) - controller.enqueue(Uint8Array.of(0xef, 0xbb, 0xbf, 0x42)) - controller.close() - }, - cancel, - }) - - const serialized = await new Promise>((resolve, reject) => { - const sources = new Array() - crossSerializeStream(new RawStream(stream, { hint: 'text' }), { - refs: new Map(), - plugins: [RawStreamSSRPlugin], - scopeId: 'raw-stream-test', - onSerialize(source) { - sources.push(source) - }, - onError: reject, - onDone() { - expect(stream.locked).toBe(false) - resolve(sources) - }, - }) - }) - - const output = serialized.join(';') - expect(output).toContain('QeI=') - expect(output).toContain('\ufeffB') - expect(cancel).not.toHaveBeenCalled() - expect(stream.locked).toBe(false) - }) - - it('preserves a UTF-8 character split across text chunks', async () => { - // Each half is invalid UTF-8 by itself. Text mode must encode both as - // binary instead of retaining decoder state across chunk boundaries. - const expected = [Uint8Array.of(0xf0, 0x9f), Uint8Array.of(0x98, 0x80)] - const input = new ReadableStream({ - start(controller) { - for (const chunk of expected) { - controller.enqueue(chunk) - } + controller.enqueue(new Uint8Array([42])) controller.close() }, }) - const serialized = await toCrossJSONAsync( - new RawStream(input, { hint: 'text' }), - { - refs: new Map(), - plugins: [RawStreamJSONPlugin], - }, - ) - const output = fromCrossJSON(serialized, { - refs: new Map(), - plugins: [RawStreamJSONDeserializePlugin], - }) as ReadableStream - const reader = output.getReader() + const streams = new Map>() + streams.set(5, mockStream) - await expect(reader.read()).resolves.toEqual({ - done: false, - value: expected[0], - }) - await expect(reader.read()).resolves.toEqual({ - done: false, - value: expected[1], - }) - await expect(reader.read()).resolves.toEqual({ - done: true, - value: undefined, - }) - }) - - it.each([ - ['default', 'binary', defaultSerovalDeserializerPlugins], - ['default', 'text', defaultSerovalDeserializerPlugins], - ['deserialize-only', 'binary', [RawStreamJSONDeserializePlugin]], - ['deserialize-only', 'text', [RawStreamJSONDeserializePlugin]], - ] as const)( - 'preserves every %s-plugin decoded %s-hinted chunk through async JSON', - async (_, hint, deserializePlugins) => { - const expected = [ - new Uint8Array(), - Uint8Array.of(0x41, 0x42), - Uint8Array.of(0x41, 0xe2), - Uint8Array.of(0xef, 0xbb, 0xbf, 0x42), - ] - const input = new ReadableStream({ - start(controller) { - for (const chunk of expected) { - controller.enqueue(chunk) - } - controller.close() - }, - }) - - const serialized = await toCrossJSONAsync( - new RawStream(input, { hint }), - { - refs: new Map(), - plugins: [RawStreamJSONPlugin], - }, - ) - const output = fromCrossJSON(serialized, { - refs: new Map(), - plugins: [...deserializePlugins], - }) as ReadableStream - const reader = output.getReader() - const actual: Array = [] - - while (true) { - const next = await reader.read() - if (next.done) { - break - } - actual.push(next.value) + // getOrCreateStream function that returns from map + const getOrCreateStream = (id: number) => { + let stream = streams.get(id) + if (!stream) { + stream = new ReadableStream() + streams.set(id, stream) } + return stream + } - expect(actual.map((chunk) => Array.from(chunk))).toEqual( - expected.map((chunk) => Array.from(chunk)), - ) - }, - ) + const plugin = createRawStreamDeserializePlugin(getOrCreateStream) - it('round-trips: client default plugins write, deserializer plugins read', async () => { - const input = new ReadableStream({ - start(controller) { - controller.enqueue(Uint8Array.of(1, 2, 3)) - controller.close() - }, - }) - const serialized = await toCrossJSONAsync( - { stream: new RawStream(input), error: new Error('boom') }, - { refs: new Map(), plugins: defaultSerovalPlugins }, - ) - const output = fromCrossJSON(serialized, { - refs: new Map(), - plugins: defaultSerovalDeserializerPlugins, - }) as { stream: ReadableStream; error: Error } + // Simulate seroval calling deserialize with a node + const node = { streamId: 5 } - expect(output.error).toBeInstanceOf(Error) - expect(output.error.message).toBe('boom') - const reader = output.stream.getReader() - await expect(reader.read()).resolves.toEqual({ - done: false, - value: Uint8Array.of(1, 2, 3), - }) - await expect(reader.read()).resolves.toMatchObject({ done: true }) + // Access the deserialize function directly + const deserializedStream = (plugin as any).deserialize(node, {}) + + expect(deserializedStream).toBe(mockStream) }) + it('should create stream if not found', () => { + const streams = new Map>() + + const getOrCreateStream = (id: number) => { + let stream = streams.get(id) + if (!stream) { + stream = new ReadableStream() + streams.set(id, stream) + } + return stream + } + + const plugin = createRawStreamDeserializePlugin(getOrCreateStream) + + const node = { streamId: 999 } + + const result = (plugin as any).deserialize(node, {}) + expect(result).toBeInstanceOf(ReadableStream) + expect(streams.get(999)).toBe(result) + }) + }) + + describe('round-trip serialization', () => { it('should serialize and deserialize RawStream correctly', async () => { // Collect streams during serialization const collectedStreams = new Map>() @@ -417,13 +193,9 @@ describe('RawStream', () => { // Serialize using RPC plugin const refs = new Map() - let serialized: SerovalNode | undefined - toCrossJSONStream(data, { + const serialized = await toCrossJSONAsync(data, { refs, plugins: [rpcPlugin], - onParse(value) { - serialized = value - }, }) // Verify we collected the stream @@ -444,7 +216,7 @@ describe('RawStream', () => { createRawStreamDeserializePlugin(getOrCreateStream) // Deserialize - const deserialized = fromCrossJSON(serialized!, { + const deserialized = fromCrossJSON(serialized, { refs: new Map(), plugins: [deserializePlugin], }) as any @@ -453,176 +225,4 @@ describe('RawStream', () => { expect(deserialized.rawData).toBe(testStream) }) }) - - describe('SSR stream lifecycle', () => { - it.each(['chunk', 'eof', 'error'] as const)( - 'ignores a late %s read result after disposal', - async (settlement) => { - let resolveRead!: (result: ReadableStreamReadResult) => void - let rejectRead!: (error: unknown) => void - const readResult = new Promise>( - (resolve, reject) => { - resolveRead = resolve - rejectRead = reject - }, - ) - const reader = { - read: vi.fn(() => readResult), - cancel: vi.fn(() => Promise.resolve()), - releaseLock: vi.fn(), - } - const readable = { - getReader: () => reader, - } as unknown as ReadableStream - const sources = new Array() - const dispose = crossSerializeStream(new RawStream(readable), { - refs: new Map(), - plugins: [RawStreamSSRPlugin], - scopeId: 'raw-stream-disposal-test', - onSerialize(source) { - sources.push(source) - }, - }) - - expect(reader.read).toHaveBeenCalledTimes(1) - const sourceCount = sources.length - dispose() - dispose() - expect(reader.cancel).toHaveBeenCalledTimes(1) - expect(reader.releaseLock).toHaveBeenCalledTimes(1) - - if (settlement === 'error') { - rejectRead(new Error('late read failure')) - } else { - resolveRead( - settlement === 'eof' - ? { done: true, value: undefined } - : { done: false, value: Uint8Array.of(1) }, - ) - } - await Promise.resolve() - await Promise.resolve() - - expect(sources).toHaveLength(sourceCount) - expect(reader.read).toHaveBeenCalledTimes(1) - expect(reader.cancel).toHaveBeenCalledTimes(1) - expect(reader.releaseLock).toHaveBeenCalledTimes(1) - }, - ) - }) - - describe.each([ - { hint: 'binary', pluginIndex: 0, encoded: 'QQ==' }, - { hint: 'text', pluginIndex: 1, encoded: 'tA' }, - ] as const)('$hint browser factory', ({ pluginIndex, encoded }) => { - it.each([ - ['local', false], - ['emitted', true], - ] as const)( - 'unsubscribes the %s factory on cancellation', - async (_, emitted) => { - const factory = getRawStreamFactory(pluginIndex, emitted) - const encodedStream = createTrackedEncodedStream() - const output = factory(encodedStream.stream) - const reader = output.getReader() - - expect(encodedStream.listenerCount).toBe(1) - encodedStream.stream.next(encoded) - const chunk = await reader.read() - expect(chunk.done).toBe(false) - expect(Array.from(chunk.value!)).toEqual([65]) - - await reader.cancel() - await reader.cancel() - expect(encodedStream.unsubscribeCalls).toBe(1) - expect(encodedStream.listenerCount).toBe(0) - - encodedStream.stream.next(encoded) - expect(encodedStream.listenerCount).toBe(0) - }, - ) - - it.each([ - ['local', false], - ['emitted', true], - ] as const)( - 'does not retain a synchronous terminal disposer in the %s factory', - async (_, emitted) => { - const unsubscribe = vi.fn() - const stream = { - __SEROVAL_STREAM__: true, - on(listener: EncodedStreamListener) { - listener.next(encoded) - listener.return(undefined) - return unsubscribe - }, - next() {}, - throw() {}, - return() {}, - } as EncodedStream - const reader = getRawStreamFactory( - pluginIndex, - emitted, - )(stream).getReader() - - expect(unsubscribe).toHaveBeenCalledTimes(emitted ? 0 : 1) - await reader.cancel() - expect(unsubscribe).toHaveBeenCalledTimes(emitted ? 0 : 1) - }, - ) - - it.each([false, true])( - 'disposes a malformed buffered JSON stream (ended: %s)', - async (ended) => { - const stream = createStream() - stream.next(pluginIndex === 1 ? 'b%' : '%') - stream.next(encoded) - if (ended) { - stream.return(undefined) - } - const on = stream.on.bind(stream) - const unsubscribe = vi.fn() - vi.spyOn(stream, 'on').mockImplementation((listener) => { - unsubscribe.mockImplementation(on(listener)) - return unsubscribe - }) - - const reader = getRawStreamFactory( - pluginIndex, - false, - )(stream).getReader() - - expect(unsubscribe).toHaveBeenCalledOnce() - await expect(reader.read()).rejects.toMatchObject({ - name: 'InvalidCharacterError', - }) - stream.next(encoded) - await expect(reader.cancel()).rejects.toMatchObject({ - name: 'InvalidCharacterError', - }) - expect(unsubscribe).toHaveBeenCalledOnce() - reader.releaseLock() - }, - ) - - it.each([ - ['local', false], - ['emitted', true], - ] as const)( - 'does not retain a live terminal disposer in the %s factory', - async (_, emitted) => { - const encodedStream = createTrackedEncodedStream() - const reader = getRawStreamFactory( - pluginIndex, - emitted, - )(encodedStream.stream).getReader() - - encodedStream.stream.next(encoded) - encodedStream.stream.return(undefined) - await reader.cancel() - - expect(encodedStream.unsubscribeCalls).toBe(0) - }, - ) - }) }) diff --git a/packages/router-core/tests/build-location.bench.ts b/packages/router-core/tests/build-location.bench.ts deleted file mode 100644 index 2b93731d2c..0000000000 --- a/packages/router-core/tests/build-location.bench.ts +++ /dev/null @@ -1,155 +0,0 @@ -import { describe, expect, test } from 'vitest' -import { createMemoryHistory } from '@tanstack/history' -import { BaseRootRoute, BaseRoute, retainSearchParams } from '../src' -import { createTestRouter } from './routerTestUtils' -import type { AnyRouter, ParsedLocation } from '../src' - -// Mirrors what `useLinkProps` does on every location publication: each link -// owns one stable `dest` object, points `_fromLocation` at the new location -// and calls `router.buildLocation(dest)` inside its store selector. - -const LINKS = 32 - -function createBenchRouter(withMiddleware: boolean) { - const root = new BaseRootRoute({ - validateSearch: (search: Record) => ({ - page: Number(search.page ?? 1), - }), - }) - const posts = new BaseRoute({ - getParentRoute: () => root, - path: '/posts', - // Only routes with middleware get a `search` key, like real route trees. - ...(withMiddleware - ? { search: { middlewares: [retainSearchParams(['page'])] } } - : {}), - } as any) - const post = new BaseRoute({ - getParentRoute: () => posts, - path: '/$postId', - }) - const edit = new BaseRoute({ - getParentRoute: () => post, - path: '/edit', - }) - const history = createMemoryHistory({ initialEntries: ['/posts/1?page=2'] }) - const router = createTestRouter({ - routeTree: root.addChildren([ - posts.addChildren([post.addChildren([edit])]), - ]), - history, - scrollRestoration: false, - }) - history.destroy() - return router -} - -type Dest = Record & { _fromLocation?: ParsedLocation } - -function publication(router: AnyRouter, dests: Array) { - // A fresh location object per publication, like a committed navigation. - const location = { ...router.latestLocation } - let checksum = 0 - for (const dest of dests) { - dest._fromLocation = location - checksum += router.buildLocation(dest as any).href.length - } - return checksum -} - -function defineCase( - name: string, - withMiddleware: boolean, - makeDest: (index: number) => Dest, - expectedHref: (index: number) => string, -) { - const router = createBenchRouter(withMiddleware) - const dests = Array.from({ length: LINKS }, (_, index) => makeDest(index)) - const expected = dests.reduce( - (sum, _dest, index) => sum + expectedHref(index).length, - 0, - ) - // Correctness before timing: every link resolves to the expected href. - dests.forEach((dest, index) => { - dest._fromLocation = router.latestLocation - expect(router.buildLocation(dest as any).href).toBe(expectedHref(index)) - }) - let checksum = 0 - test(name, async ({ bench }) => { - await bench( - name, - { - afterAll: () => { - expect(checksum).toBe(expected) - }, - }, - () => { - checksum = publication(router, dests) - }, - ).run({ - time: 1000, - warmupTime: 200, - throws: true, - }) - }) -} - -describe(`buildLocation per publication (${LINKS} links)`, () => { - defineCase( - 'absolute to + literal params (static cache hit)', - false, - (index) => ({ to: '/posts/$postId', params: { postId: String(index) } }), - (index) => `/posts/${index}`, - ) - - defineCase( - 'absolute to + search updater (reads current search)', - false, - (index) => ({ - to: '/posts', - search: (prev: Record) => ({ ...prev, page: index }), - }), - (index) => `/posts?page=${index}`, - ) - - defineCase( - 'absolute to + search updater + retainSearchParams middleware', - true, - (index) => ({ - to: '/posts/$postId', - params: { postId: String(index) }, - search: () => ({ page: index }), - }), - (index) => `/posts/${index}?page=${index}`, - ) - - defineCase( - 'relative to from the current match', - false, - (index) => ({ - to: './edit', - search: (prev: unknown) => prev, - hash: `h${index}`, - }), - (index) => `/posts/1/edit?page=2#h${index}`, - ) - - defineCase( - 'params: true (inherits current params)', - false, - (index) => ({ to: '/posts/$postId/edit', params: true, hash: `h${index}` }), - (index) => `/posts/1/edit#h${index}`, - ) - - defineCase( - 'masked destination', - false, - (index) => ({ - to: '/posts/$postId', - params: { postId: String(index) }, - search: () => ({ page: index }), - mask: { to: '/posts' }, - }), - (index) => `/posts/${index}?page=${index}`, - ) -}) diff --git a/packages/router-core/tests/build-location.test.ts b/packages/router-core/tests/build-location.test.ts index 99bbbc60cf..edb763fa03 100644 --- a/packages/router-core/tests/build-location.test.ts +++ b/packages/router-core/tests/build-location.test.ts @@ -1,16 +1,14 @@ import { describe, expect, test, vi } from 'vitest' import { createMemoryHistory } from '@tanstack/history' -import { isServer as serverEnvironment } from '@tanstack/router-core/isServer' -import * as pathUtils from '../src/path' import { BaseRootRoute, BaseRoute, retainSearchParams, stripSearchParams, } from '../src' +import type { SearchMiddleware } from '../src' import { _getUserHistoryState } from '../src/router' import { createTestRouter } from './routerTestUtils' -import type { SearchMiddleware } from '../src' test('_getUserHistoryState removes volatile router bookkeeping but keeps mask payloads', () => { expect( @@ -26,37 +24,6 @@ test('_getUserHistoryState removes volatile router bookkeeping but keeps mask pa ).toEqual({ user: 'state', __tempLocation: {}, __tempKey: 'temp-key' }) }) -test.each([false, true])( - 'interpolates matches from raw params when router.isServer is %s', - (isServer) => { - expect(serverEnvironment).toBeUndefined() - const rootRoute = new BaseRootRoute({}) - const route = new BaseRoute({ - getParentRoute: () => rootRoute, - path: '/items/$id', - }) - const router = createTestRouter({ - routeTree: rootRoute.addChildren([route]), - history: createMemoryHistory({ initialEntries: ['/items/one'] }), - isServer, - }) - const interpolate = vi.spyOn(pathUtils, 'interpolatePath') - try { - const matches = router.matchRoutes('/items/one', {}) - expect(matches.at(-1)?.pathname).toBe('/items/one') - const call = interpolate.mock.calls.find( - ([path]) => path === '/items/$id', - ) - expect(call).toHaveLength(5) - expect(call?.[1]).toBe(route._interpolation) - expect(call?.[2]).toEqual({ id: 'one' }) - expect(matches.at(-1)?._strictParams).toEqual({ id: 'one' }) - } finally { - interpolate.mockRestore() - } - }, -) - describe('buildLocation - params function receives parsed params', () => { test('prev params should contain parsed params from route params.parse', async () => { const rootRoute = new BaseRootRoute({}) @@ -267,45 +234,6 @@ describe('buildLocation - params function receives parsed params', () => { }) describe('buildLocation - search params', () => { - test('collects updated middleware options from the whole route branch', () => { - const rootRoute = new BaseRootRoute({ - search: { - middlewares: [({ search, next }) => next({ ...search, root: true })], - }, - }) - const route = new BaseRoute({ - getParentRoute: () => rootRoute, - path: '/', - search: { - middlewares: [ - ({ search, next }) => ({ ...next(search), value: 'initial' }), - ], - }, - }) - const router = createTestRouter({ - routeTree: rootRoute.addChildren([route]), - history: createMemoryHistory({ initialEntries: ['/'] }), - }) - const buildSearch = () => - router.buildLocation({ to: '/', search: true }).search - - expect(buildSearch()).toEqual({ root: true, value: 'initial' }) - - route.update({ - search: { - middlewares: [ - ({ search, next }) => ({ ...next(search), value: 'updated' }), - ], - }, - }) - expect(buildSearch()).toEqual({ root: true, value: 'updated' }) - - route.update({ search: { middlewares: [] } }) - expect(buildSearch()).toEqual({ root: true }) - rootRoute.update({ search: { middlewares: [] } }) - expect(buildSearch()).toEqual({}) - }) - test('only applies route validation when requested', async () => { const events: Array = [] const validateSearch = vi.fn((search: Record) => { @@ -1299,6 +1227,40 @@ describe('buildLocation - state', () => { expect(location.state).not.toBe(emptyState) }) + test('explicit state structurally shares unchanged nested values', async () => { + const rootRoute = new BaseRootRoute({}) + const postsRoute = new BaseRoute({ + getParentRoute: () => rootRoute, + path: '/posts', + }) + const history = createMemoryHistory({ initialEntries: ['/posts'] }) + history.replace('/posts', { + user: { id: 1, name: 'Test' }, + count: 1, + }) + const router = createTestRouter({ + routeTree: rootRoute.addChildren([postsRoute]), + history, + }) + await router.load() + + const currentState = router.state.location.state as any + const location = router.buildLocation({ + to: '/posts', + state: { + user: { id: 1, name: 'Test' }, + count: 2, + } as any, + }) + + expect(location.state).toEqual({ + user: { id: 1, name: 'Test' }, + count: 2, + }) + expect((location.state as any).user).toBe(currentState.user) + expect(location.state).not.toBe(currentState) + }) + test('state can contain complex nested objects', async () => { const rootRoute = new BaseRootRoute({}) const postsRoute = new BaseRoute({ @@ -1330,160 +1292,6 @@ describe('buildLocation - state', () => { }) }) -describe('buildLocation - no structural sharing with the current location', () => { - function createPostsRouter( - history = createMemoryHistory({ initialEntries: ['/posts'] }), - ) { - const rootRoute = new BaseRootRoute({}) - const postsRoute = new BaseRoute({ - getParentRoute: () => rootRoute, - path: '/posts', - }) - return createTestRouter({ - routeTree: rootRoute.addChildren([postsRoute]), - history, - }) - } - - test('explicit state is returned as-is and equal nested values are shared only after navigation', async () => { - const history = createMemoryHistory({ initialEntries: ['/posts'] }) - history.replace('/posts', { - user: { id: 1, name: 'Test' }, - count: 1, - }) - const router = createPostsRouter(history) - await router.load() - - const previousState = router.state.location.state as any - const nextState = { - user: { id: 1, name: 'Test' }, - count: 2, - } - const location = router.buildLocation({ - to: '/posts', - state: nextState as any, - }) - - // The built location carries the caller's object untouched. - expect(location.state).toBe(nextState) - expect((location.state as any).user).not.toBe(previousState.user) - - await router.navigate({ to: '/posts', state: nextState as any }) - - // parseLocation still stabilizes the committed state against the - // previous one, which is what location selectors rely on. - const committedState = router.state.location.state as any - expect(committedState).toMatchObject({ - user: { id: 1, name: 'Test' }, - count: 2, - }) - expect(committedState).not.toBe(previousState) - expect(committedState.user).toBe(previousState.user) - expect(nextState.user).not.toBe(previousState.user) - }) - - test('explicit search is returned as-is and equal nested values are shared only after navigation', async () => { - const router = createPostsRouter() - await router.load() - - await router.navigate({ - to: '/posts', - search: { page: 1, filter: { tags: ['a'] } } as any, - }) - const previousSearch = router.state.location.search as any - expect(previousSearch).toEqual({ page: 1, filter: { tags: ['a'] } }) - - const nextSearch = { page: 2, filter: { tags: ['a'] } } - const location = router.buildLocation({ - to: '/posts', - search: nextSearch as any, - }) - - expect(location.search).toBe(nextSearch) - expect((location.search as any).filter).not.toBe(previousSearch.filter) - - await router.navigate({ to: '/posts', search: nextSearch as any }) - - const committedSearch = router.state.location.search as any - expect(committedSearch).toEqual({ page: 2, filter: { tags: ['a'] } }) - expect(committedSearch).not.toBe(previousSearch) - expect(committedSearch.filter).toBe(previousSearch.filter) - expect(nextSearch.filter).not.toBe(previousSearch.filter) - }) - - test('navigate does not mutate a caller-supplied state object', async () => { - const history = createMemoryHistory({ initialEntries: ['/posts'] }) - const router = createPostsRouter(history) - await router.load() - - const state = { user: { id: 1 } } - await router.navigate({ - to: '/posts', - state: state as any, - hashScrollIntoView: true, - }) - - expect(state).toEqual({ user: { id: 1 } }) - expect(Object.keys(state)).toEqual(['user']) - const committedState = router.state.location.state as any - expect(committedState).not.toBe(state) - expect(committedState.user).toBe(state.user) - expect(committedState.__hashScrollIntoViewOptions).toBe(true) - expect(committedState.__TSR_key).toBeTypeOf('string') - expect(committedState.key).toBe(committedState.__TSR_key) - - // A frozen state (for example produced by an immutable store) commits - // without any write hitting it: in strict mode such a write would throw. - const frozenState = Object.freeze({ user: Object.freeze({ id: 2 }) }) - await router.navigate({ to: '/posts', state: frozenState as any }) - - expect(router.state.location.state).toMatchObject({ user: { id: 2 } }) - expect(router.state.location.state).not.toBe(frozenState) - expect(history.length).toBe(3) - }) - - test('an equal search in a different key order serializes in the requested order', async () => { - const router = createPostsRouter( - createMemoryHistory({ initialEntries: ['/posts?a=1&b=2'] }), - ) - await router.load() - - expect(router.state.location.href).toBe('/posts?a=1&b=2') - - const location = router.buildLocation({ - to: '/posts', - search: { b: 2, a: 1 } as any, - }) - - expect(location.search).toEqual({ a: 1, b: 2 }) - expect(Object.keys(location.search)).toEqual(['b', 'a']) - expect(location.searchStr).toBe('?b=2&a=1') - expect(location.href).toBe('/posts?b=2&a=1') - }) - - test('navigating to an equal search in a different key order pushes a new history entry', async () => { - const history = createMemoryHistory({ initialEntries: ['/posts?a=1&b=2'] }) - const router = createPostsRouter(history) - await router.load() - - expect(history.length).toBe(1) - - // Same contents and order: nothing to commit. - await router.navigate({ to: '/posts', search: { a: 1, b: 2 } as any }) - - expect(history.length).toBe(1) - expect(router.state.location.href).toBe('/posts?a=1&b=2') - - // Same contents, different order: the URL changes, so history grows. - await router.navigate({ to: '/posts', search: { b: 2, a: 1 } as any }) - - expect(history.length).toBe(2) - expect(history.location.href).toBe('/posts?b=2&a=1') - expect(router.state.location.href).toBe('/posts?b=2&a=1') - expect(router.state.location.search).toEqual({ a: 1, b: 2 }) - }) -}) - describe('buildLocation - relative paths', () => { test('absolute path should navigate to exact route', async () => { const rootRoute = new BaseRootRoute({}) @@ -1845,127 +1653,6 @@ describe('buildLocation - basepath', () => { }) describe('buildLocation - params edge cases', () => { - test.each([false, true])( - 'keeps cached raw params intact across mutating lightweight parsers (throws: %s)', - (throws) => { - const root = new BaseRootRoute({}) - const parse = vi.fn((params: Record) => { - expect(params.id).toBe('original') - params.id = 'parsed' - if (throws) { - throw new Error('parse failed') - } - return { id: params.id } - }) - const item = new BaseRoute({ - getParentRoute: () => root, - path: '/items/$id', - }) - const history = createMemoryHistory({ - initialEntries: ['/items/original'], - }) - const router = createTestRouter({ - routeTree: root.addChildren([item]), - history, - }) - // Isolate live lightweight parsing from the matcher's captured route gate. - item.options.params = { parse } - const update = vi.fn((params: Record) => { - expect(params.id).toBe('parsed') - return { id: 'target' } - }) - try { - for (let repeat = 0; repeat < 2; repeat++) { - const location = router.buildLocation({ - to: '/items/$id', - _fromLocation: { ...router.latestLocation }, - params: update, - }) - expect(location.pathname).toBe('/items/target') - expect(router.getMatchedRoutes('/items/original')[1]).toEqual({ - id: 'original', - }) - } - expect(parse).toHaveBeenCalledTimes(2) - expect(parse.mock.calls[0]![0]).not.toBe(parse.mock.calls[1]![0]) - expect(update).toHaveBeenCalledTimes(2) - } finally { - history.destroy() - } - }, - ) - - test('isolates mutating params updaters while preserving inherit and clear modes', () => { - const rootRoute = new BaseRootRoute({}) - const userRoute = new BaseRoute({ - getParentRoute: () => rootRoute, - path: '/users/{-$userId}', - }) - const history = createMemoryHistory({ initialEntries: ['/users/123'] }) - const router = createTestRouter({ - routeTree: rootRoute.addChildren([userRoute]), - history, - }) - const updater = vi.fn((params: { userId?: string }) => { - expect(Object.getPrototypeOf(params)).toBeNull() - expect(params).toEqual({ userId: '123' }) - params.userId = '456' - return params - }) - - try { - for (let i = 0; i < 2; i++) { - expect( - router.buildLocation({ - to: '/users/{-$userId}', - params: updater, - }).pathname, - ).toBe('/users/456') - } - expect(updater).toHaveBeenCalledTimes(2) - expect(updater.mock.calls[0]![0]).not.toBe(updater.mock.calls[1]![0]) - expect(router.buildLocation({ to: '/users/{-$userId}' }).pathname).toBe( - '/users/123', - ) - expect( - router.buildLocation({ to: '/users/{-$userId}', params: true }) - .pathname, - ).toBe('/users/123') - expect( - router.buildLocation({ to: '/users/{-$userId}', params: false }) - .pathname, - ).toBe('/users') - } finally { - history.destroy() - } - }) - - test('copies static param getters once without mutating inherited params', () => { - const rootRoute = new BaseRootRoute({}) - const userRoute = new BaseRoute({ - getParentRoute: () => rootRoute, - path: '/users/$userId', - }) - const router = createTestRouter({ - routeTree: rootRoute.addChildren([userRoute]), - history: createMemoryHistory({ initialEntries: ['/users/123'] }), - }) - const getUserId = vi.fn(() => '456') - const params = { - get userId() { - return getUserId() - }, - } - - expect( - router.buildLocation({ to: '/users/$userId', params }).pathname, - ).toBe('/users/456') - expect(getUserId).toHaveBeenCalledOnce() - expect( - router.buildLocation({ to: '/users/$userId', params: true }).pathname, - ).toBe('/users/123') - }) - test('params: true should preserve current params', async () => { const rootRoute = new BaseRootRoute({}) const userRoute = new BaseRoute({ diff --git a/packages/router-core/tests/cache-commit.bench.ts b/packages/router-core/tests/cache-commit.bench.ts index d570e55bf2..221836aa29 100644 --- a/packages/router-core/tests/cache-commit.bench.ts +++ b/packages/router-core/tests/cache-commit.bench.ts @@ -1,4 +1,4 @@ -import { describe, expect, test } from 'vitest' +import { bench, describe, expect } from 'vitest' import { commitMatches } from '../src/load-client' import type { AnyRouteMatch, AnyRouter } from '../src' import type { LoaderFlight, LoadTransaction } from '../src/load-client' @@ -99,21 +99,15 @@ for (const family of ['snapshots', 'mixed flights', 'preload flights']) { } } const batch = size <= 100 ? 100 : 1 - 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, - }) - }) + bench( + `${retainedFraction * 100}% retained (${batch} commits)`, + () => { + for (let index = 0; index < batch; index++) { + 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 053aa645ac..16650d7c4b 100644 --- a/packages/router-core/tests/cache-navigation.bench.ts +++ b/packages/router-core/tests/cache-navigation.bench.ts @@ -1,4 +1,4 @@ -import { describe, expect, test } from 'vitest' +import { bench, describe, expect } from 'vitest' import { createMemoryHistory } from '@tanstack/history' import { BaseRootRoute, BaseRoute } from '../src' import { createTestRouter } from './routerTestUtils' @@ -42,11 +42,9 @@ for (const size of [0, 100, 1000, 5000]) { expect(router._cache.size).toBe(size) expect(router.state.location.pathname).toBe('/') describe(`${size} cached preloads`, () => { - test('two unrelated navigations', async ({ bench }) => { - await bench('two unrelated navigations', navigate).run({ - time: 1000, - warmupTime: 200, - }) + bench('two unrelated navigations', navigate, { + time: 1000, + warmupTime: 200, }) }) } diff --git a/packages/router-core/tests/client-lane-adversarial.test.ts b/packages/router-core/tests/client-lane-adversarial.test.ts index 4924576759..dbcc15fed8 100644 --- a/packages/router-core/tests/client-lane-adversarial.test.ts +++ b/packages/router-core/tests/client-lane-adversarial.test.ts @@ -674,27 +674,21 @@ describe('adversarial client lane ownership', () => { expect(contextWorkAborted).toBe(true) }) - test.each([ - { - isServer: false, - thrownType: 'AbortSignal', - createThrownValue: (signal: AbortSignal) => signal, - }, - { - isServer: false, - thrownType: 'AbortError', - createThrownValue: () => - new DOMException('The operation was aborted.', 'AbortError'), - }, - { - isServer: true, - thrownType: 'AbortError', - createThrownValue: () => - Object.assign(new Error('The operation was aborted.'), { - name: 'AbortError', - }), - }, - ])( + test.each( + ([false, true] as const).flatMap((isServer) => [ + { + isServer, + thrownType: 'AbortSignal', + createThrownValue: (signal: AbortSignal) => signal, + }, + { + isServer, + thrownType: 'AbortError', + createThrownValue: () => + new DOMException('The operation was aborted.', 'AbortError'), + }, + ]), + )( 'treats a user-thrown $thrownType in beforeLoad as an ordinary route error (isServer=$isServer)', async ({ isServer, createThrownValue }) => { let matchSignal: AbortSignal | undefined @@ -724,8 +718,7 @@ describe('adversarial client lane ownership', () => { } const match = router.state.matches.at(-1) - // The payload finished, so the controller is left alone on both sides. - expect(matchSignal?.aborted).toBe(false) + expect(matchSignal?.aborted).toBe(isServer) expect(match).toMatchObject({ routeId: brokenRoute.id, status: 'error', diff --git a/packages/router-core/tests/closing-tag-detection.bench.ts b/packages/router-core/tests/closing-tag-detection.bench.ts index 641c016bb4..5a52f6c580 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 { describe, test } from 'vitest' +import { bench, describe } from 'vitest' const BODY_END_TAG = '' const MIN_CLOSING_TAG_LENGTH = 4 @@ -680,284 +680,204 @@ verifyBodyImplementations() describe('Closing Tag Detection - Small Chunk (~70 chars)', () => { const chunk = generateSmallChunk() - test('regex', async ({ bench }) => { - await bench('regex', () => { - findLastClosingTagRegex(chunk) - }).run() + bench('regex', () => { + findLastClosingTagRegex(chunk) }) - test('manual backwards scan', async ({ bench }) => { - await bench('manual backwards scan', () => { - findLastClosingTagManual(chunk) - }).run() + bench('manual backwards scan', () => { + findLastClosingTagManual(chunk) }) - test('optimized (charCodeAt)', async ({ bench }) => { - await bench('optimized (charCodeAt)', () => { - findLastClosingTagOptimized(chunk) - }).run() + bench('optimized (charCodeAt)', () => { + findLastClosingTagOptimized(chunk) }) - test('hybrid (lastIndexOf + validation)', async ({ bench }) => { - await bench('hybrid (lastIndexOf + validation)', () => { - findLastClosingTagHybrid(chunk) - }).run() + bench('hybrid (lastIndexOf + validation)', () => { + findLastClosingTagHybrid(chunk) }) }) describe('Closing Tag Detection - Medium Chunk (~1.5KB)', () => { const chunk = generateMediumChunk() - test('regex', async ({ bench }) => { - await bench('regex', () => { - findLastClosingTagRegex(chunk) - }).run() + bench('regex', () => { + findLastClosingTagRegex(chunk) }) - test('manual backwards scan', async ({ bench }) => { - await bench('manual backwards scan', () => { - findLastClosingTagManual(chunk) - }).run() + bench('manual backwards scan', () => { + findLastClosingTagManual(chunk) }) - test('optimized (charCodeAt)', async ({ bench }) => { - await bench('optimized (charCodeAt)', () => { - findLastClosingTagOptimized(chunk) - }).run() + bench('optimized (charCodeAt)', () => { + findLastClosingTagOptimized(chunk) }) - test('hybrid (lastIndexOf + validation)', async ({ bench }) => { - await bench('hybrid (lastIndexOf + validation)', () => { - findLastClosingTagHybrid(chunk) - }).run() + bench('hybrid (lastIndexOf + validation)', () => { + findLastClosingTagHybrid(chunk) }) }) describe('Closing Tag Detection - Large Chunk (~13KB)', () => { const chunk = generateLargeChunk() - test('regex', async ({ bench }) => { - await bench('regex', () => { - findLastClosingTagRegex(chunk) - }).run() + bench('regex', () => { + findLastClosingTagRegex(chunk) }) - test('manual backwards scan', async ({ bench }) => { - await bench('manual backwards scan', () => { - findLastClosingTagManual(chunk) - }).run() + bench('manual backwards scan', () => { + findLastClosingTagManual(chunk) }) - test('optimized (charCodeAt)', async ({ bench }) => { - await bench('optimized (charCodeAt)', () => { - findLastClosingTagOptimized(chunk) - }).run() + bench('optimized (charCodeAt)', () => { + findLastClosingTagOptimized(chunk) }) - test('hybrid (lastIndexOf + validation)', async ({ bench }) => { - await bench('hybrid (lastIndexOf + validation)', () => { - findLastClosingTagHybrid(chunk) - }).run() + bench('hybrid (lastIndexOf + validation)', () => { + findLastClosingTagHybrid(chunk) }) }) describe('Closing Tag Detection - Web Components', () => { const chunk = generateWebComponentChunk() - test('regex', async ({ bench }) => { - await bench('regex', () => { - findLastClosingTagRegex(chunk) - }).run() + bench('regex', () => { + findLastClosingTagRegex(chunk) }) - test('manual backwards scan', async ({ bench }) => { - await bench('manual backwards scan', () => { - findLastClosingTagManual(chunk) - }).run() + bench('manual backwards scan', () => { + findLastClosingTagManual(chunk) }) - test('optimized (charCodeAt)', async ({ bench }) => { - await bench('optimized (charCodeAt)', () => { - findLastClosingTagOptimized(chunk) - }).run() + bench('optimized (charCodeAt)', () => { + findLastClosingTagOptimized(chunk) }) - test('hybrid (lastIndexOf + validation)', async ({ bench }) => { - await bench('hybrid (lastIndexOf + validation)', () => { - findLastClosingTagHybrid(chunk) - }).run() + bench('hybrid (lastIndexOf + validation)', () => { + findLastClosingTagHybrid(chunk) }) }) describe('Closing Tag Detection - No Closing Tags (worst case for regex)', () => { const chunk = generateNoClosingTagChunk() - test('regex', async ({ bench }) => { - await bench('regex', () => { - findLastClosingTagRegex(chunk) - }).run() + bench('regex', () => { + findLastClosingTagRegex(chunk) }) - test('manual backwards scan', async ({ bench }) => { - await bench('manual backwards scan', () => { - findLastClosingTagManual(chunk) - }).run() + bench('manual backwards scan', () => { + findLastClosingTagManual(chunk) }) - test('optimized (charCodeAt)', async ({ bench }) => { - await bench('optimized (charCodeAt)', () => { - findLastClosingTagOptimized(chunk) - }).run() + bench('optimized (charCodeAt)', () => { + findLastClosingTagOptimized(chunk) }) - test('hybrid (lastIndexOf + validation)', async ({ bench }) => { - await bench('hybrid (lastIndexOf + validation)', () => { - findLastClosingTagHybrid(chunk) - }).run() + bench('hybrid (lastIndexOf + validation)', () => { + findLastClosingTagHybrid(chunk) }) }) describe('Closing Tag Detection - Nested React-like Structure', () => { const chunk = generateNestedChunk() - test('regex', async ({ bench }) => { - await bench('regex', () => { - findLastClosingTagRegex(chunk) - }).run() + bench('regex', () => { + findLastClosingTagRegex(chunk) }) - test('manual backwards scan', async ({ bench }) => { - await bench('manual backwards scan', () => { - findLastClosingTagManual(chunk) - }).run() + bench('manual backwards scan', () => { + findLastClosingTagManual(chunk) }) - test('optimized (charCodeAt)', async ({ bench }) => { - await bench('optimized (charCodeAt)', () => { - findLastClosingTagOptimized(chunk) - }).run() + bench('optimized (charCodeAt)', () => { + findLastClosingTagOptimized(chunk) }) - test('hybrid (lastIndexOf + validation)', async ({ bench }) => { - await bench('hybrid (lastIndexOf + validation)', () => { - findLastClosingTagHybrid(chunk) - }).run() + bench('hybrid (lastIndexOf + validation)', () => { + findLastClosingTagHybrid(chunk) }) }) describe('Closing Tag Detection - Partial Chunk (streaming edge case)', () => { const chunk = generatePartialChunk() - test('regex', async ({ bench }) => { - await bench('regex', () => { - findLastClosingTagRegex(chunk) - }).run() + bench('regex', () => { + findLastClosingTagRegex(chunk) }) - test('manual backwards scan', async ({ bench }) => { - await bench('manual backwards scan', () => { - findLastClosingTagManual(chunk) - }).run() + bench('manual backwards scan', () => { + findLastClosingTagManual(chunk) }) - test('optimized (charCodeAt)', async ({ bench }) => { - await bench('optimized (charCodeAt)', () => { - findLastClosingTagOptimized(chunk) - }).run() + bench('optimized (charCodeAt)', () => { + findLastClosingTagOptimized(chunk) }) - test('hybrid (lastIndexOf + validation)', async ({ bench }) => { - await bench('hybrid (lastIndexOf + validation)', () => { - findLastClosingTagHybrid(chunk) - }).run() + bench('hybrid (lastIndexOf + validation)', () => { + findLastClosingTagHybrid(chunk) }) }) function benchBodyEndTagDetection(name: string, chunk: string) { describe(`Body End Tag Detection - ${name}`, () => { - test('forward charCodeAt', async ({ bench }) => { - await bench('forward charCodeAt', () => { - findBodyEndTagForward(chunk) - }).run() + bench('forward charCodeAt', () => { + findBodyEndTagForward(chunk) }) - test('backward charCodeAt', async ({ bench }) => { - await bench('backward charCodeAt', () => { - findBodyEndTagBackward(chunk) - }).run() + bench('backward charCodeAt', () => { + findBodyEndTagBackward(chunk) }) - test('lastIndexOf( { - await bench('lastIndexOf( { - findBodyEndTagLastOpenSlash(chunk) - }).run() + bench('lastIndexOf( { + findBodyEndTagLastOpenSlash(chunk) }) - test('native lowercase + lastIndexOf( { - await bench('native lowercase + lastIndexOf( { - findBodyEndTagNativeLowerThenLastOpenSlash(chunk) - }).run() + bench('native lowercase + lastIndexOf( { + findBodyEndTagNativeLowerThenLastOpenSlash(chunk) }) - test('combined boundary scan', async ({ bench }) => { - await bench('combined boundary scan', () => { - findHtmlBoundaryCombined(chunk).bodyEndIndex - }).run() + bench('combined boundary scan', () => { + findHtmlBoundaryCombined(chunk).bodyEndIndex }) }) } function benchBoundaryDetection(name: string, chunk: string) { describe(`HTML Boundary Detection - ${name}`, () => { - 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('current two-step forward body + last closing', () => { + const bodyEndIndex = findBodyEndTagForward(chunk) + if (bodyEndIndex === -1) { + findLastClosingTagOptimized(chunk) + } }) - test('lastIndexOf( { - await bench('lastIndexOf( { - const bodyEndIndex = findBodyEndTagLastOpenSlash(chunk) - if (bodyEndIndex === -1) { - findLastClosingTagOptimized(chunk) - } - }).run() + bench('lastIndexOf( { + const bodyEndIndex = findBodyEndTagLastOpenSlash(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('native lowercase body + last closing', () => { + const bodyEndIndex = findBodyEndTagNativeLowerThenLastOpenSlash(chunk) + if (bodyEndIndex === -1) { + findLastClosingTagOptimized(chunk) + } }) - test('fused lastIndexOf( { - await bench('fused lastIndexOf( { - findHtmlBoundaryLastOpenSlash(chunk) - }).run() + bench('fused lastIndexOf( { + findHtmlBoundaryLastOpenSlash(chunk) }) - test('lazy fused lastIndexOf( { - await bench('lazy fused lastIndexOf( { - findHtmlBoundaryLastOpenSlashLazy(chunk) - }).run() + bench('lazy fused lastIndexOf( { + findHtmlBoundaryLastOpenSlashLazy(chunk) }) - test('lazy encoded lastIndexOf( { - await bench('lazy encoded lastIndexOf( { - findHtmlBoundaryLastOpenSlashLazyEncoded(chunk) - }).run() + bench('lazy encoded lastIndexOf( { + findHtmlBoundaryLastOpenSlashLazyEncoded(chunk) }) - test('combined boundary scan', async ({ bench }) => { - await bench('combined boundary scan', () => { - findHtmlBoundaryCombined(chunk) - }).run() + bench('combined boundary scan', () => { + findHtmlBoundaryCombined(chunk) }) }) } diff --git a/packages/router-core/tests/curly-params-smoke.test.ts b/packages/router-core/tests/curly-params-smoke.test.ts index c566b99d2f..c52a6b33ec 100644 --- a/packages/router-core/tests/curly-params-smoke.test.ts +++ b/packages/router-core/tests/curly-params-smoke.test.ts @@ -1,6 +1,5 @@ import { describe, expect, test } from 'vitest' -import { findRouteMatch } from '../src/new-process-route-tree' -import { processTestRouteTree as processRouteTree } from './routerTestUtils' +import { findRouteMatch, processRouteTree } from '../src/new-process-route-tree' const testCases = [ { diff --git a/packages/router-core/tests/deep-equal-contract.test.ts b/packages/router-core/tests/deep-equal-contract.test.ts deleted file mode 100644 index 70f0adda6f..0000000000 --- a/packages/router-core/tests/deep-equal-contract.test.ts +++ /dev/null @@ -1,111 +0,0 @@ -import { describe, expect, it } from 'vitest' -import { deepEqual } from '../src/utils' - -// Pins the observable contract of `deepEqual` (including existing quirks) so -// performance work on its loops cannot change it silently. -describe('deepEqual contract', () => { - it.each([ - [undefined, undefined], - [true, undefined], - [undefined, true], - [true, true], - ] as const)( - 'compares nested records and arrays with partial=%s explicitUndefined=%s', - (partial, explicitUndefined) => { - const a = Object.freeze({ - page: 1, - nested: Object.freeze({ ids: Object.freeze([1, 2]) }), - }) - expect( - deepEqual( - a, - { page: 1, nested: { ids: [1, 2] } }, - partial, - explicitUndefined, - ), - ).toBe(true) - expect( - deepEqual( - a, - { page: 1, nested: { ids: [1, 3] } }, - partial, - explicitUndefined, - ), - ).toBe(false) - }, - ) - - it('keeps partial comparison directional and arrays length-exact', () => { - expect(deepEqual({ a: 1, b: 2 }, { a: 1 }, true)).toBe(true) - expect(deepEqual({ a: 1 }, { a: 1, b: 2 }, true)).toBe(false) - expect(deepEqual([1, 2], [1], true)).toBe(false) - }) - - it('retains inherited enumeration, symbols, and hidden-property policy', () => { - const a = Object.assign(Object.create({ inherited: 1 }), { own: 2 }) - expect(deepEqual(a, { inherited: 1, own: 2 })).toBe(true) - const s = Symbol('metadata') - expect(deepEqual({ [s]: 1 }, { [s]: 2 })).toBe(true) - expect( - deepEqual(Object.defineProperty({}, 'hidden', { value: 1 }), {}), - ).toBe(true) - }) - - it('retains current undefined-key behavior rather than changing the contract', () => { - expect(deepEqual({ a: undefined }, {})).toBe(true) - expect(deepEqual({ a: undefined }, {}, false, true)).toBe(false) - // Existing quirk: this performance patch deliberately does NOT repair it. - expect(deepEqual({ a: undefined }, { b: undefined }, false, true)).toBe( - true, - ) - expect(deepEqual({}, { a: undefined }, true, true)).toBe(true) - }) - - it('retains numeric equality', () => { - expect(deepEqual(-0, 0)).toBe(true) - expect(deepEqual([NaN], [NaN])).toBe(false) - expect( - deepEqual([1n, Infinity, undefined], [1n, Infinity, undefined]), - ).toBe(true) - }) - - it('preserves default-mode getter read order', () => { - const reads: Array = [] - const a = { - get x() { - reads.push('a') - return 1 - }, - } - const b = { - get x() { - reads.push('b') - return 1 - }, - } - expect(deepEqual(a, b)).toBe(true) - expect(reads).toEqual(['a', 'b', 'a', 'b']) - }) - - it('does not read an excess comparison value in exact-defined mode', () => { - const b = { - get x() { - throw new Error('must not read') - }, - } - expect(deepEqual({}, b, false, true)).toBe(false) - }) - - it('short-circuits identical children', () => { - const shared = {} - expect(deepEqual(shared, shared, true, true)).toBe(true) - expect(deepEqual([shared], [shared], true, true)).toBe(true) - }) - - it('keeps different class instances opaque', () => { - class Foo { - value = 1 - } - expect(deepEqual(new Foo(), new Foo())).toBe(false) - }) -}) diff --git a/packages/router-core/tests/deep-equal.bench.ts b/packages/router-core/tests/deep-equal.bench.ts deleted file mode 100644 index c796add1ac..0000000000 --- a/packages/router-core/tests/deep-equal.bench.ts +++ /dev/null @@ -1,166 +0,0 @@ -import { describe, expect, test } from 'vitest' -import { deepEqual } from '../src/utils' - -// Workloads modeled on the router's callers: Link inline-option stabilization -// (`explicitUndefined`), active-state search comparison (`partial`), -// matchRoute params (`partial`), and search-middleware value comparisons. -// Inputs rotate over a pool so a single hidden-class or cached shape does not -// dominate; the "fresh" cases build their incoming value inside the timed op. -// -// Always compare implementations with the whole file in one process: the -// cases share `deepEqual`'s type feedback and inlining decisions, and a `-t` -// subset can rank variants very differently from the mixed-mode reality. - -const search = { page: 1, sort: 'asc', filter: 'open', tags: ['a', 'b'] } -const searchEqual = Array.from({ length: 32 }, () => ({ - page: 1, - sort: 'asc', - filter: 'open', - tags: ['a', 'b'], -})) -const searchChangedLate = Array.from({ length: 32 }, () => ({ - page: 1, - sort: 'asc', - filter: 'open', - tags: ['a', 'c'], -})) -const searchChangedEarly = Array.from({ length: 32 }, () => ({ - page: 2, - sort: 'asc', - filter: 'open', - tags: ['a', 'b'], -})) -const nested = { - user: { id: 7, roles: ['admin', 'editor'], prefs: { theme: 'dark' } }, - items: [{ id: 1 }, { id: 2 }, { id: 3 }], -} -const nestedEqual = Array.from({ length: 32 }, () => ({ - user: { id: 7, roles: ['admin', 'editor'], prefs: { theme: 'dark' } }, - items: [{ id: 1 }, { id: 2 }, { id: 3 }], -})) -const numbers = Array.from({ length: 32 }, (_, index) => index) -const numbersEqual = Array.from({ length: 32 }, () => - Array.from({ length: 32 }, (_, index) => index), -) -// Link.tsx stabilizes `[search, params, activeOptions]`-like inline values. -const linkOptions = Array.from({ length: 100 }, (_, index) => [ - { page: index, sort: 'asc' }, - { id: String(index) }, - { exact: false, includeSearch: true, includeHash: undefined }, -]) -const linkOptionsEqual = linkOptions.map((entry) => - entry.map((value) => ({ ...value })), -) -const shared = { ...search, tags: search.tags } - -let sink = 0 -let cursor = 0 -const next = (pool: Array) => pool[cursor++ & 31]! - -expect(deepEqual(search, searchEqual[0])).toBe(true) -expect(deepEqual(search, searchChangedLate[0])).toBe(false) -expect(deepEqual(search, searchChangedEarly[0])).toBe(false) -expect(deepEqual(nested, nestedEqual[0])).toBe(true) -expect(deepEqual(numbers, numbersEqual[0])).toBe(true) -expect(deepEqual(search, shared)).toBe(true) -for (let index = 0; index < linkOptions.length; index++) { - for (let slot = 0; slot < 3; slot++) { - expect( - deepEqual( - linkOptions[index]![slot], - linkOptionsEqual[index]![slot], - false, - true, - ), - ).toBe(true) - } -} - -describe('deepEqual', () => { - const options = { time: 1000, warmupTime: 200 } - - test('equal flat search record (default)', async ({ bench }) => { - await bench('equal flat search record (default)', () => { - sink += +deepEqual(search, next(searchEqual)) - }).run(options) - }) - - 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) - }).run(options) - }) - - test('equal flat record (explicitUndefined)', async ({ bench }) => { - await bench('equal flat record (explicitUndefined)', () => { - sink += +deepEqual(search, next(searchEqual), false, true) - }).run(options) - }) - - test('equal flat record (partial)', async ({ bench }) => { - await bench('equal flat record (partial)', () => { - sink += +deepEqual(search, next(searchEqual), true) - }).run(options) - }) - - test('late mismatch in a nested array (default)', async ({ bench }) => { - await bench('late mismatch in a nested array (default)', () => { - sink += +deepEqual(search, next(searchChangedLate)) - }).run(options) - }) - - test('early mismatch (default)', async ({ bench }) => { - await bench('early mismatch (default)', () => { - sink += +deepEqual(search, next(searchChangedEarly)) - }).run(options) - }) - - test('equal nested record (default)', async ({ bench }) => { - await bench('equal nested record (default)', () => { - sink += +deepEqual(nested, next(nestedEqual)) - }).run(options) - }) - - test('equal array of 32 numbers', async ({ bench }) => { - await bench('equal array of 32 numbers', () => { - sink += +deepEqual(numbers, next(numbersEqual)) - }).run(options) - }) - - 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, - ) - }).run(options) - }) - - test('fresh partial mismatch', async ({ bench }) => { - await bench('fresh partial mismatch', () => { - sink += +deepEqual(search, { page: 1, sort: 'desc' }, true) - }).run(options) - }) - - 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) - } - } - }, - ).run(options) - }) -}) - -// Keep the results observable so the comparisons cannot be optimized away. -expect(sink).toBeGreaterThanOrEqual(0) diff --git a/packages/router-core/tests/document-navigation.test.ts b/packages/router-core/tests/document-navigation.test.ts index 6c6424b01f..dc769da17a 100644 --- a/packages/router-core/tests/document-navigation.test.ts +++ b/packages/router-core/tests/document-navigation.test.ts @@ -177,13 +177,13 @@ describe('document navigation', () => { expect(windowLocation.replace).not.toHaveBeenCalled() }) - test('ignores server navigation to an external output', async () => { + test('keeps server commits in memory history', async () => { const { router, history } = setupRouter({ isServer: true }) vi.stubGlobal('window', undefined) await router.navigate({ to: '/admin' }) - expect(history.location.href).toBe('/') + expect(history.location.href).toBe(externalHref) }) test.each([ diff --git a/packages/router-core/tests/fallback-route-lifecycle.bench.ts b/packages/router-core/tests/fallback-route-lifecycle.bench.ts index 16468d473e..5542aee292 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 { describe, expect, test } from 'vitest' +import { bench, describe, expect } 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) { - test(name, async ({ bench }) => { - await bench(name, () => { + bench( + name, + () => { for (let i = 0; i < 100; i++) { router._lifecycleEnd = previousEnd run(router, previous, matches, owner) } - }).run({ - time: 300, - }) - }) + }, + { time: 300 }, + ) } }) } diff --git a/packages/router-core/tests/getNormalizedURL.test.ts b/packages/router-core/tests/getNormalizedURL.test.ts index 89cca987b7..f07316fe55 100644 --- a/packages/router-core/tests/getNormalizedURL.test.ts +++ b/packages/router-core/tests/getNormalizedURL.test.ts @@ -2,21 +2,6 @@ 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 b862a35b7d..3d0bf8fbbc 100644 --- a/packages/router-core/tests/history-normalization.test.ts +++ b/packages/router-core/tests/history-normalization.test.ts @@ -190,26 +190,4 @@ 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/htmlBoundaryScanner.test.ts b/packages/router-core/tests/htmlBoundaryScanner.test.ts deleted file mode 100644 index 05dfa5543e..0000000000 --- a/packages/router-core/tests/htmlBoundaryScanner.test.ts +++ /dev/null @@ -1,256 +0,0 @@ -import { describe, expect, test } from 'vitest' -import { - HYDRATION_SCRIPT_BOUNDARY_ANCHOR_INDEX, - HYDRATION_SCRIPT_BOUNDARY_BYTES, - createHydrationScripts, -} from '../src/ssr/hydrationScripts' -import { - DOCUMENT_CLOSE_ANCHOR_INDEX, - DOCUMENT_CLOSE_BYTES, - SCRIPT_CLOSE, - SCRIPT_CLOSE_ANCHOR_INDEX, - SCRIPT_CLOSE_BYTES, - advanceByteMatcher, - findExactBytes, - getExactBytesPrefixAtEnd, -} from '../src/ssr/htmlBoundaryScanner' -import type { ByteMatcherState } from '../src/ssr/htmlBoundaryScanner' - -const encoder = new TextEncoder() -const decoder = new TextDecoder() -const DOCUMENT_CLOSE = decoder.decode(DOCUMENT_CLOSE_BYTES) -const HYDRATION_SCRIPT_BOUNDARY_SUFFIX = decoder.decode( - HYDRATION_SCRIPT_BOUNDARY_BYTES, -) -const HYDRATION_SCRIPT_BOUNDARY_SOURCE = createHydrationScripts( - undefined, - [], -).takeInitialHydrationScriptTags()!.boundary.children! - -function chunksAtEverySplit(value: Uint8Array) { - return Array.from({ length: value.length + 1 }, (_, split) => [ - value.subarray(0, split), - value.subarray(split), - ]) -} - -function matcherFor(pattern: Uint8Array, anchorIndex = 0): ByteMatcherState { - return { pattern, anchorIndex, matched: 0 } -} - -describe('SSR exact byte matcher', () => { - test.each([ - [ - 'router boundary', - HYDRATION_SCRIPT_BOUNDARY_BYTES, - HYDRATION_SCRIPT_BOUNDARY_ANCHOR_INDEX, - ], - ['script close', SCRIPT_CLOSE_BYTES, SCRIPT_CLOSE_ANCHOR_INDEX], - ])('matches %s at every two-chunk split', (_, pattern, anchorIndex) => { - for (const chunks of chunksAtEverySplit(pattern)) { - const matcher = matcherFor(pattern, anchorIndex) - let matches = 0 - for (const chunk of chunks) { - if (advanceByteMatcher(matcher, chunk) !== undefined) { - matches++ - } - } - expect(matches).toBe(1) - } - }) - - test.each([ - [ - 'router boundary', - HYDRATION_SCRIPT_BOUNDARY_BYTES, - HYDRATION_SCRIPT_BOUNDARY_ANCHOR_INDEX, - ], - ['script close', SCRIPT_CLOSE_BYTES, SCRIPT_CLOSE_ANCHOR_INDEX], - ])('matches byte-at-a-time %s input', (_, pattern, anchorIndex) => { - const matcher = matcherFor(pattern, anchorIndex) - let matches = 0 - for (const byte of pattern) { - if (advanceByteMatcher(matcher, Uint8Array.of(byte)) !== undefined) { - matches++ - } - } - expect(matches).toBe(1) - }) - - test('returns the local end offset and keeps the unconsumed suffix', () => { - const matcher = matcherFor(SCRIPT_CLOSE_BYTES) - const prefix = encoder.encode('prefix') - const suffix = encoder.encode('') - const value = new Uint8Array( - prefix.length + SCRIPT_CLOSE_BYTES.length + suffix.length, - ) - value.set(prefix) - value.set(SCRIPT_CLOSE_BYTES, prefix.length) - value.set(suffix, prefix.length + SCRIPT_CLOSE_BYTES.length) - - const end = advanceByteMatcher(matcher, value) - expect(end).toBe(prefix.length + SCRIPT_CLOSE_BYTES.length) - expect(new TextDecoder().decode(value.subarray(end))).toBe('') - }) - - test('can find the last complete match without stopping at the first', () => { - const matcher = matcherFor(SCRIPT_CLOSE_BYTES, SCRIPT_CLOSE_ANCHOR_INDEX) - const value = encoder.encode('
') - - const end = advanceByteMatcher(matcher, value, 0, true) - expect(new TextDecoder().decode(value.subarray(0, end))).toBe( - '
', - ) - }) - - test.each([ - [ - 'router boundary', - HYDRATION_SCRIPT_BOUNDARY_BYTES, - HYDRATION_SCRIPT_BOUNDARY_ANCHOR_INDEX, - ], - ['script close', SCRIPT_CLOSE_BYTES, SCRIPT_CLOSE_ANCHOR_INDEX], - ])('%s satisfies the matcher invariants', (_, pattern, anchorIndex) => { - expect(pattern.length).toBeGreaterThan(0) - expect(pattern.indexOf(pattern[0]!, 1)).toBe(-1) - expect(anchorIndex).toBeGreaterThanOrEqual(0) - expect(anchorIndex).toBeLessThan(pattern.length) - }) - - test.each(['one chunk', 'split after the old overlapping prefix'])( - 'ignores marker text without the fixed semicolon in %s', - (shape) => { - const markerAndClose = HYDRATION_SCRIPT_BOUNDARY_BYTES.subarray(1) - const value = new Uint8Array(24 + markerAndClose.length - 1) - value.set(markerAndClose.subarray(0, 24)) - value.set(markerAndClose.subarray(1), 24) - const chunks = - shape === 'one chunk' - ? [value] - : [value.subarray(0, 24), value.subarray(24)] - const matcher = matcherFor( - HYDRATION_SCRIPT_BOUNDARY_BYTES, - HYDRATION_SCRIPT_BOUNDARY_ANCHOR_INDEX, - ) - - let consumed = 0 - let matchEnd: number | undefined - for (const chunk of chunks) { - const localEnd = advanceByteMatcher(matcher, chunk) - if (localEnd !== undefined) { - matchEnd = consumed + localEnd - } - consumed += chunk.length - } - - expect(matchEnd).toBeUndefined() - }, - ) - - test.each(['one chunk', 'split before the valid boundary'])( - 'restarts at a valid boundary after a near match in %s', - (shape) => { - const nearMatch = HYDRATION_SCRIPT_BOUNDARY_BYTES.subarray(0, 12) - const value = new Uint8Array( - nearMatch.length + HYDRATION_SCRIPT_BOUNDARY_BYTES.length, - ) - value.set(nearMatch) - value.set(HYDRATION_SCRIPT_BOUNDARY_BYTES, nearMatch.length) - const chunks = - shape === 'one chunk' - ? [value] - : [ - value.subarray(0, nearMatch.length), - value.subarray(nearMatch.length), - ] - const matcher = matcherFor( - HYDRATION_SCRIPT_BOUNDARY_BYTES, - HYDRATION_SCRIPT_BOUNDARY_ANCHOR_INDEX, - ) - - let consumed = 0 - let matchEnd: number | undefined - for (const chunk of chunks) { - const localEnd = advanceByteMatcher(matcher, chunk) - if (localEnd !== undefined) { - matchEnd = consumed + localEnd - } - consumed += chunk.length - } - - expect(matchEnd).toBe(value.length) - }, - ) - - test('reset drops an incomplete match', () => { - const matcher = matcherFor(SCRIPT_CLOSE_BYTES) - expect( - advanceByteMatcher(matcher, SCRIPT_CLOSE_BYTES.subarray(0, 5)), - ).toBeUndefined() - matcher.matched = 0 - expect( - advanceByteMatcher(matcher, SCRIPT_CLOSE_BYTES.subarray(5)), - ).toBeUndefined() - }) -}) - -describe('SSR exact byte helpers', () => { - test('scanner boundary is the exact end of the emitted script', () => { - expect(HYDRATION_SCRIPT_BOUNDARY_SUFFIX.endsWith(SCRIPT_CLOSE)).toBe(true) - expect( - HYDRATION_SCRIPT_BOUNDARY_SOURCE.endsWith( - HYDRATION_SCRIPT_BOUNDARY_SUFFIX.slice(0, -SCRIPT_CLOSE.length), - ), - ).toBe(true) - expect(HYDRATION_SCRIPT_BOUNDARY_BYTES).toEqual( - encoder.encode(HYDRATION_SCRIPT_BOUNDARY_SUFFIX), - ) - }) - - test('anchors document-close scans on the uncommon y byte', () => { - expect(DOCUMENT_CLOSE_ANCHOR_INDEX).toBe(DOCUMENT_CLOSE.indexOf('y')) - }) - - test('finds a complete sequence without decoding or copying', () => { - const prefix = encoder.encode('abc') - const value = new Uint8Array( - prefix.length + DOCUMENT_CLOSE_BYTES.length + 1, - ) - value.set(prefix) - value.set(DOCUMENT_CLOSE_BYTES, prefix.length) - value[value.length - 1] = 120 - - expect(findExactBytes(value, DOCUMENT_CLOSE_BYTES)).toBe(prefix.length) - expect(findExactBytes(value, DOCUMENT_CLOSE_BYTES, prefix.length + 1)).toBe( - -1, - ) - }) - - test('reports every incomplete document-close suffix', () => { - for (let length = 1; length < DOCUMENT_CLOSE_BYTES.length; length++) { - const prefix = encoder.encode('application') - const value = new Uint8Array(prefix.length + length) - value.set(prefix) - value.set(DOCUMENT_CLOSE_BYTES.subarray(0, length), prefix.length) - - expect(getExactBytesPrefixAtEnd(value, DOCUMENT_CLOSE_BYTES)).toBe( - prefix.length, - ) - } - }) - - test('uses the longest suffix when the pattern prefix overlaps', () => { - const pattern = encoder.encode('abab') - const value = encoder.encode('xxaba') - expect(getExactBytesPrefixAtEnd(value, pattern)).toBe(2) - }) - - test('returns no suffix for a final mismatch', () => { - expect( - getExactBytesPrefixAtEnd( - encoder.encode('application'), - SCRIPT_CLOSE_BYTES, - ), - ).toBeUndefined() - }) -}) diff --git a/packages/router-core/tests/hydrate.test.ts b/packages/router-core/tests/hydrate.test.ts index 37685b48ef..7ecec4a4e5 100644 --- a/packages/router-core/tests/hydrate.test.ts +++ b/packages/router-core/tests/hydrate.test.ts @@ -1,3 +1,4 @@ +import { runInNewContext } from 'node:vm' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { createMemoryHistory } from '@tanstack/history' import { @@ -9,9 +10,9 @@ import { notFound, } 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 { dehydrateSsrMatchId } from '../src/ssr/ssr-match-id' +import { createTestRouter } from './routerTestUtils' import type { AnyRouteMatch, AnyRouter, LocationRewrite } from '../src' import type { ServerManifest } from '../src/manifest' import type { TsrSsrGlobal } from '../src/ssr/types' @@ -34,6 +35,35 @@ function createMockBootstrap( } } +async function dehydrateToBootstrap( + router: AnyRouter, + manifest: ServerManifest = testManifest, +): Promise { + attachRouterServerSsrUtils({ router, manifest }) + try { + await router.load() + await router.serverSsr!.dehydrate() + + const script = router.serverSsr!.takeBufferedScripts() + expect(script?.children).toBeTruthy() + + const context: Record = { + document: { + currentScript: { + remove() {}, + }, + }, + } + context.self = context + runInNewContext(script!.children!, context) + + expect(context.$_TSR).toBeDefined() + return context.$_TSR + } finally { + router.serverSsr?.cleanup() + } +} + describe('hydrate', () => { let mockWindow: { $_TSR?: TsrSsrGlobal } let mockRouter: any @@ -189,40 +219,6 @@ 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({ @@ -236,7 +232,7 @@ describe('hydrate', () => { isServer: true, }) - mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter, testManifest) + mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter) expect(mockWindow.$_TSR.router?.matches[1]).not.toHaveProperty('l') const clientLoader = vi.fn(() => undefined) @@ -282,7 +278,7 @@ describe('hydrate', () => { isServer: true, }) - mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter, testManifest) + mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter) expect(mockWindow.$_TSR.router?.matches[1]).not.toHaveProperty('l') const parentError = new Error('parent reload failed') @@ -346,7 +342,7 @@ describe('hydrate', () => { isServer: true, }) - mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter, testManifest) + mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter) mockWindow.$_TSR.router!.matches[1]!.i = identity as string const clientLoader = vi.fn(() => 'client data') @@ -404,7 +400,7 @@ describe('hydrate', () => { isServer: true, }) - mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter, testManifest) + mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter) mockWindow.$_TSR.router!.matches[2]!.i = dehydrateSsrMatchId( '/different-child-match', ) @@ -482,7 +478,7 @@ describe('hydrate', () => { isServer: true, }) - mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter, testManifest) + mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter) expect(mockWindow.$_TSR.router?.matches).toHaveLength(3) const clientLoader = vi.fn(() => 'client data') @@ -540,7 +536,7 @@ describe('hydrate', () => { }) serverRouter.options.serializationAdapters = [adapter] - mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter, testManifest) + mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter) const clientLoader = vi.fn(() => new AdaptedValue('client loader data')) const clientRootRoute = new BaseRootRoute({}) @@ -581,7 +577,7 @@ describe('hydrate', () => { isServer: true, }) - mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter, testManifest) + mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter) expect(serverRouter.state.matches).toHaveLength(2) expect(serverRouter.state.matches[0]).toMatchObject({ @@ -639,7 +635,7 @@ describe('hydrate', () => { isServer: true, isShell: true, }) - mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter, testManifest) + mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter) const clientRootRoute = new BaseRootRoute({ notFoundComponent: () => 'Not Found', @@ -694,7 +690,7 @@ describe('hydrate', () => { isServer: true, }) - mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter, testManifest) + mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter) const clientLoader = vi.fn(() => 'client internal data') const clientRootRoute = new BaseRootRoute({}) @@ -703,12 +699,13 @@ describe('hydrate', () => { path: '/internal', loader: clientLoader, }) + let clientRouter: AnyRouter const customHydrate = vi.fn((dehydrated: { rewrite?: boolean }) => { if (dehydrated.rewrite) { clientRouter.update({ rewrite }) } }) - const clientRouter: AnyRouter = createTestRouter({ + clientRouter = createTestRouter({ routeTree: clientRootRoute.addChildren([clientInternalRoute]), history: createMemoryHistory({ initialEntries: ['/public'] }), hydrate: customHydrate, @@ -777,60 +774,3 @@ describe('hydrate', () => { ) }) }) - -describe('createSerializationAdapter key validation', () => { - function createAdapter(key: string) { - return createSerializationAdapter({ - key, - test: (value): value is string => typeof value === 'string', - toSerializable: (value) => value, - fromSerializable: (value) => value, - }) - } - - it('throws in development for empty or unsupported keys', () => { - for (const key of [ - '', - 'nul\0key', - 'bad"key', - 'back\\slash', - 'lt createAdapter(key)).toThrowError( - /createSerializationAdapter: key .* is invalid/s, - ) - } - }) - - it('accepts a key that Seroval preserves verbatim', () => { - expect(() => createAdapter('safe-key/v1.0_$-')).not.toThrow() - }) - - it('does not inspect the key in production', () => { - vi.stubEnv('NODE_ENV', 'production') - try { - const options = { - get key(): string { - throw new Error('production key was inspected') - }, - test: (value: unknown): value is string => typeof value === 'string', - toSerializable: (value: string) => value, - fromSerializable: (value: string) => value, - } - - expect(createSerializationAdapter(options)).toBe(options) - } finally { - vi.unstubAllEnvs() - } - }) -}) diff --git a/packages/router-core/tests/hydrated-stay-match-data.test.ts b/packages/router-core/tests/hydrated-stay-match-data.test.ts index 6e269e86c3..5f8333310a 100644 --- a/packages/router-core/tests/hydrated-stay-match-data.test.ts +++ b/packages/router-core/tests/hydrated-stay-match-data.test.ts @@ -1,13 +1,38 @@ +import { runInNewContext } from 'node:vm' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { createMemoryHistory } from '@tanstack/history' import { BaseRootRoute, BaseRoute } from '../src' import { hydrate } from '../src/ssr/client' -import { createTestRouter, dehydrateToBootstrap } from './routerTestUtils' +import { attachRouterServerSsrUtils } from '../src/ssr/ssr-server' +import { createTestRouter } from './routerTestUtils' +import type { AnyRouter } from '../src' import type { TsrSsrGlobal } from '../src/ssr/types' import type { ServerManifest } from '../src/manifest' const testManifest: ServerManifest = { routes: {} } +async function dehydrateToBootstrap(router: AnyRouter): Promise { + attachRouterServerSsrUtils({ router, manifest: testManifest }) + try { + await router.load() + await router.serverSsr!.dehydrate() + + const script = router.serverSsr!.takeBufferedScripts() + expect(script?.children).toBeTruthy() + + const context: Record = { + document: { currentScript: { remove() {} } }, + } + context.self = context + runInNewContext(script!.children!, context) + + expect(context.$_TSR).toBeDefined() + return context.$_TSR + } finally { + router.serverSsr?.cleanup() + } +} + describe('hydrated stay match data preservation', () => { let mockWindow: { $_TSR?: TsrSsrGlobal } @@ -45,7 +70,7 @@ describe('hydrated stay match data preservation', () => { isServer: true, }) - const bootstrap = await dehydrateToBootstrap(serverRouter, testManifest) + const bootstrap = await dehydrateToBootstrap(serverRouter) expect(serverRootBeforeLoad).toHaveBeenCalledTimes(1) expect(serverRootLoader).toHaveBeenCalledTimes(1) diff --git a/packages/router-core/tests/hydration-asset-context-order.test.ts b/packages/router-core/tests/hydration-asset-context-order.test.ts index 014e338b32..64ea28971e 100644 --- a/packages/router-core/tests/hydration-asset-context-order.test.ts +++ b/packages/router-core/tests/hydration-asset-context-order.test.ts @@ -1,14 +1,38 @@ +import { runInNewContext } from 'node:vm' import { afterEach, expect, test, vi } from 'vitest' import { createMemoryHistory } from '@tanstack/history' import { BaseRootRoute, BaseRoute } from '../src' import { hydrate } from '../src/ssr/client' -import { createTestRouter, dehydrateToBootstrap } from './routerTestUtils' -import type { AnyRouteMatch } from '../src' +import { attachRouterServerSsrUtils } from '../src/ssr/ssr-server' +import { createTestRouter } from './routerTestUtils' +import type { AnyRouteMatch, AnyRouter } from '../src' import type { ServerManifest } from '../src/manifest' import type { TsrSsrGlobal } from '../src/ssr/types' const testManifest: ServerManifest = { routes: {} } +async function dehydrateToBootstrap(router: AnyRouter): Promise { + attachRouterServerSsrUtils({ router, manifest: testManifest }) + try { + await router.load() + await router.serverSsr!.dehydrate() + + const script = router.serverSsr!.takeBufferedScripts() + expect(script?.children).toBeTruthy() + + const context: Record = { + document: { currentScript: { remove() {} } }, + } + context.self = context + runInNewContext(script!.children!, context) + + expect(context.$_TSR).toBeDefined() + return context.$_TSR + } finally { + router.serverSsr?.cleanup() + } +} + afterEach(() => { vi.restoreAllMocks() vi.unstubAllGlobals() @@ -30,7 +54,7 @@ test('hydration reconstructs every match context before ancestor head reads the isServer: true, }) - const bootstrap = await dehydrateToBootstrap(serverRouter, testManifest) + const bootstrap = await dehydrateToBootstrap(serverRouter) expect(serverBeforeLoad).toHaveBeenCalledTimes(1) expect(serverRouter.state.matches.at(-1)?.context).toMatchObject({ diff --git a/packages/router-core/tests/hydration-boundary-chunks.test.ts b/packages/router-core/tests/hydration-boundary-chunks.test.ts index 0d5c9a0af6..fe760e074a 100644 --- a/packages/router-core/tests/hydration-boundary-chunks.test.ts +++ b/packages/router-core/tests/hydration-boundary-chunks.test.ts @@ -1,13 +1,38 @@ +import { runInNewContext } from 'node:vm' import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest' import { createMemoryHistory } from '@tanstack/history' import { BaseRootRoute, BaseRoute, isNotFound, notFound } from '../src' import { hydrate } from '../src/ssr/client' -import { createTestRouter, dehydrateToBootstrap } from './routerTestUtils' +import { attachRouterServerSsrUtils } from '../src/ssr/ssr-server' +import { createTestRouter } from './routerTestUtils' +import type { AnyRouter } from '../src' import type { TsrSsrGlobal } from '../src/ssr/types' import type { ServerManifest } from '../src/manifest' const testManifest: ServerManifest = { routes: {} } +async function dehydrateToBootstrap(router: AnyRouter): Promise { + attachRouterServerSsrUtils({ router, manifest: testManifest }) + try { + await router.load() + await router.serverSsr!.dehydrate() + + const script = router.serverSsr!.takeBufferedScripts() + expect(script?.children).toBeTruthy() + + const context: Record = { + document: { currentScript: { remove() {} } }, + } + context.self = context + runInNewContext(script!.children!, context) + + expect(context.$_TSR).toBeDefined() + return context.$_TSR + } finally { + router.serverSsr?.cleanup() + } +} + describe('hydration route chunks below a server boundary', () => { let mockWindow: { $_TSR?: TsrSsrGlobal } @@ -39,7 +64,7 @@ describe('hydration route chunks below a server boundary', () => { isServer: true, }) - const bootstrap = await dehydrateToBootstrap(serverRouter, testManifest) + const bootstrap = await dehydrateToBootstrap(serverRouter) expect(serverBeforeLoad).toHaveBeenCalledTimes(1) expect(serverRouter.state.location.pathname).toBe('/app') @@ -138,7 +163,7 @@ describe('hydration route chunks below a server boundary', () => { isServer: true, }) - const bootstrap = await dehydrateToBootstrap(serverRouter, testManifest) + const bootstrap = await dehydrateToBootstrap(serverRouter) expect(serverChildLoader).toHaveBeenCalledTimes(1) expect(serverRouter.state.matches.map((match) => match.routeId)).toEqual([ diff --git a/packages/router-core/tests/hydration-currentness.test.ts b/packages/router-core/tests/hydration-currentness.test.ts index 03ad11998b..a9d52f0c97 100644 --- a/packages/router-core/tests/hydration-currentness.test.ts +++ b/packages/router-core/tests/hydration-currentness.test.ts @@ -1,3 +1,4 @@ +import { runInNewContext } from 'node:vm' import { afterEach, beforeEach, @@ -15,14 +16,37 @@ import { createControlledPromise, } from '../src' import { hydrate } from '../src/ssr/client' +import { attachRouterServerSsrUtils } from '../src/ssr/ssr-server' import { dehydrateSsrMatchId } from '../src/ssr/ssr-match-id' -import { createTestRouter, dehydrateToBootstrap } from './routerTestUtils' +import { createTestRouter } from './routerTestUtils' import type { AnyRouteMatch, AnyRouter, NavigateFn } from '../src' import type { DehydratedRouter, TsrSsrGlobal } from '../src/ssr/types' import type { ServerManifest } from '../src/manifest' const testManifest: ServerManifest = { routes: {} } +async function dehydrateToBootstrap(router: AnyRouter): Promise { + attachRouterServerSsrUtils({ router, manifest: testManifest }) + try { + await router.load() + await router.serverSsr!.dehydrate() + + const script = router.serverSsr!.takeBufferedScripts() + expect(script?.children).toBeTruthy() + + const context: Record = { + document: { currentScript: { remove() {} } }, + } + context.self = context + runInNewContext(script!.children!, context) + + expect(context.$_TSR).toBeDefined() + return context.$_TSR + } finally { + router.serverSsr?.cleanup() + } +} + // These tests install the hydration protocol directly so client-only hooks can // be paused at deterministic ownership boundaries. function installHydrationPayload( @@ -131,7 +155,7 @@ describe('hydration asset currentness', () => { }), isServer: true, }) - mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter, testManifest) + mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter) expect(serverChildLoader).not.toHaveBeenCalled() const childContext = vi.fn(() => ({ assetSource: 'child context' })) @@ -203,7 +227,7 @@ describe('hydration asset currentness', () => { history: createMemoryHistory({ initialEntries: ['/parent/child'] }), isServer: true, }) - mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter, testManifest) + mockWindow.$_TSR = await dehydrateToBootstrap(serverRouter) const childLoaderResult = createControlledPromise() let continuationAssetEnd: number | undefined @@ -573,7 +597,7 @@ describe('hydration asset currentness', () => { isServer: true, }) - const bootstrap = await dehydrateToBootstrap(serverRouter, testManifest) + const bootstrap = await dehydrateToBootstrap(serverRouter) expect(serverBeforeLoad).toHaveBeenCalledTimes(1) expect(serverChildLoader).not.toHaveBeenCalled() diff --git a/packages/router-core/tests/hydration-terminal-error-child-head.test.ts b/packages/router-core/tests/hydration-terminal-error-child-head.test.ts index e0acbd9780..1deb533475 100644 --- a/packages/router-core/tests/hydration-terminal-error-child-head.test.ts +++ b/packages/router-core/tests/hydration-terminal-error-child-head.test.ts @@ -1,13 +1,38 @@ +import { runInNewContext } from 'node:vm' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { createMemoryHistory } from '@tanstack/history' import { BaseRootRoute, BaseRoute, notFound } from '../src' import { hydrate } from '../src/ssr/client' -import { createTestRouter, dehydrateToBootstrap } from './routerTestUtils' +import { attachRouterServerSsrUtils } from '../src/ssr/ssr-server' +import { createTestRouter } from './routerTestUtils' +import type { AnyRouter } from '../src' import type { TsrSsrGlobal } from '../src/ssr/types' import type { ServerManifest } from '../src/manifest' const testManifest: ServerManifest = { routes: {} } +async function dehydrateToBootstrap(router: AnyRouter): Promise { + attachRouterServerSsrUtils({ router, manifest: testManifest }) + try { + await router.load() + await router.serverSsr!.dehydrate() + + const script = router.serverSsr!.takeBufferedScripts() + expect(script?.children).toBeTruthy() + + const context: Record = { + document: { currentScript: { remove() {} } }, + } + context.self = context + runInNewContext(script!.children!, context) + + expect(context.$_TSR).toBeDefined() + return context.$_TSR + } finally { + router.serverSsr?.cleanup() + } +} + // This terminal-prefix case is an internal hydration protocol invariant, not // an issue #7635 reproduction. The user-visible same-route navigation // regression is covered in react-router, where the rendered boundary and @@ -51,7 +76,7 @@ describe('hydrated terminal error prefix', () => { isServer: true, }) - const bootstrap = await dehydrateToBootstrap(serverRouter, testManifest) + const bootstrap = await dehydrateToBootstrap(serverRouter) expect(serverBeforeLoad).toHaveBeenCalledTimes(1) expect(serverChildLoader).not.toHaveBeenCalled() @@ -185,7 +210,7 @@ describe('hydrated terminal error prefix', () => { const server = setup(true) const client = setup(false) try { - mockWindow.$_TSR = await dehydrateToBootstrap(server, testManifest) + mockWindow.$_TSR = await dehydrateToBootstrap(server) await hydrate(client) expect(client.state.matches).toHaveLength(3) await client.invalidate() diff --git a/packages/router-core/tests/hydrationQueue.bench.ts b/packages/router-core/tests/hydrationQueue.bench.ts deleted file mode 100644 index 04679b3c5c..0000000000 --- a/packages/router-core/tests/hydrationQueue.bench.ts +++ /dev/null @@ -1,107 +0,0 @@ -import { describe, test } from 'vitest' - -const MAX_DYNAMIC_RECORD_CODE_UNITS = 64 * 1024 -const SOURCE_SEPARATOR = ';' -const SCRIPT_OPENING_CODE_UNITS = '' - .length - -function getBatchLength( - values: ReadonlyArray, - head: number, -) { - let codeUnits = SCRIPT_OPENING_CODE_UNITS + DYNAMIC_CLOSE_CODE_UNITS - let batchLength = 0 - for (let index = head; index < values.length; index++) { - const nextCodeUnits = - codeUnits + SOURCE_SEPARATOR.length + values[index]!.length - if (batchLength > 0 && nextCodeUnits > MAX_DYNAMIC_RECORD_CODE_UNITS) { - break - } - codeUnits = nextCodeUnits - batchLength++ - if (codeUnits > MAX_DYNAMIC_RECORD_CODE_UNITS) { - break - } - } - return batchLength -} - -function drainWithSplice(values: Array) { - let drained = 0 - let consumedCodeUnits = 0 - while (values.length > 0) { - const batchLength = getBatchLength(values, 0) - const batch = values.splice(0, batchLength) - drained += batchLength - for (const part of batch) { - consumedCodeUnits += part.length - } - } - return { drained, consumedCodeUnits } -} - -function drainWithHead(values: Array) { - let head = 0 - let drained = 0 - let consumedCodeUnits = 0 - while (head < values.length) { - const batchLength = getBatchLength(values, head) - if (head === 0 && batchLength === values.length) { - const batch = values - drained += values.length - for (const part of batch) { - consumedCodeUnits += part!.length - } - values = [] - head = 0 - continue - } - const end = head + batchLength - const batch = values.slice(head, end) - for (let index = head; index < end; index++) { - values[index] = undefined - } - drained += batch.length - for (const part of batch) { - consumedCodeUnits += part!.length - } - head = end - if (head === values.length) { - values = [] - head = 0 - } else if (head >= 1024 && head >= values.length - head) { - values = values.slice(head) - head = 0 - } - } - return { drained, consumedCodeUnits } -} - -const source = 'x'.repeat(4 * 1024) -const sources = Array.from({ length: 4_095 }, () => source) -let benchmarkSink: { drained: number; consumedCodeUnits: number } | undefined - -const expected = drainWithSplice(sources.slice()) -const actual = drainWithHead(sources.slice()) -if ( - expected.drained !== sources.length || - actual.drained !== sources.length || - actual.consumedCodeUnits !== expected.consumedCodeUnits -) { - throw new Error('Hydration queue benchmark discarded a source') -} - -describe('maximum hydration source queue with 4 KiB sources', () => { - test('front splice', async ({ bench }) => { - await bench('front splice', () => { - return void (benchmarkSink = drainWithSplice(sources.slice())) - }).run() - }) - - 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/hydrationScripts.test.ts b/packages/router-core/tests/hydrationScripts.test.ts deleted file mode 100644 index 911e7cd78d..0000000000 --- a/packages/router-core/tests/hydrationScripts.test.ts +++ /dev/null @@ -1,808 +0,0 @@ -import { createHash } from 'node:crypto' -import { describe, expect, test, vi } from 'vitest' -import { - HydrationScriptOutputState, - MAX_HYDRATION_OUTPUT_CHUNK_BYTES, - createHydrationScripts, -} from '../src/ssr/hydrationScripts' -import type { HydrationScriptOutput } from '../src/ssr/hydrationScripts' - -const decoder = new TextDecoder() -const encoder = new TextEncoder() - -function getBoundarySource() { - const scripts = createHydrationScripts(undefined, []) - const source = scripts.takeInitialHydrationScriptTags()!.boundary.children! - scripts.cleanup() - return source -} - -const HYDRATION_SCRIPT_BOUNDARY_SOURCE = getBoundarySource() - -function createReadyOutput(nonce?: string) { - const scripts = createHydrationScripts(nonce, ['boot()']) - const initial = scripts.takeInitialHydrationScriptTags()! - const output = scripts.claimOutput() - scripts.liftBarrier() - return { scripts, initial, output } -} - -function drainChunks(output: HydrationScriptOutput) { - const chunks: Array = [] - while ( - output.state === HydrationScriptOutputState.Ready || - output.state === HydrationScriptOutputState.Active - ) { - chunks.push(output.pullChunk()) - } - return chunks -} - -function decodeChunks(chunks: ReadonlyArray) { - let text = '' - for (const chunk of chunks) { - text += decoder.decode(chunk, { stream: true }) - } - return text + decoder.decode() -} - -async function flushMicrotasks() { - await Promise.resolve() -} - -describe('hydration script ownership', () => { - test('takes initial sources before the output is claimed', () => { - const scripts = createHydrationScripts(undefined, ['first()', 'second()']) - const initial = scripts.takeInitialHydrationScriptTags()! - - expect(initial.before[0]).toMatchObject({ - attrs: { 'data-tsr-stream-part': '' }, - }) - expect(initial.before[0]!.children).toMatch(/^first\(\);second\(\);/) - expect(initial.boundary.children).toBe(HYDRATION_SCRIPT_BOUNDARY_SOURCE) - expect(initial.boundary.attrs).not.toHaveProperty('id') - - const output = scripts.claimOutput() - expect(output.state).toBe(HydrationScriptOutputState.Waiting) - scripts.cleanup() - }) - - test('supports taking initial tags through the ServerSsr callback', () => { - const scripts = createHydrationScripts(undefined, ['boot()']) - const takeInitialHydrationScriptTags = - scripts.takeInitialHydrationScriptTags - - expect(takeInitialHydrationScriptTags()?.before[0]?.children).toMatch( - /^boot\(\);/, - ) - scripts.cleanup() - }) - - test('notifies the subscriber and pulls late records', () => { - const scripts = createHydrationScripts(undefined, []) - scripts.takeInitialHydrationScriptTags() - const output = scripts.claimOutput() - const onChange = vi.fn() - const unsubscribe = output.subscribe(onChange) - - scripts.liftBarrier() - scripts.pushSource('late()') - - expect(onChange).toHaveBeenCalledOnce() - expect(decoder.decode(output.pullChunk())).toContain('late()') - unsubscribe() - scripts.cleanup() - }) - - test('skipInitialTake releases initial sources as late records', () => { - const scripts = createHydrationScripts(undefined, ['boot()']) - const output = scripts.claimOutput() - scripts.pushSource('late()') - scripts.liftBarrier() - expect(output.state).toBe(HydrationScriptOutputState.Waiting) - - scripts.skipInitialTake() - - expect(output.state).toBe(HydrationScriptOutputState.Ready) - expect(decoder.decode(output.pullChunk())).toBe( - '', - ) - expect(scripts.takeInitialHydrationScriptTags()).toBeUndefined() - scripts.cleanup() - }) - - test('empty initial output keeps only the stream boundary', () => { - const scripts = createHydrationScripts(undefined, []) - const initial = scripts.takeInitialHydrationScriptTags()! - - expect(initial.before).toEqual([]) - expect(initial.boundary).toEqual({ - tag: 'script', - attrs: { nonce: undefined }, - children: HYDRATION_SCRIPT_BOUNDARY_SOURCE, - }) - scripts.cleanup() - }) - - test('does not append cleanup to a large initial source', () => { - const source = 'x'.repeat(20 * 1024) - const scripts = createHydrationScripts(undefined, [source]) - const initial = scripts.takeInitialHydrationScriptTags()! - - expect(initial.before).toHaveLength(2) - expect(initial.before[0]).toEqual({ - tag: 'script', - attrs: { nonce: undefined, 'data-tsr-stream-part': '' }, - children: source, - }) - expect(initial.before[1]).toMatchObject({ - tag: 'script', - attrs: { nonce: undefined, 'data-tsr-stream-part': '' }, - children: expect.stringContaining('document.currentScript'), - }) - scripts.cleanup() - }) - - test('does not move pending initial sources into an early claimant', () => { - const scripts = createHydrationScripts(undefined, ['boot()']) - const output = scripts.claimOutput() - - scripts.pushSource('beforeScripts()') - scripts.liftBarrier() - expect(output.state).toBe(HydrationScriptOutputState.Waiting) - - const initial = scripts.takeInitialHydrationScriptTags()! - expect( - initial.before.some((tag) => tag.children?.includes('beforeScripts()')), - ).toBe(true) - expect(output.state).toBe(HydrationScriptOutputState.Waiting) - scripts.cleanup() - }) - - test('releases initial source accounting when tags take ownership', () => { - const sources = Array.from({ length: 4_096 }, (_, index) => `${index}`) - const scripts = createHydrationScripts(undefined, sources) - expect(scripts.takeInitialHydrationScriptTags()).toBeDefined() - const output = scripts.claimOutput() - scripts.liftBarrier() - - for (const source of sources) { - scripts.pushSource(source) - } - - expect(output.state).toBe(HydrationScriptOutputState.Ready) - expect(output.error).toBeUndefined() - scripts.cleanup() - }) - - test('transfers buffered sources in order only after the barrier lifts', async () => { - const scripts = createHydrationScripts(undefined, ['boot()']) - scripts.takeInitialHydrationScriptTags() - const output = scripts.claimOutput() - - scripts.pushSource('first()') - scripts.pushSource('second()') - await flushMicrotasks() - expect(output.state).toBe(HydrationScriptOutputState.Waiting) - - scripts.liftBarrier() - expect(output.state).toBe(HydrationScriptOutputState.Ready) - expect(decodeChunks(drainChunks(output))).toBe( - '', - ) - scripts.cleanup() - }) - - test('emits exact nonce, separators, cleanup, boundary, and closing protocol', async () => { - const nonce = `a&"'<>` - const { scripts, initial, output } = createReadyOutput(nonce) - - expect(initial.before).toEqual([ - { - tag: 'script', - attrs: { nonce, 'data-tsr-stream-part': '' }, - children: - "boot();{let s=document.currentScript,p;while((p=s.previousElementSibling)&&p.hasAttribute('data-tsr-stream-part'))p.remove();s.remove()}", - }, - ]) - expect(initial.boundary).toEqual({ - tag: 'script', - attrs: { nonce }, - children: HYDRATION_SCRIPT_BOUNDARY_SOURCE, - }) - - scripts.pushSource('first()') - scripts.pushSource('second()') - await flushMicrotasks() - expect(decodeChunks(drainChunks(output))).toBe( - '', - ) - scripts.cleanup() - }) - - test.each([ - { - name: 'plain continuation', - initial: false, - wrap: false, - expected: 'value()', - }, - { - name: 'initial router value', - initial: true, - wrap: false, - expected: '$_TSR.router=value()', - }, - { - name: 'wrapped continuation', - initial: false, - wrap: true, - expected: '$_TSR.p(()=>value())', - }, - { - name: 'wrapped initial router value', - initial: true, - wrap: true, - expected: '$_TSR.p(()=>$_TSR.router=value())', - }, - ])('frames $name serialization exactly', ({ initial, wrap, expected }) => { - const { scripts, output } = createReadyOutput() - - scripts.pushSerializedSource('value()', initial, wrap) - - expect(decodeChunks(drainChunks(output))).toBe( - ``, - ) - scripts.cleanup() - }) -}) - -describe('hydration script encoding', () => { - test('uses one direct chunk for a small record', async () => { - const { scripts, output } = createReadyOutput() - scripts.pushSource('small()') - await flushMicrotasks() - - const chunks = drainChunks(output) - expect(chunks).toHaveLength(1) - expect(decodeChunks(chunks)).toBe( - '', - ) - scripts.cleanup() - }) - - test('can produce a record that is exactly one maximum-sized chunk', async () => { - const prefix = '' - const source = 'x'.repeat( - MAX_HYDRATION_OUTPUT_CHUNK_BYTES - prefix.length - suffix.length, - ) - const { scripts, output } = createReadyOutput() - scripts.pushSource(source) - await flushMicrotasks() - - const chunks = drainChunks(output) - expect(chunks).toHaveLength(1) - expect(chunks[0]).toHaveLength(MAX_HYDRATION_OUTPUT_CHUNK_BYTES) - expect(decodeChunks(chunks)).toBe(prefix + source + suffix) - scripts.cleanup() - }) - - test.each([ - ['CJK', '漢字語'.repeat(30_000)], - ['emoji', '🦄🚀'.repeat(30_000)], - ])( - 'encodes a large %s record without corrupting UTF-8', - async (_, source) => { - const { scripts, output } = createReadyOutput() - scripts.pushSource(source) - scripts.pushSource('tail()') - await flushMicrotasks() - - const chunks = drainChunks(output) - expect( - Math.max(...chunks.map((chunk) => chunk.byteLength)), - ).toBeLessThanOrEqual(MAX_HYDRATION_OUTPUT_CHUNK_BYTES) - expect(decodeChunks(chunks)).toBe( - `` + - '', - ) - scripts.cleanup() - }, - ) - - test('drains one 17 MiB record incrementally without retaining the response', async () => { - const source = 'x'.repeat(17 * 1024 * 1024) - const expectedHash = createHash('sha256') - .update('') - .digest('hex') - const { scripts, output } = createReadyOutput() - scripts.pushSource(source) - await flushMicrotasks() - - const actualHash = createHash('sha256') - let outputBytes = 0 - let maximumChunkBytes = 0 - while ( - output.state === HydrationScriptOutputState.Ready || - output.state === HydrationScriptOutputState.Active - ) { - const chunk = output.pullChunk() - actualHash.update(chunk) - outputBytes += chunk.byteLength - maximumChunkBytes = Math.max(maximumChunkBytes, chunk.byteLength) - } - - expect(outputBytes).toBe( - encoder.encode('').byteLength, - ) - expect(actualHash.digest('hex')).toBe(expectedHash) - expect(maximumChunkBytes).toBeLessThanOrEqual( - MAX_HYDRATION_OUTPUT_CHUNK_BYTES, - ) - expect(output.state).toBe(HydrationScriptOutputState.Waiting) - scripts.cleanup() - }) - - test('keeps a large record Active until its closing tag drains', async () => { - const { scripts, output } = createReadyOutput() - scripts.pushSource('x'.repeat(MAX_HYDRATION_OUTPUT_CHUNK_BYTES * 2)) - await flushMicrotasks() - - expect(output.state).toBe(HydrationScriptOutputState.Ready) - const first = output.pullChunk() - expect(first.byteLength).toBeLessThanOrEqual( - MAX_HYDRATION_OUTPUT_CHUNK_BYTES, - ) - expect(output.state).toBe(HydrationScriptOutputState.Active) - - drainChunks(output) - expect(output.state).toBe(HydrationScriptOutputState.Waiting) - scripts.cleanup() - }) - - test('closes one multi-chunk source before draining the next independent source', async () => { - const { scripts, output } = createReadyOutput() - const first = `first("${'a'.repeat(MAX_HYDRATION_OUTPUT_CHUNK_BYTES * 2)}")` - const second = `second("${'b'.repeat( - MAX_HYDRATION_OUTPUT_CHUNK_BYTES * 2, - )}")` - - try { - scripts.pushSource(first) - scripts.pushSource(second) - await flushMicrotasks() - - const recordDecoder = new TextDecoder() - let firstRecord = '' - while ( - (output.state === HydrationScriptOutputState.Ready || - output.state === HydrationScriptOutputState.Active) && - !firstRecord.includes('') - ) { - firstRecord += recordDecoder.decode(output.pullChunk(), { - stream: true, - }) - } - firstRecord += recordDecoder.decode() - - expect(firstRecord).toContain('first("') - expect(firstRecord).not.toContain('second("') - expect(output.state).toBe(HydrationScriptOutputState.Ready) - - const secondRecord = decodeChunks(drainChunks(output)) - expect(secondRecord).toContain('second("') - expect(secondRecord).not.toContain('first("') - expect(output.state).toBe(HydrationScriptOutputState.Waiting) - } finally { - scripts.cleanup() - } - }) - - test('splits sources whose combined framed record exceeds the record budget', async () => { - const { scripts, output } = createReadyOutput() - const first = `first("${'a'.repeat(40 * 1024)}")` - const second = `second("${'b'.repeat(40 * 1024)}")` - - try { - scripts.pushSource(first) - scripts.pushSource(second) - await flushMicrotasks() - - const firstRecord = decodeChunks([output.pullChunk()]) - expect(firstRecord).toContain(first) - expect(firstRecord).not.toContain(second) - expect(output.state).toBe(HydrationScriptOutputState.Ready) - - const secondRecord = decodeChunks([output.pullChunk()]) - expect(secondRecord).toContain(second) - expect(secondRecord).not.toContain(first) - expect(output.state).toBe(HydrationScriptOutputState.Waiting) - } finally { - scripts.cleanup() - } - }) - - test('preserves FIFO when sources append after queue compaction', () => { - const { scripts, output } = createReadyOutput() - const initialSources = Array.from({ length: 1_200 }, (_, index) => { - const prefix = `r${index.toString().padStart(4, '0')}:` - return prefix + 'x'.repeat(1024 - prefix.length) - }) - const appendedSources = Array.from({ length: 16 }, (_, offset) => { - const index = initialSources.length + offset - const prefix = `r${index.toString().padStart(4, '0')}:` - return prefix + 'x'.repeat(1024 - prefix.length) - }) - - try { - for (const source of initialSources) { - scripts.pushSource(source) - } - - const chunks = Array.from({ length: 17 }, () => output.pullChunk()) - expect(output.state).toBe(HydrationScriptOutputState.Ready) - - for (const source of appendedSources) { - scripts.pushSource(source) - } - scripts.finish() - chunks.push(...drainChunks(output)) - - const text = decodeChunks(chunks) - const markers = Array.from(text.matchAll(/r(\d{4}):/g), (match) => - Number(match[1]), - ) - expect(markers).toEqual( - [...initialSources, ...appendedSources].map((_, index) => index), - ) - expect(output.state).toBe(HydrationScriptOutputState.Done) - } finally { - scripts.cleanup() - } - }) - - test('reuses source-part capacity after queue compaction', () => { - const { scripts, output } = createReadyOutput() - const source = 'x'.repeat(1024) - - try { - for (let index = 0; index < 4_096; index++) { - scripts.pushSource(source) - } - - for (let record = 0; record < 33; record++) { - output.pullChunk() - } - expect(output.state).toBe(HydrationScriptOutputState.Ready) - - for (let index = 0; index < 2_079; index++) { - scripts.pushSource(source) - } - expect(output.state).toBe(HydrationScriptOutputState.Ready) - expect(output.error).toBeUndefined() - - scripts.pushSource(source) - expect(output.state).toBe(HydrationScriptOutputState.Failed) - expect((output.error as Error).message).toContain('source-part count') - } finally { - scripts.cleanup() - } - }) - - test('a mostly-empty final chunk does not pin the full output buffer', () => { - const { scripts, output } = createReadyOutput() - scripts.pushSource(`big("${'x'.repeat(80 * 1024)}")`) - scripts.finish() - - const chunks = drainChunks(output) - expect(chunks.length).toBeGreaterThan(1) - for (const chunk of chunks) { - // No chunk may retain more than twice its own bytes through its - // backing ArrayBuffer; small tails must be copied out of the 64 KiB - // output buffer. - expect(chunk.buffer.byteLength).toBeLessThanOrEqual(chunk.byteLength * 2) - } - }) -}) - -describe('disabled hydration', () => { - test('makes the fast path reservable without a take or a boundary', () => { - vi.useFakeTimers() - try { - const scripts = createHydrationScripts(undefined) - scripts.disableHydration() - - expect(scripts.isInitialTaken()).toBe(true) - expect(scripts.takeInitialHydrationScriptTags()).toBeUndefined() - expect(scripts.reserveFastPath()).toBe(true) - - // Late producer activity is inert: no sources, no timers. - scripts.pushSource('late()') - scripts.startSerializationTimeout(10) - scripts.finish() - expect(vi.getTimerCount()).toBe(0) - - scripts.cleanup() - } finally { - vi.useRealTimers() - } - }) - - test('is safe after cleanup', () => { - const scripts = createHydrationScripts(undefined) - scripts.disableHydration() - scripts.cleanup() - expect(() => scripts.disableHydration()).not.toThrow() - }) - - test('rejects disabling after the initial take', () => { - const scripts = createHydrationScripts(undefined, ['boot()']) - scripts.takeInitialHydrationScriptTags() - expect(() => scripts.disableHydration()).toThrow( - 'hydration output is already committed', - ) - scripts.cleanup() - }) - - test('rejects disabling after the output channel was claimed', () => { - const scripts = createHydrationScripts(undefined, ['boot()']) - scripts.claimOutput() - expect(() => scripts.disableHydration()).toThrow( - 'hydration output is already committed', - ) - scripts.cleanup() - }) -}) - -describe('hydration script completion and failure', () => { - test('enqueues $_TSR.e() before it reports Done', () => { - const { scripts, output } = createReadyOutput() - const observedStates: Array = [] - output.subscribe(() => observedStates.push(output.state)) - - scripts.pushSource('value()') - scripts.finish() - expect(output.state).toBe(HydrationScriptOutputState.Ready) - - const text = decodeChunks(drainChunks(output)) - expect(text).toBe( - '', - ) - expect(output.state).toBe(HydrationScriptOutputState.Done) - expect(observedStates).toContain(HydrationScriptOutputState.Ready) - scripts.cleanup() - }) - - test('reports the source-part guard synchronously', () => { - const { scripts, output } = createReadyOutput() - const notifications: Array = [] - output.subscribe(() => { - notifications.push(output.state) - }) - - let pushed = 0 - while ( - output.state !== HydrationScriptOutputState.Failed && - pushed < 10_000 - ) { - scripts.pushSource(`${pushed++}`) - } - - expect(pushed).toBeLessThan(10_000) - expect(output.state).toBe(HydrationScriptOutputState.Failed) - expect((output.error as Error).message).toContain('source-part count') - expect( - notifications.filter( - (value) => value === HydrationScriptOutputState.Failed, - ), - ).toHaveLength(1) - scripts.cleanup() - }) - - test('applies the source-part guard before the initial take', () => { - const scripts = createHydrationScripts(undefined, []) - - try { - for (let index = 0; index <= 4_096; index++) { - scripts.pushSource(`${index}`) - } - - const output = scripts.claimOutput() - expect(output.state).toBe(HydrationScriptOutputState.Failed) - expect((output.error as Error).message).toContain('source-part count') - expect(scripts.takeInitialHydrationScriptTags()).toBeUndefined() - } finally { - scripts.cleanup() - } - }) - - test('applies the source-part guard to constructor sources', () => { - const sources = Array.from({ length: 4_097 }, (_, index) => `${index}`) - const scripts = createHydrationScripts(undefined, sources) - - try { - const output = scripts.claimOutput() - expect(output.state).toBe(HydrationScriptOutputState.Failed) - expect((output.error as Error).message).toContain('source-part count') - expect(scripts.takeInitialHydrationScriptTags()).toBeUndefined() - } finally { - scripts.cleanup() - } - }) - - test('reports the regular backlog guard synchronously', () => { - const { scripts, output } = createReadyOutput() - const source = 'x'.repeat(1024 * 1024) - - let pushed = 0 - while (output.state !== HydrationScriptOutputState.Failed && pushed < 100) { - scripts.pushSource(source + pushed++) - } - - expect(pushed).toBeLessThan(100) - expect(output.state).toBe(HydrationScriptOutputState.Failed) - expect((output.error as Error).message).toContain('code-unit count') - scripts.cleanup() - }) - - test('applies the regular backlog guard before the initial take', () => { - const scripts = createHydrationScripts(undefined, []) - const source = 'x'.repeat(1024 * 1024) - - try { - for (let index = 0; index < 17; index++) { - scripts.pushSource(source + index) - } - - const output = scripts.claimOutput() - expect(output.state).toBe(HydrationScriptOutputState.Failed) - expect((output.error as Error).message).toContain('code-unit count') - } finally { - scripts.cleanup() - } - }) - - test('allows one oversized source but rejects a second one', () => { - const { scripts, output } = createReadyOutput() - const first = 'a'.repeat(17 * 1024 * 1024) - const second = 'b'.repeat(17 * 1024 * 1024) - - scripts.pushSource(first) - expect(output.state).not.toBe(HydrationScriptOutputState.Failed) - scripts.pushSource(second) - - expect(output.state).toBe(HydrationScriptOutputState.Failed) - expect((output.error as Error).message).toContain('code-unit count') - scripts.cleanup() - }) - - test('releases oversized-source accounting as soon as its source drains', () => { - const openingBytes = encoder.encode('', - ) - expect(output.state).toBe(HydrationScriptOutputState.Ready) - drainChunks(output) - expect(output.state).toBe(HydrationScriptOutputState.Waiting) - scripts.cleanup() - }) - - test('rejects a second consumer', () => { - const scripts = createHydrationScripts(undefined, ['boot()']) - scripts.claimOutput() - expect(() => scripts.claimOutput()).toThrow( - 'SSR hydration script output already has a consumer', - ) - scripts.cleanup() - }) - - test('rejects an output claim after the fast path owns the consumer', () => { - const scripts = createHydrationScripts(undefined) - scripts.disableHydration() - expect(scripts.reserveFastPath()).toBe(true) - expect(() => scripts.claimOutput()).toThrow( - 'SSR hydration script output already has a consumer', - ) - scripts.cleanup() - }) - - test('cleanup clears active state and does not retain a new subscriber', async () => { - const { scripts, output } = createReadyOutput() - scripts.pushSource('x'.repeat(MAX_HYDRATION_OUTPUT_CHUNK_BYTES * 2)) - await flushMicrotasks() - output.pullChunk() - expect(output.state).toBe(HydrationScriptOutputState.Active) - - scripts.cleanup() - - expect(output.state).toBe(HydrationScriptOutputState.Done) - expect(output.error).toBeUndefined() - expect(() => output.pullChunk()).toThrow('not ready') - const onChange = vi.fn() - const unsubscribe = output.subscribe(onChange) - scripts.pushSource('ignored()') - scripts.finish() - unsubscribe() - expect(onChange).not.toHaveBeenCalled() - }) - - test('a render timeout fails immediately while a record is Active', async () => { - vi.useFakeTimers() - const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) - const { scripts, output } = createReadyOutput() - const onChange = vi.fn() - output.subscribe(onChange) - - try { - scripts.pushSource('x'.repeat(MAX_HYDRATION_OUTPUT_CHUNK_BYTES * 2)) - await flushMicrotasks() - output.pullChunk() - expect(output.state).toBe(HydrationScriptOutputState.Active) - - scripts.startSerializationTimeout(10) - await vi.advanceTimersByTimeAsync(10) - - expect(output.state).toBe(HydrationScriptOutputState.Failed) - expect((output.error as Error).message).toContain('Serialization timeout') - expect(onChange).toHaveBeenCalled() - } finally { - scripts.cleanup() - errorSpy.mockRestore() - vi.useRealTimers() - } - }) - - test('serialization completion clears the timeout during a slow active drain', async () => { - vi.useFakeTimers() - const { scripts, output } = createReadyOutput() - - try { - scripts.pushSource('x'.repeat(MAX_HYDRATION_OUTPUT_CHUNK_BYTES * 2)) - await flushMicrotasks() - output.pullChunk() - expect(output.state).toBe(HydrationScriptOutputState.Active) - - scripts.startSerializationTimeout(10) - scripts.finish() - await vi.advanceTimersByTimeAsync(100) - - expect(output.state).toBe(HydrationScriptOutputState.Active) - expect(decodeChunks(drainChunks(output))).toContain('$_TSR.e()') - expect(output.state).toBe(HydrationScriptOutputState.Done) - } finally { - scripts.cleanup() - vi.useRealTimers() - } - }) -}) diff --git a/packages/router-core/tests/invalidation-reserved-flight.test.ts b/packages/router-core/tests/invalidation-reserved-flight.test.ts deleted file mode 100644 index d9f3aff105..0000000000 --- a/packages/router-core/tests/invalidation-reserved-flight.test.ts +++ /dev/null @@ -1,55 +0,0 @@ -import { expect, test, vi } from 'vitest' -import { createMemoryHistory } from '@tanstack/history' -import { BaseRootRoute, BaseRoute, createControlledPromise } from '../src' -import { createTestRouter } from './routerTestUtils' - -test('invalidation retires a zero-owner reservation before a blocked successor completes', async () => { - const started = createControlledPromise() - const data = createControlledPromise() - const entered = createControlledPromise() - const before = createControlledPromise() - let signal: AbortSignal | undefined - const root = new BaseRootRoute({}) - const home = new BaseRoute({ getParentRoute: () => root, path: '/' }) - const target = new BaseRoute({ - getParentRoute: () => root, - path: '/target', - validateSearch: (search: Record) => ({ - blocked: !!search.blocked, - }), - beforeLoad: ({ search }) => { - if (search.blocked) { - entered.resolve() - return before - } - return undefined - }, - loader: ({ abortController }) => { - signal = abortController.signal - started.resolve() - return data - }, - }) - const router = createTestRouter({ - routeTree: root.addChildren([home, target]), - history: createMemoryHistory({ initialEntries: ['/'] }), - }) - await router.load() - const first = router.navigate({ to: '/target', search: { blocked: false } }) - await started - const second = router.navigate({ to: '/target', search: { blocked: true } }) - await entered - expect(signal?.aborted).toBe(false) - const aborted = vi.fn() - signal!.addEventListener('abort', aborted) - const invalidation = router.invalidate({ - filter: (match) => match.routeId === target.id, - }) - await router.navigate({ to: '/' }) - before.resolve() - data.resolve('obsolete data') - await Promise.all([first, second, invalidation]) - expect(signal?.aborted).toBe(true) - expect(aborted).toHaveBeenCalledOnce() - expect(router.state.location.pathname).toBe('/') -}) diff --git a/packages/router-core/tests/issue-7942-repro.test.ts b/packages/router-core/tests/issue-7942-repro.test.ts deleted file mode 100644 index 116a527191..0000000000 --- a/packages/router-core/tests/issue-7942-repro.test.ts +++ /dev/null @@ -1,271 +0,0 @@ -import { describe, expect, test, vi } from 'vitest' -import { createMemoryHistory } from '@tanstack/history' -import { BaseRootRoute, BaseRoute } from '../src' -import { MAX_HYDRATION_OUTPUT_CHUNK_BYTES } from '../src/ssr/hydrationScripts' -import { attachRouterServerSsrUtils } from '../src/ssr/ssr-server' -import { transformReadableStreamWithRouter } from '../src/ssr/transformStreamWithRouter' -import { createTestRouter } from './routerTestUtils' -import type { RouterManagedTag } from '../src/manifest' -import type { InitialHydrationScriptTags } from '../src/ssr/hydrationScripts' - -function createDeferred() { - let resolve!: (value: T) => void - const promise = new Promise((res) => { - resolve = res - }) - return { promise, resolve } -} - -function createLoaderSsrRouter(loader: () => unknown) { - const rootRoute = new BaseRootRoute({}) - const indexRoute = new BaseRoute({ - getParentRoute: () => rootRoute, - path: '/', - component: () => null, - loader, - }) - - return createTestRouter({ - routeTree: rootRoute.addChildren([indexRoute]), - history: createMemoryHistory({ initialEntries: ['/'] }), - isServer: true, - }) -} - -function createManualUpstream() { - let controllerRef: ReadableStreamDefaultController | undefined - const cancelled = { value: false } - const encoder = new TextEncoder() - const stream = new ReadableStream({ - start(controller) { - controllerRef = controller - }, - cancel() { - cancelled.value = true - }, - }) - - return { - stream, - cancelled, - push(value: string) { - controllerRef!.enqueue(encoder.encode(value)) - }, - close() { - controllerRef!.close() - }, - } -} - -function renderManagedScript(tag: RouterManagedTag) { - const id = tag.attrs?.id ? ` id="${tag.attrs.id}"` : '' - return `${tag.children ?? ''}` -} - -function renderManagedScripts(tags: Array) { - return tags.map(renderManagedScript).join('') -} - -function expectInitialScripts( - scripts: InitialHydrationScriptTags | undefined, -): InitialHydrationScriptTags { - expect(scripts?.boundary.children).toContain('$tsr-stream-boundary') - expect(scripts?.boundary.attrs).not.toHaveProperty('id') - expect(scripts?.before.length).toBeGreaterThan(0) - for (const script of scripts!.before) { - expect(script.attrs?.['data-tsr-stream-part']).toBe('') - } - return scripts! -} - -async function readAll(stream: ReadableStream) { - const reader = stream.getReader() - const decoder = new TextDecoder() - const chunks: Array = [] - const chunkSizes: Array = [] - for (;;) { - const { done, value } = await reader.read() - if (done) { - chunks.push(decoder.decode()) - return { - text: chunks.join(''), - chunkSizes, - } - } - chunkSizes.push(value.byteLength) - chunks.push(decoder.decode(value, { stream: true })) - } -} - -async function waitFor(check: () => boolean) { - for (let index = 0; index < 20; index++) { - if (check()) { - return - } - await Promise.resolve() - } - throw new Error('condition was not reached') -} - -describe('issue #7942', () => { - test('eager loader data stays in the segmented initial scripts', async () => { - const router = createLoaderSsrRouter(() => ({ value: 'eager-loader-data' })) - attachRouterServerSsrUtils({ router, manifest: undefined }) - - await router.load() - await router.serverSsr!.dehydrate() - - const initialScripts = expectInitialScripts( - router.serverSsr!.takeInitialHydrationScriptTags(), - ) - expect( - initialScripts.before.some((script) => - script.children?.includes('eager-loader-data'), - ), - ).toBe(true) - expect(router.serverSsr!.takeInitialHydrationScriptTags()).toBeUndefined() - - router.serverSsr!.cleanup() - }) - - test('keeps a large eager serialization part isolated from small initial scripts', async () => { - const payload = 'initial-large-value-'.repeat(2_000) - const router = createLoaderSsrRouter(() => ({ value: payload })) - attachRouterServerSsrUtils({ router, manifest: undefined }) - - await router.load() - await router.serverSsr!.dehydrate() - - const initialScripts = expectInitialScripts( - router.serverSsr!.takeInitialHydrationScriptTags(), - ) - const streamParts = initialScripts.before - const payloadScripts = streamParts.filter((script) => - script.children?.includes(payload), - ) - - expect(payloadScripts).toHaveLength(1) - expect(streamParts.indexOf(payloadScripts[0]!)).toBeGreaterThan(0) - expect( - streamParts - .filter((script) => script !== payloadScripts[0]) - .every((script) => !script.children?.includes(payload)), - ).toBe(true) - - router.serverSsr!.cleanup() - }) - - test('streams a large deferred loader result in bounded chunks after the next safe boundary', async () => { - const deferred = createDeferred() - const router = createLoaderSsrRouter(() => ({ value: deferred.promise })) - attachRouterServerSsrUtils({ router, manifest: undefined }) - - await router.load() - await router.serverSsr!.dehydrate() - - const initialScripts = expectInitialScripts( - router.serverSsr!.takeInitialHydrationScriptTags(), - ) - const liftBarrier = vi.spyOn( - router.serverSsr!.hydrationScripts, - 'liftBarrier', - ) - const upstream = createManualUpstream() - const output = transformReadableStreamWithRouter(router, upstream.stream) - const outputPromise = readAll(output) - - const appShell = - `${renderManagedScripts([ - ...initialScripts.before, - initialScripts.boundary, - ])}` + `
app
` - expect(appShell.length).toBeLessThan(MAX_HYDRATION_OUTPUT_CHUNK_BYTES) - upstream.push(appShell) - await waitFor(() => liftBarrier.mock.calls.length === 1) - - const payload = 'x'.repeat(17 * 1024 * 1024) - deferred.resolve(payload) - - const tail = '' - upstream.push(tail) - upstream.close() - - const result = await outputPromise - const renderedInitialScripts = renderManagedScripts([ - ...initialScripts.before, - initialScripts.boundary, - ]) - const earliestInjectionOffset = - ''.length + renderedInitialScripts.length - const payloadOffset = result.text.indexOf(payload) - const injectedStart = result.text.lastIndexOf('' - const injectedEnd = - result.text.lastIndexOf(dynamicClose) + dynamicClose.length - expect(payloadOffset).toBeGreaterThan(injectedStart) - expect(injectedStart).toBeGreaterThanOrEqual(earliestInjectionOffset) - expect(injectedStart).toBeLessThanOrEqual(appShell.length) - expect(injectedEnd).toBeGreaterThan(payloadOffset) - expect( - result.text.slice(0, injectedStart) + result.text.slice(injectedEnd), - ).toBe(appShell + tail) - expect(result.text.endsWith(tail)).toBe(true) - expect(Math.max(...result.chunkSizes)).toBeLessThanOrEqual( - MAX_HYDRATION_OUTPUT_CHUNK_BYTES, - ) - expect(upstream.cancelled.value).toBe(false) - expect(router.serverSsr).toBeUndefined() - }) - - test('rejects multiple router fragments that genuinely accumulate past the guard', async () => { - const payloadCharsPerValue = 1024 * 1024 - const deferredValues = Array.from({ length: 17 }, () => - createDeferred(), - ) - const router = createLoaderSsrRouter(() => ({ - values: deferredValues.map((deferred) => deferred.promise), - })) - attachRouterServerSsrUtils({ router, manifest: undefined }) - - await router.load() - await router.serverSsr!.dehydrate() - - const initialScripts = expectInitialScripts( - router.serverSsr!.takeInitialHydrationScriptTags(), - ) - - const liftBarrier = vi.spyOn( - router.serverSsr!.hydrationScripts, - 'liftBarrier', - ) - const upstream = createManualUpstream() - const output = transformReadableStreamWithRouter(router, upstream.stream) - const outputResult = readAll(output).then( - (value) => ({ value, error: undefined }), - (error: unknown) => ({ value: undefined, error }), - ) - - upstream.push( - `${renderManagedScripts([ - ...initialScripts.before, - initialScripts.boundary, - ])}
app
`, - ) - await waitFor(() => liftBarrier.mock.calls.length === 1) - - for (let index = 0; index < deferredValues.length; index++) { - deferredValues[index]!.resolve( - `${index}:` + 'y'.repeat(payloadCharsPerValue), - ) - } - - const result = await outputResult - expect(result.value).toBeUndefined() - expect(result.error).toBeInstanceOf(Error) - expect((result.error as Error).message).toContain( - 'SSR hydration backlog exceeded maximum code-unit count', - ) - expect(upstream.cancelled.value).toBe(true) - expect(router.serverSsr).toBeUndefined() - }) -}) diff --git a/packages/router-core/tests/legacy-not-found-interpolation.test.ts b/packages/router-core/tests/legacy-not-found-interpolation.test.ts deleted file mode 100644 index 4f524c68a3..0000000000 --- a/packages/router-core/tests/legacy-not-found-interpolation.test.ts +++ /dev/null @@ -1,105 +0,0 @@ -import { afterEach, expect, test, vi } from 'vitest' -import { createMemoryHistory } from '@tanstack/history' -import { BaseRootRoute, BaseRoute } from '../src' -import { createTestRouter } from './routerTestUtils' -import type { AnyRoute } from '../src' - -afterEach(() => vi.restoreAllMocks()) - -function setup(isServer: boolean) { - vi.spyOn(console, 'warn').mockImplementation(() => {}) - const root = new BaseRootRoute({}) - const tenant = new BaseRoute({ - getParentRoute: () => root, - path: '/$tenant', - }) - const legacy = new BaseRoute({ - getParentRoute: () => tenant, - path: '/404', - loader: ({ params }) => params.tenant, - staleTime: Infinity, - }) - const history = createMemoryHistory({ initialEntries: ['/a/missing'] }) - const router = createTestRouter({ - routeTree: root.addChildren([tenant]), - notFoundRoute: legacy, - history, - isServer, - scrollRestoration: false, - }) - return { router, history, legacy } -} - -test.each([false, true])( - 'interpolates standalone fallback match IDs (server: %s)', - (isServer) => { - const { router, history, legacy } = setup(isServer) - try { - expect(legacy.originalIndex).toBe(99999999999) - const first = router.matchRoutes('/a/missing', {}).at(-1)! - const second = router.matchRoutes('/b/missing', {}).at(-1)! - expect(first.routeId).toBe(legacy.id) - expect(first.pathname).toBe('/a/404') - expect(second.pathname).toBe('/b/404') - expect(second.id).not.toBe(first.id) - expect(second._strictParams).toEqual({ tenant: 'b' }) - } finally { - history.destroy() - } - }, -) - -test('does not reuse fallback params or loader data across tenants', async () => { - const { router, history, legacy } = setup(false) - try { - await router.load() - const first = router.state.matches.find( - (match) => match.routeId === legacy.id, - )! - expect(first.params).toEqual({ tenant: 'a' }) - expect(first.loaderData).toBe('a') - await router.navigate({ href: '/b/missing' }) - const second = router.state.matches.find( - (match) => match.routeId === legacy.id, - )! - expect(second.id).not.toBe(first.id) - expect(second.params).toEqual({ tenant: 'b' }) - expect(second.loaderData).toBe('b') - } finally { - history.destroy() - } -}) - -test('refreshes fallback segments when the route tree is replaced', () => { - vi.spyOn(console, 'warn').mockImplementation(() => {}) - const root = new BaseRootRoute({}) - let parent: AnyRoute = new BaseRoute({ - getParentRoute: () => root, - path: '/$tenant', - }) - const legacy = new BaseRoute({ - getParentRoute: () => parent, - path: '/404', - }) - const history = createMemoryHistory({ initialEntries: ['/'] }) - const router = createTestRouter({ - routeTree: root.addChildren([parent]), - notFoundRoute: legacy, - history, - scrollRestoration: false, - }) - try { - expect(router.matchRoutes('/a/missing', {}).at(-1)?.pathname).toBe('/a/404') - const nextRoot = new BaseRootRoute({}) - parent = new BaseRoute({ - getParentRoute: () => nextRoot, - path: '/$org', - }) - router.update({ routeTree: nextRoot.addChildren([parent]) }) - const match = router.matchRoutes('/b/missing', {}).at(-1)! - expect(match.pathname).toBe('/b/404') - expect(match._strictParams).toEqual({ org: 'b' }) - } finally { - history.destroy() - } -}) diff --git a/packages/router-core/tests/lightweight-location.bench.ts b/packages/router-core/tests/lightweight-location.bench.ts deleted file mode 100644 index 44f70c9d53..0000000000 --- a/packages/router-core/tests/lightweight-location.bench.ts +++ /dev/null @@ -1,66 +0,0 @@ -import { describe, expect, test } from 'vitest' -import { createMemoryHistory } from '@tanstack/history' -import { BaseRootRoute, BaseRoute } from '../src' -import { createTestRouter } from './routerTestUtils' - -describe.each([false, true])( - 'cold lightweight locations (server: %s)', - (isServer) => { - for (const count of [1, 8, 32]) { - const root = new BaseRootRoute({}) - const segments = Array.from({ length: count }, (_, index) => `$p${index}`) - const source = new BaseRoute({ - getParentRoute: () => root, - path: `/source/${segments.join('/')}`, - }) - const target = new BaseRoute({ - getParentRoute: () => root, - path: '/target', - }) - const history = createMemoryHistory({ initialEntries: ['/'] }) - const router = createTestRouter({ - routeTree: root.addChildren([source, target]), - history, - isServer, - scrollRestoration: false, - }) - history.destroy() - const pathname = `/source/${segments.map((_, index) => String(index)).join('/')}` - const location = { - ...router.latestLocation, - pathname, - href: pathname, - publicHref: pathname, - } - let checksum = 0 - const iterations = 256 - function run() { - checksum = 0 - for (let index = 0; index < iterations; index++) { - checksum += router.buildLocation({ - to: '/target', - params: true, - _fromLocation: { ...location }, - }).pathname.length - } - } - run() - 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/load-client-wait-for.test.ts b/packages/router-core/tests/load-client-wait-for.test.ts index fdf5397a16..9ae49b89bd 100644 --- a/packages/router-core/tests/load-client-wait-for.test.ts +++ b/packages/router-core/tests/load-client-wait-for.test.ts @@ -1,11 +1,7 @@ import { describe, expect, test, vi } from 'vitest' import { waitForReason } from '../src/await-signal' import { waitFor } from '../src/load-client' -import { waitForRequest } from '../src/ssr/server' - -test('waitForRequest aliases waitForReason through the server barrel', () => { - expect(waitForRequest).toBe(waitForReason) -}) +import { waitForRequest } from '../src/ssr/createRequestHandler' describe('waitFor', () => { test.each(['resolve', 'reject'] as const)( @@ -103,49 +99,40 @@ describe('waitFor', () => { }) }) -describe('waitForReason', () => { - test('handles nested abort dispatch before its listener runs', async () => { - const source = new AbortController() - const nested = new AbortController() - const signal = AbortSignal.any([source.signal]) - signal.addEventListener('abort', () => nested.abort()) - - const reason = new Error('request canceled') - const result = waitForReason(Promise.resolve('late'), signal) - source.abort(reason) - - await expect(result).rejects.toBe(reason) - }) - - test('removes its abort listener once the wait settles', async () => { +describe('waitForRequest', () => { + test('shares one abort listener across concurrent and sequential waits', async () => { const controller = new AbortController() const addEventListener = vi.spyOn(controller.signal, 'addEventListener') - const removeEventListener = vi.spyOn( - controller.signal, - 'removeEventListener', - ) let resolveFirst!: (value: string) => void - let rejectSecond!: (error: unknown) => void + let resolveSecond!: (value: string) => void + let resolveThird!: (value: string) => void const first = new Promise((resolve) => { resolveFirst = resolve }) - const second = new Promise((_resolve, reject) => { - rejectSecond = reject + const second = new Promise((resolve) => { + resolveSecond = resolve + }) + const third = new Promise((resolve) => { + resolveThird = resolve }) - const firstResult = waitForReason(first, controller.signal) - const secondResult = waitForReason(second, controller.signal) - expect(addEventListener).toHaveBeenCalledTimes(2) + const firstResult = waitForRequest(first, controller.signal) + const secondResult = waitForRequest(second, controller.signal) + expect(addEventListener).toHaveBeenCalledTimes(1) resolveFirst('first') + resolveSecond('second') await expect(firstResult).resolves.toBe('first') - const failure = new Error('wait failed') - rejectSecond(failure) - await expect(secondResult).rejects.toBe(failure) + await expect(secondResult).resolves.toBe('second') - for (const [, listener] of addEventListener.mock.calls) { - expect(removeEventListener).toHaveBeenCalledWith('abort', listener) - } + const thirdResult = waitForRequest(third, controller.signal) + expect(addEventListener).toHaveBeenCalledTimes(1) + + const reason = new Error('request canceled') + controller.abort(reason) + await expect(thirdResult).rejects.toBe(reason) + resolveThird('third') + await Promise.resolve() }) test('rejects all active waits and observes their late values', async () => { @@ -161,8 +148,8 @@ describe('waitForReason', () => { const second = new Promise((resolve) => { resolveSecond = resolve }) - const firstResult = waitForReason(first, controller.signal, onFirstLate) - const secondResult = waitForReason(second, controller.signal, onSecondLate) + const firstResult = waitForRequest(first, controller.signal, onFirstLate) + const secondResult = waitForRequest(second, controller.signal, onSecondLate) controller.abort(reason) await expect(firstResult).rejects.toBe(reason) @@ -180,9 +167,7 @@ describe('waitForReason', () => { const controller = new AbortController() const reason = new Error('request canceled') const failure = new Error('wait failed') - const lateFailure = new Error('late failure') const onLate = vi.fn() - const onLateError = vi.fn() let resolveFirst!: (value: string) => void let rejectSecond!: (error: Error) => void let rejectThird!: (error: Error) => void @@ -195,14 +180,9 @@ describe('waitForReason', () => { const third = new Promise((_, reject) => { rejectThird = reject }) - const firstResult = waitForReason(first, controller.signal, onLate) - const secondResult = waitForReason(second, controller.signal) - const thirdResult = waitForReason( - third, - controller.signal, - undefined, - onLateError, - ) + const firstResult = waitForRequest(first, controller.signal, onLate) + const secondResult = waitForRequest(second, controller.signal) + const thirdResult = waitForRequest(third, controller.signal) rejectSecond(failure) await expect(secondResult).rejects.toBe(failure) @@ -212,14 +192,11 @@ describe('waitForReason', () => { await expect(thirdResult).rejects.toBe(reason) resolveFirst('late') - rejectThird(lateFailure) - await vi.waitFor(() => { - expect(onLate).toHaveBeenCalledWith('late') - expect(onLateError).toHaveBeenCalledWith(lateFailure) - }) + rejectThird(new Error('late failure')) + await vi.waitFor(() => expect(onLate).toHaveBeenCalledWith('late')) }) - test('isolates waits for different signals', async () => { + test('isolates waits for different request signals', async () => { const firstController = new AbortController() const secondController = new AbortController() const firstReason = new Error('first request canceled') @@ -239,8 +216,8 @@ describe('waitForReason', () => { const second = new Promise((resolve) => { resolveSecond = resolve }) - const firstResult = waitForReason(first, firstController.signal) - const secondResult = waitForReason(second, secondController.signal) + const firstResult = waitForRequest(first, firstController.signal) + const secondResult = waitForRequest(second, secondController.signal) expect(firstAddEventListener).toHaveBeenCalledOnce() expect(secondAddEventListener).toHaveBeenCalledOnce() @@ -259,25 +236,16 @@ describe('waitForReason', () => { const reason = new Error('request canceled') const lateError = new Error('late failure') const onLate = vi.fn() - const onLateError = vi.fn() controller.abort(reason) await expect( - waitForReason(Promise.resolve('late'), controller.signal, onLate), + waitForRequest(Promise.resolve('late'), controller.signal, onLate), ).rejects.toBe(reason) await expect( - waitForReason( - Promise.reject(lateError), - controller.signal, - undefined, - onLateError, - ), + waitForRequest(Promise.reject(lateError), controller.signal), ).rejects.toBe(reason) - await vi.waitFor(() => { - expect(onLate).toHaveBeenCalledWith('late') - expect(onLateError).toHaveBeenCalledWith(lateError) - }) + await vi.waitFor(() => expect(onLate).toHaveBeenCalledWith('late')) }) test('handles an abort during listener registration', async () => { @@ -298,80 +266,10 @@ describe('waitForReason', () => { resolve = resolveValue }) - const result = waitForReason(value, controller.signal, onLate) + const result = waitForRequest(value, controller.signal, onLate) await expect(result).rejects.toBe(reason) resolve('late') await vi.waitFor(() => expect(onLate).toHaveBeenCalledWith('late')) }) - - test('observes errors from late callbacks', async () => { - const unhandled: Array = [] - const onUnhandled = (error: unknown) => { - unhandled.push(error) - } - process.on('unhandledRejection', onUnhandled) - - try { - const reason = new Error('request canceled') - const thrownError = new Error('late callback threw') - const rejectedError = new Error('late callback rejected') - const throwLate = vi.fn(() => { - throw thrownError - }) - const rejectLate = vi.fn(() => { - return Promise.reject(rejectedError) - }) - const expectCanceled = (promise: Promise) => { - return expect(promise).rejects.toBe(reason) - } - const alreadyAborted = new AbortController() - alreadyAborted.abort(reason) - - await Promise.all([ - expectCanceled( - waitForReason( - Promise.resolve('late'), - alreadyAborted.signal, - throwLate, - ), - ), - expectCanceled( - waitForReason( - Promise.reject(new Error('late failure')), - alreadyAborted.signal, - undefined, - rejectLate, - ), - ), - ]) - - const controller = new AbortController() - const fulfilledWait = waitForReason( - Promise.resolve('late'), - controller.signal, - rejectLate, - ) - const rejectedWait = waitForReason( - Promise.reject(new Error('late failure')), - controller.signal, - undefined, - throwLate, - ) - controller.abort(reason) - - await Promise.all([ - expectCanceled(fulfilledWait), - expectCanceled(rejectedWait), - ]) - await new Promise((resolve) => setTimeout(resolve, 0)) - - expect(throwLate).toHaveBeenCalledTimes(2) - expect(rejectLate).toHaveBeenCalledTimes(2) - expect(unhandled).not.toContain(thrownError) - expect(unhandled).not.toContain(rejectedError) - } finally { - process.off('unhandledRejection', onUnhandled) - } - }) }) diff --git a/packages/router-core/tests/mask.test.ts b/packages/router-core/tests/mask.test.ts index 3722aa6a1b..3791206dd7 100644 --- a/packages/router-core/tests/mask.test.ts +++ b/packages/router-core/tests/mask.test.ts @@ -645,201 +645,3 @@ 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/match-by-path.test.ts b/packages/router-core/tests/match-by-path.test.ts index 301eb846d0..f742c22df9 100644 --- a/packages/router-core/tests/match-by-path.test.ts +++ b/packages/router-core/tests/match-by-path.test.ts @@ -1,6 +1,8 @@ import { describe, expect, it } from 'vitest' -import { findSingleMatch } from '../src/new-process-route-tree' -import { processTestRouteTree as processRouteTree } from './routerTestUtils' +import { + findSingleMatch, + processRouteTree, +} from '../src/new-process-route-tree' const { processedTree } = processRouteTree({ id: '__root__', diff --git a/packages/router-core/tests/match-params.test.ts b/packages/router-core/tests/match-params.test.ts index 9b254834f9..fe05808bd4 100644 --- a/packages/router-core/tests/match-params.test.ts +++ b/packages/router-core/tests/match-params.test.ts @@ -1,11 +1,8 @@ import { describe, expect, it, vi } from 'vitest' import { createMemoryHistory } from '@tanstack/history' -import { findRouteMatch } from '../src/new-process-route-tree' +import { findRouteMatch, processRouteTree } from '../src/new-process-route-tree' import { BaseRootRoute, BaseRoute, PathParamError } from '../src' -import { - createTestRouter, - processTestRouteTree as processRouteTree, -} from './routerTestUtils' +import { createTestRouter } from './routerTestUtils' type TestRoute = { id: string diff --git a/packages/router-core/tests/matching-interpolation.bench.ts b/packages/router-core/tests/matching-interpolation.bench.ts deleted file mode 100644 index 03fe060bfa..0000000000 --- a/packages/router-core/tests/matching-interpolation.bench.ts +++ /dev/null @@ -1,121 +0,0 @@ -import { describe, expect, test } from 'vitest' -import { createMemoryHistory } from '@tanstack/history' -import { BaseRootRoute, BaseRoute } from '../src' -import { createTestRouter } from './routerTestUtils' -import type { AnyRoute } from '../src' - -const cases = [ - { - name: 'nested required params', - segments: ['/orgs/$org', '/items/$id'], - paths: Array.from( - { length: 32 }, - (_, id) => `/orgs/team%20one/items/item%20${id}`, - ), - }, - { - name: 'non-overlapping params', - segments: ['/items/$id'], - paths: Array.from({ length: 256 }, (_, id) => `/items/item%20${id}`), - misses: true, - }, - { - name: 'missing optional params', - segments: ['/items/{-$lang}/$id'], - paths: Array.from({ length: 32 }, (_, id) => `/items/item%20${id}`), - }, - { - name: 'present optional params', - segments: ['/items/{-$lang}/$id'], - paths: Array.from({ length: 32 }, (_, id) => `/items/en/item%20${id}`), - }, - { - name: 'affixed splats', - segments: ['/files/prefix{$}.txt'], - paths: Array.from( - { length: 32 }, - (_, id) => `/files/prefixdocs/file%20${id}.txt`, - ), - }, -] - -for (const server of [false, true]) { - for (const primeLinks of [false, true]) { - describe(`matching interpolation (server: ${server}, Link-primed: ${primeLinks})`, () => { - for (const scenario of cases) { - const root = new BaseRootRoute({}) - let parent: AnyRoute = root - for (const path of scenario.segments) { - const parentRoute = parent - const route = new BaseRoute({ - getParentRoute: () => parentRoute, - path, - }) - parent.addChildren([route]) - parent = route - } - const history = createMemoryHistory({ initialEntries: ['/'] }) - const router = createTestRouter({ - routeTree: root, - history, - isServer: server, - scrollRestoration: false, - }) - history.destroy() - const options = { _controller: new AbortController() } - - for (const path of scenario.paths) { - router.getMatchedRoutes(path) - } - if (primeLinks) { - const paths = scenario.misses - ? scenario.paths - .slice(0, 32) - .map((path) => path.replace('item%20', 'cached%20')) - : scenario.paths - for (const path of paths) { - const [routes, params] = router.getMatchedRoutes(path) - for (const route of routes) { - const to: string = route.fullPath - if (to.includes('$')) { - router.buildLocation({ to, params }) - } - } - } - } - - let expected = 0 - for (const path of scenario.paths) { - const matches = router.matchRoutes(path, {}, options) - expect(matches.at(-1)?.routeId).toBe(parent.id) - for (const match of matches) { - expect(match.paramsError).toBeUndefined() - expected += - match.id.length + Object.keys(match._strictParams).length - } - } - let checksum = 0 - 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 - }, - ).run({ - time: 1000, - warmupTime: 300, - throws: true, - }) - }) - } - }) - } -} 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 86a7c4e659..5646ca4c23 100644 --- a/packages/router-core/tests/new-process-route-tree.test.ts +++ b/packages/router-core/tests/new-process-route-tree.test.ts @@ -3,8 +3,8 @@ import { findFlatMatch, findRouteMatch, processRouteMasks, + processRouteTree, } from '../src/new-process-route-tree' -import { processTestRouteTree as processRouteTree } from './routerTestUtils' import type { AnyRoute, RouteMask } from '../src' function makeTree(routes: Array) { @@ -1622,15 +1622,13 @@ describe('findRouteMatch', () => { const { processedTree } = processRouteTree(tree) expect(processedTree.segmentTree).toMatchInlineSnapshot(` { - "caseSensitive": undefined, - "data": undefined, "depth": 0, "dynamic": [ { "caseSensitive": false, - "data": undefined, "depth": 1, "dynamic": null, + "fullPath": "/$foo", "index": null, "kind": 1, "optional": null, @@ -1638,46 +1636,21 @@ describe('findRouteMatch', () => { "parse": null, "pathless": [ { - "caseSensitive": undefined, - "data": [ - [ - 1, - "foo", - "/", - "", - ], - ], "depth": 2, "dynamic": null, + "fullPath": "/$foo", "index": { - "caseSensitive": undefined, - "data": [ - [ - 1, - "foo", - "/", - "", - ], - ], "depth": 3, "dynamic": null, + "fullPath": "/$foo/", "index": null, "kind": 4, "optional": null, "parent": [Circular], "parse": null, "pathless": null, - "prefix": undefined, "priority": 0, "route": { - "_interpolation": [ - [ - 1, - "foo", - "/", - "", - ], - ], "fullPath": "/$foo/", "id": "/$foo/_layout/", "options": {}, @@ -1685,7 +1658,6 @@ describe('findRouteMatch', () => { }, "static": null, "staticInsensitive": null, - "suffix": undefined, "wildcard": null, }, "kind": 5, @@ -1693,42 +1665,16 @@ describe('findRouteMatch', () => { "parent": [Circular], "parse": [Function], "pathless": null, - "prefix": undefined, "priority": 0, "route": { - "_interpolation": [ - [ - 1, - "foo", - "/", - "", - ], - ], "children": [ { - "_interpolation": [ - [ - 1, - "foo", - "/", - "", - ], - "/bar", - ], "fullPath": "/$foo/bar", "id": "/$foo/_layout/bar", "options": {}, "path": "bar", }, { - "_interpolation": [ - [ - 1, - "foo", - "/", - "", - ], - ], "fullPath": "/$foo/", "id": "/$foo/_layout/", "options": {}, @@ -1747,36 +1693,17 @@ describe('findRouteMatch', () => { "static": null, "staticInsensitive": Map { "bar" => { - "caseSensitive": undefined, - "data": [ - [ - 1, - "foo", - "/", - "", - ], - "/bar", - ], "depth": 3, "dynamic": null, + "fullPath": "/$foo/bar", "index": null, "kind": 0, "optional": null, "parent": [Circular], "parse": null, "pathless": null, - "prefix": undefined, "priority": 0, "route": { - "_interpolation": [ - [ - 1, - "foo", - "/", - "", - ], - "/bar", - ], "fullPath": "/$foo/bar", "id": "/$foo/_layout/bar", "options": {}, @@ -1784,11 +1711,9 @@ describe('findRouteMatch', () => { }, "static": null, "staticInsensitive": null, - "suffix": undefined, "wildcard": null, }, }, - "suffix": undefined, "wildcard": null, }, ], @@ -1798,36 +1723,17 @@ describe('findRouteMatch', () => { "static": null, "staticInsensitive": Map { "hello" => { - "caseSensitive": undefined, - "data": [ - [ - 1, - "foo", - "/", - "", - ], - "/hello", - ], "depth": 2, "dynamic": null, + "fullPath": "/$foo/hello", "index": null, "kind": 0, "optional": null, "parent": [Circular], "parse": null, "pathless": null, - "prefix": undefined, "priority": 0, "route": { - "_interpolation": [ - [ - 1, - "foo", - "/", - "", - ], - "/hello", - ], "fullPath": "/$foo/hello", "id": "/$foo/hello", "options": {}, @@ -1835,7 +1741,6 @@ describe('findRouteMatch', () => { }, "static": null, "staticInsensitive": null, - "suffix": undefined, "wildcard": null, }, }, @@ -1843,21 +1748,19 @@ describe('findRouteMatch', () => { "wildcard": null, }, ], + "fullPath": "/", "index": { - "caseSensitive": undefined, - "data": undefined, "depth": 1, "dynamic": null, + "fullPath": "/", "index": null, "kind": 4, "optional": null, "parent": [Circular], "parse": null, "pathless": null, - "prefix": undefined, "priority": 0, "route": { - "_interpolation": undefined, "fullPath": "/", "id": "/", "options": {}, @@ -1865,20 +1768,17 @@ describe('findRouteMatch', () => { }, "static": null, "staticInsensitive": null, - "suffix": undefined, "wildcard": null, }, "kind": 0, "optional": null, - "parent": undefined, + "parent": null, "parse": null, "pathless": null, - "prefix": undefined, "priority": 0, "route": null, "static": null, "staticInsensitive": null, - "suffix": undefined, "wildcard": null, } `) @@ -1961,7 +1861,7 @@ describe('findRouteMatch', () => { }) }) -describe('processRouteMasks', { concurrent: false }, () => { +describe('processRouteMasks', { sequential: true }, () => { const routeTree = { id: '__root__', isRoot: true, diff --git a/packages/router-core/tests/optional-path-params-clean.test.ts b/packages/router-core/tests/optional-path-params-clean.test.ts index 36ed96f227..e3a09c2cf2 100644 --- a/packages/router-core/tests/optional-path-params-clean.test.ts +++ b/packages/router-core/tests/optional-path-params-clean.test.ts @@ -1,20 +1,55 @@ import { describe, expect, it } from 'vitest' import { interpolatePath } from '../src/path' -import { - parseTestPathname as parsePathname, - processTestRouteTree as processRouteTree, -} from './routerTestUtils' import { SEGMENT_TYPE_OPTIONAL_PARAM, SEGMENT_TYPE_PATHNAME, - SEGMENT_TYPE_WILDCARD, findSingleMatch, - parseSegments, + parseSegment, + processRouteTree, } from '../src/new-process-route-tree' +import type { SegmentKind } from '../src/new-process-route-tree' describe('Optional Path Parameters - Clean Comprehensive Tests', () => { describe('Optional Dynamic Parameters {-$param}', () => { describe('parsePathname', () => { + type PathSegment = { + type: SegmentKind + value: string + prefixSegment?: string + suffixSegment?: string + // Indicates if there is a static segment after this required/optional param + hasStaticAfter?: boolean + } + + const parsePathname = (to: string | undefined) => { + let cursor = 0 + let data + const path = to ?? '' + const segments: Array = [] + while (cursor < path.length) { + const start = cursor + data = parseSegment(path, start, data) + const end = data[5] + cursor = end + 1 + const type = data[0] + const value = path.substring(data[2], data[3]) + const prefix = path.substring(start, data[1]) + const suffix = path.substring(data[4], end) + const segment: PathSegment = { + type, + value, + } + if (prefix) { + segment.prefixSegment = prefix + } + if (suffix) { + segment.suffixSegment = suffix + } + segments.push(segment) + } + return segments + } + it('should parse single optional dynamic param', () => { const result = parsePathname('/posts/{-$category}') expect(result).toEqual([ @@ -52,40 +87,53 @@ describe('Optional Path Parameters - Clean Comprehensive Tests', () => { describe('interpolatePath', () => { it('should interpolate optional dynamic params when present', () => { - const path = '/posts/{-$category}' - const segments = parseSegments(false, { fullPath: path }, 0) - expect(interpolatePath(path, segments, { category: 'tech' })).toBe( - '/posts/tech', - ) + const result = interpolatePath({ + path: '/posts/{-$category}', + params: { category: 'tech' }, + }) + expect(result.interpolatedPath).toBe('/posts/tech') }) it('should omit optional dynamic params when missing', () => { - const path = '/posts/{-$category}' - const segments = parseSegments(false, { fullPath: path }, 0) - expect(interpolatePath(path, segments, {})).toBe('/posts') + const result = interpolatePath({ + path: '/posts/{-$category}', + params: {}, + }) + expect(result.interpolatedPath).toBe('/posts') }) it('should handle multiple optional dynamic params', () => { - const path = '/posts/{-$category}/{-$slug}' - const segments = parseSegments(false, { fullPath: path }, 0) - expect( - interpolatePath(path, segments, { category: 'tech', slug: 'hello' }), - ).toBe('/posts/tech/hello') - expect(interpolatePath(path, segments, { category: 'tech' })).toBe( - '/posts/tech', - ) - expect(interpolatePath(path, segments, {})).toBe('/posts') + const result1 = interpolatePath({ + path: '/posts/{-$category}/{-$slug}', + params: { category: 'tech', slug: 'hello' }, + }) + expect(result1.interpolatedPath).toBe('/posts/tech/hello') + + const result2 = interpolatePath({ + path: '/posts/{-$category}/{-$slug}', + params: { category: 'tech' }, + }) + expect(result2.interpolatedPath).toBe('/posts/tech') + + const result3 = interpolatePath({ + path: '/posts/{-$category}/{-$slug}', + params: {}, + }) + expect(result3.interpolatedPath).toBe('/posts') }) it('should handle mixed required and optional dynamic params', () => { - const path = '/posts/{-$category}/user/$id' - const segments = parseSegments(false, { fullPath: path }, 0) - expect( - interpolatePath(path, segments, { category: 'tech', id: '123' }), - ).toBe('/posts/tech/user/123') - expect(interpolatePath(path, segments, { id: '123' })).toBe( - '/posts/user/123', - ) + const result = interpolatePath({ + path: '/posts/{-$category}/user/$id', + params: { category: 'tech', id: '123' }, + }) + expect(result.interpolatedPath).toBe('/posts/tech/user/123') + + const result2 = interpolatePath({ + path: '/posts/{-$category}/user/$id', + params: { id: '123' }, + }) + expect(result2.interpolatedPath).toBe('/posts/user/123') }) }) @@ -158,46 +206,44 @@ describe('Optional Path Parameters - Clean Comprehensive Tests', () => { describe('Edge Cases', () => { it('should handle optional params with wildcards', () => { - const path = '/docs/{-$version}/$' - const segments = parseSegments(false, { fullPath: path }, 0) - expect( - interpolatePath(path, segments, { - version: 'v1', - _splat: 'guide/intro', - }), - ).toBe('/docs/v1/guide/intro') - expect(interpolatePath(path, segments, { _splat: 'guide/intro' })).toBe( - '/docs/guide/intro', - ) + const result = interpolatePath({ + path: '/docs/{-$version}/$', + params: { version: 'v1', _splat: 'guide/intro' }, + }) + expect(result.interpolatedPath).toBe('/docs/v1/guide/intro') + + const result2 = interpolatePath({ + path: '/docs/{-$version}/$', + params: { _splat: 'guide/intro' }, + }) + expect(result2.interpolatedPath).toBe('/docs/guide/intro') }) it('should work with complex patterns', () => { const pattern = '/app/{-$env}/api/{-$version}/users/$id/{-$tab}' - const segments = parseSegments(false, { fullPath: pattern }, 0) // All params provided - expect( - interpolatePath(pattern, segments, { - env: 'prod', - version: 'v2', - id: '123', - tab: 'settings', - }), - ).toBe('/app/prod/api/v2/users/123/settings') - - // Only required param - expect(interpolatePath(pattern, segments, { id: '123' })).toBe( - '/app/api/users/123', + const result1 = interpolatePath({ + path: pattern, + params: { env: 'prod', version: 'v2', id: '123', tab: 'settings' }, + }) + expect(result1.interpolatedPath).toBe( + '/app/prod/api/v2/users/123/settings', ) + // Only required param + const result2 = interpolatePath({ + path: pattern, + params: { id: '123' }, + }) + expect(result2.interpolatedPath).toBe('/app/api/users/123') + // Mix of optional and required - expect( - interpolatePath(pattern, segments, { - env: 'dev', - id: '456', - tab: 'profile', - }), - ).toBe('/app/dev/api/users/456/profile') + const result3 = interpolatePath({ + path: pattern, + params: { env: 'dev', id: '456', tab: 'profile' }, + }) + expect(result3.interpolatedPath).toBe('/app/dev/api/users/456/profile') }) }) }) diff --git a/packages/router-core/tests/optional-path-params.test.ts b/packages/router-core/tests/optional-path-params.test.ts index 4d3c2ee76e..ec1c6bff92 100644 --- a/packages/router-core/tests/optional-path-params.test.ts +++ b/packages/router-core/tests/optional-path-params.test.ts @@ -1,16 +1,13 @@ import { describe, expect, it } from 'vitest' import { interpolatePath } from '../src/path' -import { - parseTestPathname as parsePathname, - processTestRouteTree as processRouteTree, -} from './routerTestUtils' import { SEGMENT_TYPE_OPTIONAL_PARAM, SEGMENT_TYPE_PARAM, SEGMENT_TYPE_PATHNAME, SEGMENT_TYPE_WILDCARD, findSingleMatch, - parseSegments, + parseSegment, + processRouteTree, } from '../src/new-process-route-tree' import type { SegmentKind } from '../src/new-process-route-tree' @@ -28,6 +25,34 @@ describe('Optional Path Parameters', () => { }> describe('parsePathname with optional params', () => { + const parsePathname = (to: string | undefined) => { + let cursor = 0 + let data + const path = to ?? '' + const segments: Array = [] + while (cursor < path.length) { + const start = cursor + data = parseSegment(path, start, data) + const end = data[5] + cursor = end + 1 + const type = data[0] + const value = path.substring(data[2], data[3]) + const prefix = path.substring(start, data[1]) + const suffix = path.substring(data[4], end) + const segment: PathSegment = { + type, + value, + } + if (prefix) { + segment.prefixSegment = prefix + } + if (suffix) { + segment.suffixSegment = suffix + } + segments.push(segment) + } + return segments + } it.each([ { name: 'regular optional param', @@ -344,8 +369,7 @@ describe('Optional Path Parameters', () => { result: '/posts/42', }, ])('$name', ({ path, params, result }) => { - const segments = parseSegments(false, { fullPath: path }, 0) - expect(interpolatePath(path, segments, params)).toBe(result) + expect(interpolatePath({ path, params }).interpolatedPath).toBe(result) }) }) @@ -474,9 +498,10 @@ describe('Optional Path Parameters', () => { it('should handle optional parameters with validation', () => { // This test will be expanded when we implement params.parse for optional params const path = '/posts/{-$category}' - const segments = parseSegments(false, { fullPath: path }, 0) const params = { category: 'tech' } - expect(interpolatePath(path, segments, params)).toBe('/posts/tech') + expect(interpolatePath({ path, params }).interpolatedPath).toBe( + '/posts/tech', + ) }) it('should handle multiple consecutive optional parameters correctly', () => { diff --git a/packages/router-core/tests/original-param-names.test.ts b/packages/router-core/tests/original-param-names.test.ts deleted file mode 100644 index aca4c61ae4..0000000000 --- a/packages/router-core/tests/original-param-names.test.ts +++ /dev/null @@ -1,143 +0,0 @@ -import { expect, test } from 'vitest' -import { - findFlatMatch, - findRouteMatch, - findSingleMatch, - processRouteMasks, -} from '../src/new-process-route-tree' -import { processTestRouteTree as processRouteTree } from './routerTestUtils' - -test('keeps original names when different templates share a trie prefix', () => { - const tree = processRouteTree({ - id: '__root__', - isRoot: true, - fullPath: '/', - children: [ - { id: '/$id/first', path: '$id/first', fullPath: '/$id/first' }, - { - id: '/{$name}/second', - path: '{$name}/second', - fullPath: '/{$name}/second', - }, - ], - }).processedTree - expect(findRouteMatch('/one/first', tree)?.rawParams).toEqual({ id: 'one' }) - expect(findRouteMatch('/two/second', tree)?.rawParams).toEqual({ - name: 'two', - }) -}) - -test("keeps a terminal route's names when a later alias adds a parser", () => { - const tree = processRouteTree({ - id: '__root__', - isRoot: true, - fullPath: '/', - children: [ - { id: '/$id/detail', path: '$id/detail', fullPath: '/$id/detail' }, - { - id: '/$name', - path: '$name', - fullPath: '/$name', - children: [ - { - id: '/$name/detail', - path: 'detail', - fullPath: '/$name/detail', - options: { - params: { parse: (params: Record) => params }, - }, - }, - ], - }, - ], - }).processedTree - const match = findRouteMatch('/abc/detail', tree) - expect(match?.route.id).toBe('/$id/detail') - expect(match?.rawParams).toEqual({ id: 'abc' }) -}) - -test('resumes through a route-less parse gate with skipped optional names', () => { - const seen: Array> = [] - const tree = processRouteTree({ - id: '__root__', - isRoot: true, - fullPath: '/', - children: [ - { - id: '/$id', - path: '$id', - fullPath: '/$id', - children: [ - { - id: '/$id/_layout', - fullPath: '/$id', - options: { - params: { - parse: (params: Record) => { - seen.push({ ...params }) - }, - }, - }, - children: [ - { - id: '/$id/_layout/{-$lang}/$slug', - path: '{-$lang}/$slug', - fullPath: '/$id/{-$lang}/$slug', - }, - ], - }, - ], - }, - ], - }).processedTree - expect(findRouteMatch('/one/post', tree)?.rawParams).toEqual({ - id: 'one', - slug: 'post', - }) - expect(findRouteMatch('/two/en/post', tree)?.rawParams).toEqual({ - id: 'two', - lang: 'en', - slug: 'post', - }) - expect(seen).toEqual([{ id: 'one' }, { id: 'two' }]) -}) - -test('retains nested mask branches without modifying their definitions', () => { - const tree = processRouteTree({ - id: '__root__', - fullPath: '/', - isRoot: true, - }).processedTree - const child = Object.freeze({ from: '/$id/detail' }) - const mask = Object.freeze({ from: '/$id', children: [child] }) - processRouteMasks([mask], tree) - const match = findFlatMatch('/one/detail', tree) - expect(match?.route).toBe(child) - expect(match?.rawParams).toEqual({ id: 'one' }) - expect(Object.keys(mask)).toEqual(['from', 'children']) - expect(Object.keys(child)).toEqual(['from']) -}) - -test('retains mask and single-match names without modifying frozen definitions', () => { - const tree = processRouteTree({ - id: '__root__', - isRoot: true, - fullPath: '/', - }).processedTree - const mask = Object.freeze({ from: '/pre{$code}/file' }) - processRouteMasks([mask], tree) - expect(findFlatMatch('/prea%20b/file', tree)?.rawParams).toEqual({ - code: 'a b', - }) - - expect(Object.keys(mask)).toEqual(['from']) - expect( - findSingleMatch( - '/{$first}/{-$middle}/$last', - false, - false, - '/one/two', - tree, - )?.rawParams, - ).toEqual({ first: 'one', last: 'two' }) -}) diff --git a/packages/router-core/tests/parse-segment.test.ts b/packages/router-core/tests/parse-segment.test.ts deleted file mode 100644 index 4b160f4644..0000000000 --- a/packages/router-core/tests/parse-segment.test.ts +++ /dev/null @@ -1,52 +0,0 @@ -import { expect, test } from 'vitest' -import { - SEGMENT_TYPE_OPTIONAL_PARAM, - SEGMENT_TYPE_PARAM, - SEGMENT_TYPE_PATHNAME, - SEGMENT_TYPE_WILDCARD, - parseSegment, -} from '../src/new-process-route-tree' - -test('keeps offsets beyond the former 16-bit scratch buffer range', () => { - const path = `/${'x'.repeat(70_000)}/$id` - const literal = parseSegment(path, 1, 70_001) - expect(typeof literal).toBe('string') - expect(literal.length).toBe(70_000) - expect(parseSegment(path, 70_002, path.length)).toEqual([ - SEGMENT_TYPE_PARAM, - 'id', - '', - '', - ]) -}) - -test.each([ - [SEGMENT_TYPE_PATHNAME, 'pre{bad}{$id}', '', 'pre{bad}{$id}', ''], - [SEGMENT_TYPE_PATHNAME, '{-$}', '', '{-$}', ''], - [SEGMENT_TYPE_PATHNAME, '{--$id}', '', '{--$id}', ''], - [SEGMENT_TYPE_PARAM, '}pre{$a{b}.txt', '}pre', 'a{b', '.txt'], - [SEGMENT_TYPE_PARAM, '$id{suffix}', '', 'id{suffix}', ''], - [SEGMENT_TYPE_PARAM, '{$$}', '', '$', ''], - [SEGMENT_TYPE_OPTIONAL_PARAM, 'pre{-$a$b}suffix', 'pre', 'a$b', 'suffix'], - [SEGMENT_TYPE_WILDCARD, 'pre{$}suffix/tail', 'pre', '_splat', 'suffix/tail'], - [SEGMENT_TYPE_WILDCARD, '$/tail', '', '_splat', ''], -] as const)( - 'preserves the first segment grammar for %s: %s', - (kind, source, prefix, value, suffix) => { - const path = `/base/${source}` - const next = path.indexOf('/', 6) - const parsed = parseSegment(path, 6, next === -1 ? path.length : next) - expect( - typeof parsed === 'string' ? SEGMENT_TYPE_PATHNAME : parsed[0 /* kind */], - ).toBe(kind) - expect(typeof parsed === 'string' ? '' : parsed[2 /* prefix */]).toBe( - prefix, - ) - expect(typeof parsed === 'string' ? parsed : parsed[1 /* key */]).toBe( - value, - ) - expect( - typeof parsed === 'string' ? '' : (parsed[3 /* suffix */] ?? ''), - ).toBe(suffix) - }, -) diff --git a/packages/router-core/tests/path-decoder.bench.ts b/packages/router-core/tests/path-decoder.bench.ts deleted file mode 100644 index 4c56a8aa76..0000000000 --- a/packages/router-core/tests/path-decoder.bench.ts +++ /dev/null @@ -1,66 +0,0 @@ -import { describe, expect, test } from 'vitest' -import { createMemoryHistory } from '@tanstack/history' -import { BaseRootRoute, BaseRoute } from '../src' -import { createTestRouter } from './routerTestUtils' - -describe.each(['stable', 'new-router', 'no-update'] as const)( - 'path decoder: %s configuration', - (mode) => { - const makeRouter = (allowed: ReadonlyArray<'@' | '+'>) => { - const root = new BaseRootRoute({}) - const item = new BaseRoute({ - getParentRoute: () => root, - path: '/items/$id', - }) - const router = createTestRouter({ - routeTree: root.addChildren([item]), - history: createMemoryHistory({ initialEntries: ['/'] }), - pathParamsAllowedCharacters: allowed, - scrollRestoration: false, - }) - router.history.destroy() - return router - } - let router = makeRouter(['@']) - const inputs = Array.from({ length: 200 }, (_, index) => ({ - to: '/items/$id', - params: { id: `item-${index % 40}@+` }, - })) - let count = 0 - let lastHref = '' - const run = () => { - count++ - if (mode === 'new-router') { - router = makeRouter(count % 2 === 0 ? ['+'] : ['@']) - } else if (mode === 'stable') { - router.update({ - ...router.options, - context: { count }, - }) - } - for (const input of inputs) { - lastHref = router.buildLocation(input).href - } - } - const verify = () => { - expect(lastHref).toBe( - mode === 'new-router' && count % 2 === 0 - ? '/items/item-39%40+' - : '/items/item-39@%2B', - ) - } - run() - 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-decoder.test.ts b/packages/router-core/tests/path-decoder.test.ts deleted file mode 100644 index bf27b93134..0000000000 --- a/packages/router-core/tests/path-decoder.test.ts +++ /dev/null @@ -1,92 +0,0 @@ -import { afterEach, expect, test, vi } from 'vitest' -import { createMemoryHistory } from '@tanstack/history' -import { BaseRootRoute, BaseRoute } from '../src' -import * as pathUtils from '../src/path' -import { createTestRouter } from './routerTestUtils' - -afterEach(() => vi.restoreAllMocks()) - -test.each([ - { allowed: ['.', '@'], input: 'x%40.y', expected: 'x@.y' }, - { allowed: ['*', '@'], input: 'pre%40*post', expected: 'pre@*post' }, - { allowed: ['(', ')', '@'], input: '(%40)', expected: '(@)' }, - { allowed: ['|', '@'], input: '%7C%40%2F', expected: '|@%2F' }, - { allowed: ['12@', '1'], input: '12%40', expected: '12@' }, - { allowed: ['%', '/'], input: '%252F/%2F', expected: '%2F//' }, - { allowed: ['@', '@', '+'], input: '%40%2B', expected: '@+' }, - { allowed: [], input: '%40', expected: '%40' }, -])( - 'compiles literal decoder alternatives: $allowed', - ({ allowed, input, expected }) => { - expect(pathUtils.compileDecodeCharMap(allowed)(input)).toBe(expected) - }, -) - -function setup(allowed?: Array<'@' | '+'>) { - const root = new BaseRootRoute({}) - const item = new BaseRoute({ getParentRoute: () => root, path: '/items/$id' }) - const router = createTestRouter({ - routeTree: root.addChildren([item]), - history: createMemoryHistory({ initialEntries: ['/'] }), - pathParamsAllowedCharacters: allowed, - scrollRestoration: false, - }) - router.history.destroy() - const build = () => - router.buildLocation({ to: '/items/$id', params: { id: '@+' } }).href - return { router, build } -} - -test('keeps the decoder across provider option updates', () => { - const allowed: Array<'@' | '+'> = ['@'] - const { router, build } = setup(allowed) - const decoder = router.pathParamsDecoder - expect(build()).toBe('/items/@%2B') - const compile = vi.spyOn(pathUtils, 'compileDecodeCharMap') - for (let count = 0; count < 3; count++) { - router.update({ - ...router.options, - context: { count }, - }) - expect(build()).toBe('/items/@%2B') - expect(router.pathParamsDecoder).toBe(decoder) - } - expect(compile).not.toHaveBeenCalled() -}) - -test('requires a new router to apply changes to the original character array', () => { - const allowed: Array<'@' | '+'> = ['@'] - const { router, build } = setup(allowed) - const decoder = router.pathParamsDecoder - expect(build()).toBe('/items/@%2B') - allowed[0] = '+' - router.update({ context: {} }) - expect(router.pathParamsDecoder).toBe(decoder) - expect(build()).toBe('/items/@%2B') - expect( - router.buildLocation({ to: '/items/$id', params: { id: 'new@+' } }).href, - ).toBe('/items/new@%2B') - expect(setup(allowed).build()).toBe('/items/%40+') -}) - -test('does not change encoding through unsupported option updates', () => { - const { router, build } = setup(['@']) - const compile = vi.spyOn(pathUtils, 'compileDecodeCharMap') - expect(build()).toBe('/items/@%2B') - // @ts-expect-error Path encoding can only be configured at construction. - router.update({ pathParamsAllowedCharacters: undefined }) - expect( - router.buildLocation({ to: '/items/$id', params: { id: 'new@+' } }).href, - ).toBe('/items/new@%2B') - expect(compile).not.toHaveBeenCalled() -}) - -test('does not create a decoder for empty or omitted allowed characters', () => { - const compile = vi.spyOn(pathUtils, 'compileDecodeCharMap') - for (const allowed of [undefined, []]) { - const { router, build } = setup(allowed) - expect(router.pathParamsDecoder).toBeUndefined() - expect(build()).toBe('/items/%40%2B') - } - expect(compile).not.toHaveBeenCalled() -}) diff --git a/packages/router-core/tests/path-interpolation.bench.ts b/packages/router-core/tests/path-interpolation.bench.ts deleted file mode 100644 index 80d3478594..0000000000 --- a/packages/router-core/tests/path-interpolation.bench.ts +++ /dev/null @@ -1,290 +0,0 @@ -import { describe, expect, test } from 'vitest' -import { - createMemoryHistory, - normalizeProtocolRelative, -} from '@tanstack/history' -import { BaseRootRoute, BaseRoute } from '../src' -import { compileDecodeCharMap, interpolatePath } from '../src/path' -import { parseSegments } from '../src/new-process-route-tree' -import { decodePath } from '../src/utils' -import { createTestRouter } from './routerTestUtils' -import type { AnyRoute } from '../src' -import type { PathInterpolationTestOptions } from './routerTestUtils' - -const scenarios: Array<{ - name: string - inputs: Array - register?: boolean -}> = [ - { - name: 'single-param shared hits', - inputs: Array.from({ length: 200 }, (_, index) => ({ - path: '/items/$id', - params: { id: `item ${Math.floor(index / 5)}`, unrelated: index }, - })), - }, - { - name: 'multi-param shared hits', - inputs: Array.from({ length: 200 }, (_, index) => ({ - path: '/orgs/$orgId/items/$id', - params: { - orgId: `org:${Math.floor(index / 5) % 4}`, - id: `item/${Math.floor(index / 5)}`, - }, - })), - }, - { - name: 'result eviction', - inputs: Array.from({ length: 256 }, (_, index) => ({ - path: '/items/$id', - params: { id: `item ${index}` }, - })), - }, - { - name: '64-template working set', - inputs: Array.from({ length: 64 }, (_, index) => ({ - path: `/section-${index}/$id`, - params: { id: 'item one' }, - })), - }, - { - name: '256-template working set', - inputs: Array.from({ length: 256 }, (_, index) => ({ - path: `/section-${index}/$id`, - params: { id: 'item one' }, - })), - }, - { - name: 'unregistered template eviction', - register: false, - inputs: Array.from({ length: 64 }, (_, index) => ({ - path: `/section-${index}/$id`, - params: { id: 'item one' }, - })), - }, - { - name: 'mixed optional and splat params', - inputs: Array.from({ length: 200 }, (_, index) => { - switch (index % 5) { - case 0: - return { path: '/posts/{-$category}', params: {} } - case 1: - return { - path: '/posts/{-$category}', - params: { category: `news-${index % 10}` }, - } - case 2: - return { path: '/users/$id', params: { id: index } } - case 3: - return { path: '/files/$', params: { _splat: `docs/${index % 20}` } } - default: - return { path: '/about', params: {} } - } - }), - }, - { - name: 'missing required and splat params', - inputs: Array.from({ length: 200 }, (_, index) => { - switch (index % 5) { - case 0: - return { path: '/$first/$second', params: { second: 'two' } } - case 1: - return { - path: '/$first/$second', - params: { first: undefined, second: 'two' }, - } - case 2: - return { path: '/$first/{-$second}', params: {} } - case 3: - return { path: '/files/$', params: {} } - default: - return { path: '/files/prefix{$}suffix', params: { _splat: '' } } - } - }), - }, - { - name: 'affixed mixed segments', - inputs: Array.from({ length: 200 }, (_, index) => ({ - path: '/root/prefix{$id}suffix/{-$language}/files/{$}.txt', - params: { - id: `item ${index % 40}`, - language: index % 2 ? 'en' : undefined, - _splat: index % 3 ? `docs/file ${index % 20}` : '', - }, - })), - }, -] - -const decoder = compileDecodeCharMap(['@', '+']) -for (const { inputs } of scenarios) { - for (const input of inputs) { - input.decoder = decoder - input.server = false - } -} -scenarios.push( - ...scenarios.map(({ name, inputs, register }) => ({ - name: `server ${name}`, - inputs: inputs.map((input) => ({ ...input, server: true })), - register, - })), -) - -describe.each(scenarios)('$name', ({ inputs, register = true }) => { - const root = new BaseRootRoute({}) - const routes = new Map( - [...new Set(inputs.map((input) => input.path))].map((path) => [ - path, - new BaseRoute({ getParentRoute: () => root, path }), - ]), - ) - const router = createTestRouter({ - routeTree: register ? root.addChildren([...routes.values()]) : root, - history: createMemoryHistory({ initialEntries: ['/'] }), - isServer: inputs[0]?.server, - pathParamsAllowedCharacters: ['@', '+'], - scrollRestoration: false, - }) - router.history.destroy() - // Reference values come from a fresh standalone parse, independent of any - // route-owned segments under test. - const referencePathname = (input: PathInterpolationTestOptions) => - interpolatePath( - input.path, - parseSegments(false, { fullPath: input.path }, 0), - input.params, - input.decoder, - ) - // Mirrors how buildLocation turns a template into a canonical pathname. - const canonicalPathname = ( - path: string, - params: Record, - route: AnyRoute | undefined, - ) => - normalizeProtocolRelative( - decodePath( - interpolatePath( - path, - route?._interpolation ?? parseSegments(false, { fullPath: path }, 0), - params, - router.pathParamsDecoder, - ), - ), - ) - const calls = inputs - .filter((input) => input.path.includes('$')) - .map((input) => ({ - path: input.path, - params: input.params, - route: register ? routes.get(input.path) : undefined, - expected: decodePath(referencePathname(input)), - })) - let checksum = 0 - const expected = inputs.reduce( - (sum, input) => sum + referencePathname(input).length, - 0, - ) - const cachedExpected = calls.reduce((sum, call) => { - expect(canonicalPathname(call.path, call.params, call.route)).toBe( - call.expected, - ) - return sum + call.expected.length - }, 0) - for (const call of calls) { - expect(canonicalPathname(call.path, call.params, call.route)).toBe( - call.expected, - ) - } - - const preparedInputs = inputs.map((input) => ({ - ...input, - segments: register - ? routes.get(input.path)?._interpolation - : parseSegments(false, { fullPath: input.path }, 0), - })) - - 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, - }) - }) - - 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, - }) - }) - - 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, - }) - }) -}) diff --git a/packages/router-core/tests/path.test.ts b/packages/router-core/tests/path.test.ts index dac91a80fa..8e4f5ed1db 100644 --- a/packages/router-core/tests/path.test.ts +++ b/packages/router-core/tests/path.test.ts @@ -1,8 +1,7 @@ -import { afterEach, describe, expect, it, vi } from 'vitest' +import { describe, expect, it, vi } from 'vitest' import { compileDecodeCharMap, exactPathTest, - hasMissingPathParams, interpolatePath, removeTrailingSlash, resolvePath, @@ -13,372 +12,12 @@ import { SEGMENT_TYPE_PATHNAME, SEGMENT_TYPE_WILDCARD, findSingleMatch, - getParamNames, - parseSegments, + parseSegment, + processRouteTree, } from '../src/new-process-route-tree' import { createSieveCache } from '../src/sieve-cache' -import { - createTestPathInterpolator as createPathInterpolator, - parseTestPathname as parsePathname, - processTestRouteTree as processRouteTree, -} from './routerTestUtils' import type { SegmentKind } from '../src/new-process-route-tree' -afterEach(() => vi.restoreAllMocks()) - -describe.each([false, true])( - 'pathname interpolation (server: %s)', - (server) => { - it.each([ - { path: '/', params: {}, expected: '/' }, - { path: '/users/', params: {}, expected: '/users/' }, - { path: '/users/$id', params: { id: '123' }, expected: '/users/123' }, - { path: '/users/$id', params: { id: 0 }, expected: '/users/0' }, - { path: '/users/$id', params: {}, expected: '/users/undefined' }, - { - path: '/users/$id', - params: { id: 'a/b?#@+' }, - expected: '/users/a%2Fb%3F%23%40%2B', - }, - { - path: '/users/$id', - params: { id: 'cafe\u0301' }, - expected: '/users/cafe%CC%81', - normalized: '/users/cafe\u0301', - }, - { - path: '/users/{$id}.json', - params: { id: '123' }, - expected: '/users/123.json', - }, - { path: '/posts/{-$category}', params: {}, expected: '/posts' }, - { - path: '/posts/{-$category}', - params: { category: undefined }, - expected: '/posts', - }, - { - path: '/posts/{-$category}', - params: { category: '' }, - expected: '/posts/', - }, - { - path: '/posts/{-$category}', - params: { category: 'news' }, - expected: '/posts/news', - }, - { - path: '/posts/prefix{-$category}suffix', - params: { category: 'news' }, - expected: '/posts/prefixnewssuffix', - }, - { - path: '/files/$', - params: { _splat: 'a b/c+d' }, - expected: '/files/a%20b/c%2Bd', - normalized: '/files/a b/c%2Bd', - }, - { - path: '/files/prefix{$}suffix', - params: { _splat: 'a/b' }, - expected: '/files/prefixa/bsuffix', - }, - { path: '/files/$', params: { _splat: '' }, expected: '/files' }, - { path: '/files/$', params: { _splat: 0 }, expected: '/files/0' }, - { - path: '/files/prefix{$}.txt', - params: { _splat: 0 }, - expected: '/files/prefix0.txt', - }, - { - path: '/$id/$id/', - params: { id: '123' }, - expected: '/123/123/', - }, - ])( - 'interpolates $path with $params', - ({ path, params, expected, normalized }) => { - const interpolate = createPathInterpolator({ isServer: server }) - const options = { path, params, server } - const segments = parseSegments(false, { fullPath: path }, 0) - expect(interpolatePath(path, segments, params)).toBe(expected) - expect(interpolate(options)).toBe(normalized ?? expected) - expect(interpolate({ ...options, params: { ...params } })).toBe( - normalized ?? expected, - ) - }, - ) - - it('formats non-string values on every call', () => { - const interpolate = createPathInterpolator({ isServer: server }) - const toString = vi.fn(() => 'one two') - const options = { - path: '/users/$id', - params: { id: { toString } }, - server, - } - expect(interpolate(options)).toBe('/users/one two') - expect(toString).toHaveBeenCalledOnce() - toString.mockReturnValue('next value') - expect(interpolate(options)).toBe('/users/next value') - expect(toString).toHaveBeenCalledTimes(2) - }) - - it('separates results between fixed encoding configurations', () => { - const allowAt = createPathInterpolator({ - isServer: server, - pathParamsAllowedCharacters: ['@'], - }) - const allowPlus = createPathInterpolator({ - isServer: server, - pathParamsAllowedCharacters: ['+'], - }) - const standard = createPathInterpolator({ isServer: server }) - const options = { - path: '/users/$id', - params: { id: '@+' }, - server, - } - expect(allowAt(options)).toBe('/users/@%2B') - expect(allowPlus(options)).toBe('/users/%40+') - expect(standard(options)).toBe('/users/%40%2B') - expect(allowAt(options)).toBe('/users/@%2B') - }) - - it('keeps each router encoding independent across templates', () => { - const allowAt = createPathInterpolator({ - isServer: server, - pathParamsAllowedCharacters: ['@'], - }) - const allowPlus = createPathInterpolator({ - isServer: server, - pathParamsAllowedCharacters: ['+'], - }) - const standard = createPathInterpolator({ isServer: server }) - for (const [interpolate, encoded] of [ - [allowAt, '@%2B'], - [allowPlus, '%40+'], - [standard, '%40%2B'], - [allowAt, '@%2B'], - ] as const) { - for (const prefix of ['/users/', '/teams/']) { - const path = prefix + '$id' - const options = { path, params: { id: '@+' }, server } - expect(interpolate(options)).toBe(prefix + encoded) - } - } - }) - - it('does not confuse parameter boundaries', () => { - const interpolate = createPathInterpolator({ isServer: server }) - const options = { path: '/$first/$second', server } - const first = { first: 'a:b', second: 'c' } - const second = { first: 'a', second: 'b:c' } - - expect(interpolate({ ...options, params: first })).toBe('/a%3Ab/c') - expect(interpolate({ ...options, params: second })).toBe('/a/b%3Ac') - expect(interpolate({ ...options, params: first })).toBe('/a%3Ab/c') - }) - - it('keeps templates separate when parameter values are equal', () => { - const interpolate = createPathInterpolator({ isServer: server }) - const params = { id: '123' } - - expect(interpolate({ path: '/users/$id', params })).toBe('/users/123') - expect(interpolate({ path: '/posts/$id', params })).toBe('/posts/123') - expect(interpolate({ path: '/users/$id', params })).toBe('/users/123') - }) - - it('formats optional params from their current values', () => { - const interpolate = createPathInterpolator({ isServer: server }) - const path = '/posts/{-$category}/$id' - const inputs = [ - { params: { id: 'one' }, expected: '/posts/one' }, - { - params: { id: 'one', category: 'news' }, - expected: '/posts/news/one', - }, - { - params: { id: 'one', category: undefined }, - expected: '/posts/one', - }, - { params: { id: 'one', category: '' }, expected: '/posts//one' }, - { - params: { id: 'one', category: 'updates' }, - expected: '/posts/updates/one', - }, - ] - - for (const { params, expected } of [...inputs, ...inputs]) { - const options = { path, params, server } - expect(interpolate(options)).toBe(expected) - } - }) - - it('uses the canonical splat value instead of its legacy alias', () => { - const interpolate = createPathInterpolator({ - isServer: server, - pathParamsAllowedCharacters: ['@'], - }) - const options = { - path: '/files/$', - params: { _splat: 'docs/@guide', '*': 'ignored' }, - server, - } - - expect(interpolate(options)).toBe('/files/docs/@guide') - expect( - interpolate({ - ...options, - params: { _splat: 'docs/@guide', '*': 'changed' }, - }), - ).toBe('/files/docs/@guide') - }) - - it('collects used params for splats but not missing optionals', () => { - const usedParams: Record = Object.create(null) - interpolatePath( - '/posts/{-$category}', - parseSegments(false, { fullPath: '/posts/{-$category}' }, 0), - {}, - undefined, - usedParams, - ) - expect(usedParams).toEqual({}) - interpolatePath( - '/files/$', - parseSegments(false, { fullPath: '/files/$' }, 0), - { _splat: 'docs/guide' }, - undefined, - usedParams, - ) - expect(usedParams).toEqual({ - _splat: 'docs/guide', - '*': 'docs/guide', - }) - expect(Object.getPrototypeOf(usedParams)).toBeNull() - }) - - it.each([ - { - params: { id: 'one two', _splat: 'docs/file name' }, - path: '/root/prefixone%20twosuffix/files/docs/file%20name.txt', - used: { - id: 'one two', - _splat: 'docs/file name', - '*': 'docs/file name', - }, - missing: false, - }, - { - params: { id: '', language: '', _splat: '' }, - path: '/root/prefixsuffix//files/.txt', - used: { id: '', language: '', _splat: '', '*': '' }, - missing: true, - }, - { - params: {}, - path: '/root/prefixundefinedsuffix/files/.txt', - used: { id: undefined, _splat: undefined, '*': undefined }, - missing: true, - }, - ])( - 'keeps mixed segment metadata in one pass for $params', - ({ params, path, used, missing }) => { - const template = '/root/prefix{$id}suffix/{-$language}/files/{$}.txt' - const segments = parseSegments(false, { fullPath: template }, 0) - const usedParams: Record = Object.create(null) - expect( - interpolatePath(template, segments, params, undefined, usedParams), - ).toBe(path) - expect(getParamNames(segments)).toEqual(['id', 'language', '_splat']) - expect(usedParams).toEqual(used) - expect(hasMissingPathParams(segments, params)).toBe(missing) - expect(interpolatePath(template, segments, params)).toBe(path) - }, - ) - - it.each([ - { - path: '/$first/$second', - params: { second: 'two' }, - pathname: '/undefined/two', - usedParams: { first: undefined, second: 'two' }, - missing: true, - }, - { - path: '/$first/$second', - params: { first: undefined, second: 'two' }, - pathname: '/undefined/two', - usedParams: { first: undefined, second: 'two' }, - missing: false, - }, - { - path: '/{-$first}/$second', - params: { second: 'two' }, - pathname: '/two', - usedParams: { second: 'two' }, - missing: false, - }, - { - path: '/$first/{-$second}', - params: {}, - pathname: '/undefined', - usedParams: { first: undefined }, - missing: true, - }, - { - path: '/$first/prefix{$}suffix', - params: { first: 'one' }, - pathname: '/one/prefixsuffix', - usedParams: { first: 'one', _splat: undefined, '*': undefined }, - missing: true, - }, - ])( - 'preserves missing-param metadata for $path with $params', - ({ path, params, pathname, usedParams, missing }) => { - const segments = parseSegments(false, { fullPath: path }, 0) - const collectedParams: Record = Object.create(null) - expect( - interpolatePath(path, segments, params, undefined, collectedParams), - ).toBe(pathname) - expect(collectedParams).toEqual(usedParams) - expect(hasMissingPathParams(segments, params)).toBe(missing) - }, - ) - - it('tracks a splat that was empty when the template was first used', () => { - const interpolate = createPathInterpolator({ isServer: server }) - for (const _splat of ['', 'docs/guide', '', 'docs/reference']) { - const options = { - path: '/files/prefix{$}suffix', - params: { _splat }, - server, - } - expect(interpolate(options)).toBe(`/files/prefix${_splat}suffix`) - } - }) - - it('does not retain incomplete metadata when the first interpolation throws', () => { - const interpolate = createPathInterpolator({ isServer: server }) - const options = { path: '/$first/$second', server } - - expect(() => - interpolate({ - ...options, - params: { first: '\uD800', second: 'one' }, - }), - ).toThrow(URIError) - - for (const second of ['two', 'three', 'two']) { - expect( - interpolate({ ...options, params: { first: 'valid', second } }), - ).toBe(`/valid/${second}`) - } - }) - }, -) - describe.each([{ basepath: '/' }, { basepath: '/app' }, { basepath: '/app/' }])( 'removeTrailingSlash with basepath $basepath', ({ basepath }) => { @@ -476,43 +115,79 @@ describe('resolvePath', () => { ['/posts', '../../data:text/html,test', '/data:text/html,test'], ])('resolves correctly', (a, b, eq) => { it(`${a} to ${b} === ${eq}`, () => { - expect(resolvePath(a, b)).toEqual(eq) + expect(resolvePath({ base: a, to: b })).toEqual(eq) }) it(`${a}/ to ${b} === ${eq} (trailing slash)`, () => { - expect(resolvePath(a + '/', b)).toEqual(eq) + expect(resolvePath({ base: a + '/', to: b })).toEqual(eq) }) it(`${a}/ to ${b}/ === ${eq} (trailing slash + trailing slash)`, () => { - expect(resolvePath(a + '/', b + '/')).toEqual(eq) + expect(resolvePath({ base: a + '/', to: b + '/' })).toEqual(eq) }) }) it('normalizes repeated slashes when resolving the base path', () => { - expect(resolvePath('/a//b', '.')).toBe('/a/b') + expect(resolvePath({ base: '/a//b', to: '.' })).toBe('/a/b') }) describe('trailingSlash', () => { describe(`'always'`, () => { it('keeps trailing slash', () => { - expect(resolvePath('/a/b/c', 'd/', 'always')).toBe('/a/b/c/d/') + expect( + resolvePath({ + base: '/a/b/c', + to: 'd/', + trailingSlash: 'always', + }), + ).toBe('/a/b/c/d/') }) it('adds trailing slash', () => { - expect(resolvePath('/a/b/c', 'd', 'always')).toBe('/a/b/c/d/') + expect( + resolvePath({ + base: '/a/b/c', + to: 'd', + trailingSlash: 'always', + }), + ).toBe('/a/b/c/d/') }) }) describe(`'never'`, () => { it('removes trailing slash', () => { - expect(resolvePath('/a/b/c', 'd/', 'never')).toBe('/a/b/c/d') + expect( + resolvePath({ + base: '/a/b/c', + to: 'd/', + trailingSlash: 'never', + }), + ).toBe('/a/b/c/d') }) it('does not add trailing slash', () => { - expect(resolvePath('/a/b/c', 'd', 'never')).toBe('/a/b/c/d') + expect( + resolvePath({ + base: '/a/b/c', + to: 'd', + trailingSlash: 'never', + }), + ).toBe('/a/b/c/d') }) }) describe(`'preserve'`, () => { it('keeps trailing slash', () => { - expect(resolvePath('/a/b/c', 'd/', 'preserve')).toBe('/a/b/c/d/') + expect( + resolvePath({ + base: '/a/b/c', + to: 'd/', + trailingSlash: 'preserve', + }), + ).toBe('/a/b/c/d/') }) it('does not add trailing slash', () => { - expect(resolvePath('/a/b/c', 'd', 'preserve')).toBe('/a/b/c/d') + expect( + resolvePath({ + base: '/a/b/c', + to: 'd', + trailingSlash: 'preserve', + }), + ).toBe('/a/b/c/d') }) }) @@ -523,7 +198,7 @@ describe('resolvePath', () => { ] as const)( "normalizes repeated slashes with trailingSlash '%s'", (trailingSlash, to, expected) => { - expect(resolvePath('/', to, trailingSlash)).toBe(expected) + expect(resolvePath({ base: '/', to, trailingSlash })).toBe(expected) }, ) }) @@ -549,7 +224,13 @@ describe('resolvePath', () => { }, ])('$name', ({ to }) => { const candidate = base + trimPathLeft(to) - expect(resolvePath(base, candidate, 'never')).toEqual(candidate) + expect( + resolvePath({ + base, + to: candidate, + trailingSlash: 'never', + }), + ).toEqual(candidate) }) }) @@ -571,465 +252,441 @@ describe('resolvePath', () => { }, ])('$name', ({ to }) => { const candidate = base + trimPathLeft(to) - expect(resolvePath(base, candidate, 'never')).toEqual(candidate) + expect( + resolvePath({ + base, + to: candidate, + trailingSlash: 'never', + }), + ).toEqual(candidate) }) }) }, ) it('preserves explicit route-template param syntax', () => { - expect(resolvePath('/{$language}', '.')).toBe('/{$language}') + expect( + resolvePath({ + base: '/{$language}', + to: '.', + }), + ).toBe('/{$language}') - expect(resolvePath('/{$language}/posts', '../{$language}')).toBe( - '/{$language}/{$language}', - ) + expect( + resolvePath({ + base: '/{$language}/posts', + to: '../{$language}', + }), + ).toBe('/{$language}/{$language}') }) it('caches route-template paths without changing param syntax', () => { const cache = createSieveCache(10) const set = vi.spyOn(cache, 'set') - expect(resolvePath('/', '{$id}', undefined, cache)).toBe('/{$id}') - expect(resolvePath('/', '$id', undefined, cache)).toBe('/$id') - expect(resolvePath('/', '{$id}', undefined, cache)).toBe('/{$id}') - expect(resolvePath('/', '$id', undefined, cache)).toBe('/$id') + expect(resolvePath({ base: '/', to: '{$id}', cache })).toBe('/{$id}') + expect(resolvePath({ base: '/', to: '$id', cache })).toBe('/$id') + expect(resolvePath({ base: '/', to: '{$id}', cache })).toBe('/{$id}') + expect(resolvePath({ base: '/', to: '$id', cache })).toBe('/$id') expect(set).toHaveBeenCalledTimes(2) }) }) -describe('interpolatePath', () => { - it.each(['value', '', undefined])( - 'stops interpolation at a bare splat with value %s', - (_splat) => { - const params = { - _splat, - get ignored() { - throw new Error('A bare splat consumes the rest of the template') +describe.each([{ server: true }, { server: false }])( + 'interpolatePath (server: $server)', + ({ server }) => { + describe('regular usage', () => { + it.each([ + { + name: 'should interpolate the path', + path: '/users/$id', + params: { id: '123' }, + result: '/users/123', + }, + { + name: 'should interpolate the path', + path: '/users/$id', + params: { id: '123_' }, + result: '/users/123_', + }, + { + name: 'should interpolate the path with multiple params', + path: '/users/$id/$name', + params: { id: '123', name: 'tanner' }, + result: '/users/123/tanner', + }, + { + name: 'should interpolate the path with multiple params', + path: '/users/$id/$name', + params: { id: '123_', name: 'tanner' }, + result: '/users/123_/tanner', + }, + { + name: 'should interpolate the path with extra params', + path: '/users/$id', + params: { id: '123', name: 'tanner' }, + result: '/users/123', + }, + { + name: 'should interpolate the path with missing params', + path: '/users/$id/$name', + params: { id: '123' }, + result: '/users/123/undefined', + }, + { + name: 'should interpolate the path with missing params and extra params', + path: '/users/$id', + params: { name: 'john' }, + result: '/users/undefined', + }, + { + name: 'should interpolate the path with the param being a number', + path: '/users/$id', + params: { id: 123 }, + result: '/users/123', + }, + { + name: 'should interpolate the path with the param being a falsey number', + path: '/users/$id', + params: { id: 0 }, + result: '/users/0', + }, + { + name: 'should interpolate the path with URI component encoding', + path: '/users/$id', + params: { id: '?#@john+smith' }, + result: '/users/%3F%23%40john%2Bsmith', + }, + { + name: 'should interpolate the path without URI encoding characters in decodeCharMap', + path: '/users/$id', + params: { id: '?#@john+smith' }, + result: '/users/%3F%23@john+smith', + decoder: compileDecodeCharMap(['@', '+']), + }, + { + name: 'should interpolate the path with the splat param at the end', + path: '/users/$', + params: { _splat: '123' }, + result: '/users/123', + }, + { + name: 'should interpolate the path with a single named path param and the splat param at the end', + path: '/users/$username/$', + params: { username: 'seancassiere', _splat: '123' }, + result: '/users/seancassiere/123', + }, + { + name: 'should interpolate the path with 2 named path params with the splat param at the end', + path: '/users/$username/$id/$', + params: { username: 'seancassiere', id: '123', _splat: '456' }, + result: '/users/seancassiere/123/456', + }, + { + name: 'should interpolate the path with multiple named path params with the splat param at the end', + path: '/$username/settings/$repo/$id/$', + params: { + username: 'sean-cassiere', + repo: 'my-repo', + id: '123', + _splat: '456', + }, + result: '/sean-cassiere/settings/my-repo/123/456', + }, + { + name: 'should interpolate the path with the splat param containing slashes', + path: '/users/$', + params: { _splat: 'sean/cassiere' }, + result: '/users/sean/cassiere', + }, + ])('$name', ({ path, params, decoder, result }) => { + expect( + interpolatePath({ + path, + params, + decoder, + server, + }).interpolatedPath, + ).toBe(result) + }) + }) + + describe('preserve trailing slash', () => { + it.each([ + { + path: '/', + params: {}, + result: '/', + }, + { + path: '/a/b/', + params: {}, + result: '/a/b/', + }, + { + path: '/a/$id/', + params: { id: '123' }, + result: '/a/123/', + }, + { + path: '/a/{-$id}/', + params: { id: '123' }, + result: '/a/123/', + }, + ])( + 'should preserve trailing slash for $path', + ({ path, params, result }) => { + expect( + interpolatePath({ + path, + params, + server, + }).interpolatedPath, + ).toBe(result) }, - } - const segments = parseSegments( - false, - { fullPath: '/files/$/$ignored' }, - 0, ) - const used: Record = Object.create(null) - expect( - interpolatePath('/files/$/$ignored', segments, params, undefined, used), - ).toBe(_splat ? '/files/value' : '/files') - expect(getParamNames(segments)).toEqual(['_splat']) - expect(used).toEqual({ _splat, '*': _splat }) - }, - ) + }) - it.each([ - { path: '/', expected: '/' }, - { path: '/about/', expected: '/about/' }, - ])('preserves static paths: $path', ({ path, expected }) => { - const params = { - get unused() { - throw new Error('Static paths must not read params') - }, - } - const segments = parseSegments(false, { fullPath: path }, 0) - const decoder = vi.fn() - const usedParams: Record = Object.create(null) - expect(interpolatePath(path, segments, params, decoder, usedParams)).toBe( - expected, - ) - expect(usedParams).toEqual({}) - expect(getParamNames(segments)).toEqual([]) - expect(hasMissingPathParams(segments, params)).toBe(false) - expect(decoder).not.toHaveBeenCalled() - }) - - it.each([ - { - path: '/users/$id', - params: {}, - expected: '/users/undefined', - missing: true, - }, - { - path: '/users/$id', - params: { id: 'one' }, - expected: '/users/one', - missing: false, - }, - { - path: '/posts/{-$category}', - params: {}, - expected: '/posts', - missing: false, - }, - { path: '/files/$', params: {}, expected: '/files', missing: true }, - ])( - 'collects only missing status for $path', - ({ path, params, expected, missing }) => { - const segments = parseSegments(false, { fullPath: path }, 0) - expect(interpolatePath(path, segments, params)).toBe(expected) - expect(hasMissingPathParams(segments, params)).toBe(missing) - }, - ) - - describe('regular usage', () => { - it.each([ - { - name: 'should interpolate the path', - path: '/users/$id', - params: { id: '123' }, - result: '/users/123', - }, - { - name: 'should interpolate the path', - path: '/users/$id', - params: { id: '123_' }, - result: '/users/123_', - }, - { - name: 'should interpolate the path with multiple params', - path: '/users/$id/$name', - params: { id: '123', name: 'tanner' }, - result: '/users/123/tanner', - }, - { - name: 'should interpolate the path with multiple params', - path: '/users/$id/$name', - params: { id: '123_', name: 'tanner' }, - result: '/users/123_/tanner', - }, - { - name: 'should interpolate the path with extra params', - path: '/users/$id', - params: { id: '123', name: 'tanner' }, - result: '/users/123', - }, - { - name: 'should interpolate the path with missing params', - path: '/users/$id/$name', - params: { id: '123' }, - result: '/users/123/undefined', - }, - { - name: 'should interpolate the path with missing params and extra params', - path: '/users/$id', - params: { name: 'john' }, - result: '/users/undefined', - }, - { - name: 'should interpolate the path with the param being a number', - path: '/users/$id', - params: { id: 123 }, - result: '/users/123', - }, - { - name: 'should interpolate the path with the param being a falsey number', - path: '/users/$id', - params: { id: 0 }, - result: '/users/0', - }, - { - name: 'should interpolate the path with the splat param being a falsey number', - path: '/users/$', - params: { _splat: 0 }, - result: '/users/0', - }, - { - name: 'should interpolate the path with URI component encoding', - path: '/users/$id', - params: { id: '?#@john+smith' }, - result: '/users/%3F%23%40john%2Bsmith', - }, - { - name: 'should interpolate the path without URI encoding characters in decodeCharMap', - path: '/users/$id', - params: { id: '?#@john+smith' }, - result: '/users/%3F%23@john+smith', - decoder: compileDecodeCharMap(['@', '+']), - }, - { - name: 'should interpolate the path with the splat param at the end', - path: '/users/$', - params: { _splat: '123' }, - result: '/users/123', - }, - { - name: 'should interpolate the path with a single named path param and the splat param at the end', - path: '/users/$username/$', - params: { username: 'seancassiere', _splat: '123' }, - result: '/users/seancassiere/123', - }, - { - name: 'should interpolate the path with 2 named path params with the splat param at the end', - path: '/users/$username/$id/$', - params: { username: 'seancassiere', id: '123', _splat: '456' }, - result: '/users/seancassiere/123/456', - }, - { - name: 'should interpolate the path with multiple named path params with the splat param at the end', - path: '/$username/settings/$repo/$id/$', - params: { - username: 'sean-cassiere', - repo: 'my-repo', - id: '123', - _splat: '456', + describe('wildcard (prefix + suffix)', () => { + it.each([ + { + name: 'regular', + to: '/$', + params: { _splat: 'bar/foo/me' }, + result: '/bar/foo/me', }, - result: '/sean-cassiere/settings/my-repo/123/456', - }, - { - name: 'should interpolate the path with the splat param containing slashes', - path: '/users/$', - params: { _splat: 'sean/cassiere' }, - result: '/users/sean/cassiere', - }, - ])('$name', ({ path, params, decoder, result }) => { - const segments = parseSegments(false, { fullPath: path }, 0) - expect(interpolatePath(path, segments, params, decoder)).toBe(result) - }) - }) - - describe('preserve trailing slash', () => { - it.each([ - { - path: '/', - params: {}, - result: '/', - }, - { - path: '/a/b/', - params: {}, - result: '/a/b/', - }, - { - path: '/a/$id/', - params: { id: '123' }, - result: '/a/123/', - }, - { - path: '/a/{-$id}/', - params: { id: '123' }, - result: '/a/123/', - }, - ])( - 'should preserve trailing slash for $path', - ({ path, params, result }) => { - const segments = parseSegments(false, { fullPath: path }, 0) - expect(interpolatePath(path, segments, params)).toBe(result) - }, - ) - }) - - describe('wildcard (prefix + suffix)', () => { - it.each([ - { - name: 'regular', - to: '/$', - params: { _splat: 'bar/foo/me' }, - result: '/bar/foo/me', - }, - { - name: 'regular curly braces', - to: '/{$}', - params: { _splat: 'bar/foo/me' }, - result: '/bar/foo/me', - }, - { - name: 'with prefix', - to: '/prefix{$}', - params: { _splat: 'bar' }, - result: '/prefixbar', - }, - { - name: 'with suffix', - to: '/{$}-suffix', - params: { _splat: 'bar' }, - result: '/bar-suffix', - }, - { - name: 'with prefix + suffix', - to: '/prefix{$}-suffix', - params: { _splat: 'bar' }, - result: '/prefixbar-suffix', - }, - ])('$name', ({ to, params, result }) => { - const segments = parseSegments(false, { fullPath: to }, 0) - expect(interpolatePath(to, segments, params)).toBe(result) - }) - }) - - describe('splat params with special characters', () => { - it.each([ - { - name: 'should encode spaces in splat param', - path: '/$', - params: { _splat: 'file name.pdf' }, - result: '/file%20name.pdf', - }, - { - name: 'should preserve parentheses in splat param (RFC 3986 unreserved)', - path: '/$', - params: { _splat: 'file(1).pdf' }, - result: '/file(1).pdf', - }, - { - name: 'should encode brackets in splat param', - path: '/$', - params: { _splat: 'file[1].pdf' }, - result: '/file%5B1%5D.pdf', - }, - { - name: 'should encode spaces in nested splat param paths', - path: '/$', - params: { _splat: 'folder/sub folder/file name.pdf' }, - result: '/folder/sub%20folder/file%20name.pdf', - }, - { - name: 'should encode spaces and brackets but preserve parentheses', - path: '/$', - params: { _splat: 'docs/file (copy) [2].pdf' }, - result: '/docs/file%20(copy)%20%5B2%5D.pdf', - }, - { - name: 'should encode hash in splat param', - path: '/$', - params: { _splat: 'page#section' }, - result: '/page%23section', - }, - { - name: 'should handle splat param with prefix and special characters', - path: '/files/prefix{$}', - params: { _splat: 'my file.pdf' }, - result: '/files/prefixmy%20file.pdf', - }, - { - name: 'should encode plus signs in splat param', - path: '/$', - params: { _splat: 'file+name.pdf' }, - result: '/file%2Bname.pdf', - }, - { - name: 'should encode equals signs in splat param', - path: '/$', - params: { _splat: 'query=value' }, - result: '/query%3Dvalue', - }, - ])('$name', ({ path, params, result }) => { - const segments = parseSegments(false, { fullPath: path }, 0) - expect(interpolatePath(path, segments, params)).toBe(result) - }) - }) - - describe('named params (prefix + suffix)', () => { - it.each([ - { - name: 'regular', - to: '/$foo', - params: { foo: 'bar' }, - result: '/bar', - }, - { - name: 'regular curly braces', - to: '/{$foo}', - params: { foo: 'bar' }, - result: '/bar', - }, - { - name: 'with prefix', - to: '/prefix{$bar}', - params: { bar: 'baz' }, - result: '/prefixbaz', - }, - { - name: 'with suffix', - to: '/{$foo}.suffix', - params: { foo: 'bar' }, - result: '/bar.suffix', - }, - { - name: 'with suffix', - to: '/{$foo}.suffix', - params: { foo: 'bar_' }, - result: '/bar_.suffix', - }, - { - name: 'with prefix and suffix', - to: '/prefix{$param}.suffix', - params: { param: 'foobar' }, - result: '/prefixfoobar.suffix', - }, - ])('$name', ({ to, params, result }) => { - const segments = parseSegments(false, { fullPath: to }, 0) - expect(interpolatePath(to, segments, params)).toBe(result) - }) - }) - - describe('should handle missing _splat parameter for', () => { - it.each([ - { - name: 'basic splat route', - path: '/hello/$', - params: {}, - expectedResult: '/hello', - }, - { - name: 'splat route with prefix', - path: '/hello/prefix{$}', - params: {}, - expectedResult: '/hello/prefix', - }, - { - name: 'splat route with suffix', - path: '/hello/{$}suffix', - params: {}, - expectedResult: '/hello/suffix', - }, - { - name: 'splat route with prefix and suffix', - path: '/hello/prefix{$}suffix', - params: {}, - expectedResult: '/hello/prefixsuffix', - }, - { - name: 'splat route with empty splat', - path: '/hello/$', - params: { - _splat: '', + { + name: 'regular curly braces', + to: '/{$}', + params: { _splat: 'bar/foo/me' }, + result: '/bar/foo/me', }, - expectedResult: '/hello', - }, - { - name: 'splat route with undefined splat', - path: '/hello/$', - params: { - _splat: undefined, + { + name: 'with prefix', + to: '/prefix{$}', + params: { _splat: 'bar' }, + result: '/prefixbar', }, - expectedResult: '/hello', - }, - ])('$name', ({ path, params, expectedResult }) => { - const segments = parseSegments(false, { fullPath: path }, 0) - expect(interpolatePath(path, segments, params)).toBe(expectedResult) - expect(hasMissingPathParams(segments, params)).toBe(true) + { + name: 'with suffix', + to: '/{$}-suffix', + params: { _splat: 'bar' }, + result: '/bar-suffix', + }, + { + name: 'with prefix + suffix', + to: '/prefix{$}-suffix', + params: { _splat: 'bar' }, + result: '/prefixbar-suffix', + }, + ])('$name', ({ to, params, result }) => { + expect( + interpolatePath({ + path: to, + params, + server, + }).interpolatedPath, + ).toBe(result) + }) }) - }) - describe('resolvePath + interpolatePath', () => { - it.each(['never', 'preserve', 'always'] as const)( - 'trailing slash: %s', - (trailingSlash) => { - const tail = trailingSlash === 'always' ? '/' : '' - const defaultedFromPath = '/' - const fromPath = resolvePath(defaultedFromPath, '.', trailingSlash) - const nextTo = resolvePath(fromPath, '/splat/$', trailingSlash) - const nextParams = { _splat: '' } - const interpolatedNextTo = interpolatePath( - nextTo, - parseSegments(false, { fullPath: nextTo }, 0), - nextParams, - ) - expect(interpolatedNextTo).toBe(`/splat${tail}`) - }, - ) - }) -}) + describe('splat params with special characters', () => { + it.each([ + { + name: 'should encode spaces in splat param', + path: '/$', + params: { _splat: 'file name.pdf' }, + result: '/file%20name.pdf', + }, + { + name: 'should preserve parentheses in splat param (RFC 3986 unreserved)', + path: '/$', + params: { _splat: 'file(1).pdf' }, + result: '/file(1).pdf', + }, + { + name: 'should encode brackets in splat param', + path: '/$', + params: { _splat: 'file[1].pdf' }, + result: '/file%5B1%5D.pdf', + }, + { + name: 'should encode spaces in nested splat param paths', + path: '/$', + params: { _splat: 'folder/sub folder/file name.pdf' }, + result: '/folder/sub%20folder/file%20name.pdf', + }, + { + name: 'should encode spaces and brackets but preserve parentheses', + path: '/$', + params: { _splat: 'docs/file (copy) [2].pdf' }, + result: '/docs/file%20(copy)%20%5B2%5D.pdf', + }, + { + name: 'should encode hash in splat param', + path: '/$', + params: { _splat: 'page#section' }, + result: '/page%23section', + }, + { + name: 'should handle splat param with prefix and special characters', + path: '/files/prefix{$}', + params: { _splat: 'my file.pdf' }, + result: '/files/prefixmy%20file.pdf', + }, + { + name: 'should encode plus signs in splat param', + path: '/$', + params: { _splat: 'file+name.pdf' }, + result: '/file%2Bname.pdf', + }, + { + name: 'should encode equals signs in splat param', + path: '/$', + params: { _splat: 'query=value' }, + result: '/query%3Dvalue', + }, + ])('$name', ({ path, params, result }) => { + expect( + interpolatePath({ + path, + params, + server, + }).interpolatedPath, + ).toBe(result) + }) + }) + + describe('named params (prefix + suffix)', () => { + it.each([ + { + name: 'regular', + to: '/$foo', + params: { foo: 'bar' }, + result: '/bar', + }, + { + name: 'regular curly braces', + to: '/{$foo}', + params: { foo: 'bar' }, + result: '/bar', + }, + { + name: 'with prefix', + to: '/prefix{$bar}', + params: { bar: 'baz' }, + result: '/prefixbaz', + }, + { + name: 'with suffix', + to: '/{$foo}.suffix', + params: { foo: 'bar' }, + result: '/bar.suffix', + }, + { + name: 'with suffix', + to: '/{$foo}.suffix', + params: { foo: 'bar_' }, + result: '/bar_.suffix', + }, + { + name: 'with prefix and suffix', + to: '/prefix{$param}.suffix', + params: { param: 'foobar' }, + result: '/prefixfoobar.suffix', + }, + ])('$name', ({ to, params, result }) => { + expect( + interpolatePath({ + path: to, + params, + server, + }).interpolatedPath, + ).toBe(result) + }) + }) + + describe('should handle missing _splat parameter for', () => { + it.each([ + { + name: 'basic splat route', + path: '/hello/$', + params: {}, + expectedResult: '/hello', + }, + { + name: 'splat route with prefix', + path: '/hello/prefix{$}', + params: {}, + expectedResult: '/hello/prefix', + }, + { + name: 'splat route with suffix', + path: '/hello/{$}suffix', + params: {}, + expectedResult: '/hello/suffix', + }, + { + name: 'splat route with prefix and suffix', + path: '/hello/prefix{$}suffix', + params: {}, + expectedResult: '/hello/prefixsuffix', + }, + { + name: 'splat route with empty splat', + path: '/hello/$', + params: { + _splat: '', + }, + expectedResult: '/hello', + }, + { + name: 'splat route with undefined splat', + path: '/hello/$', + params: { + _splat: undefined, + }, + expectedResult: '/hello', + }, + ])('$name', ({ path, params, expectedResult }) => { + const result = interpolatePath({ + path, + params, + server, + }) + expect(result.interpolatedPath).toBe(expectedResult) + expect(result.isMissingParams).toBe(true) + }) + }) + + describe('resolvePath + interpolatePath', () => { + it.each(['never', 'preserve', 'always'] as const)( + 'trailing slash: %s', + (trailingSlash) => { + const tail = trailingSlash === 'always' ? '/' : '' + const defaultedFromPath = '/' + const fromPath = resolvePath({ + base: defaultedFromPath, + to: '.', + trailingSlash, + }) + const nextTo = resolvePath({ + base: fromPath, + to: '/splat/$', + trailingSlash, + }) + const nextParams = { _splat: '' } + const interpolatedNextTo = interpolatePath({ + path: nextTo, + params: nextParams, + server, + }).interpolatedPath + expect(interpolatedNextTo).toBe(`/splat${tail}`) + }, + ) + }) + }, +) describe('matchPathname', () => { const { processedTree } = processRouteTree({ @@ -1292,6 +949,35 @@ describe('parsePathname', () => { suffixSegment?: string } + const parsePathname = (to: string | undefined) => { + let cursor = 0 + let data + const path = to ?? '' + const segments: Array = [] + while (cursor < path.length) { + const start = cursor + data = parseSegment(path, start, data) + const end = data[5] + cursor = end + 1 + const type = data[0] + const value = path.substring(data[2], data[3]) + const prefix = path.substring(start, data[1]) + const suffix = path.substring(data[4], end) + const segment: PathSegment = { + type, + value, + } + if (prefix) { + segment.prefixSegment = prefix + } + if (suffix) { + segment.suffixSegment = suffix + } + segments.push(segment) + } + return segments + } + describe('regular usage', () => { it.each([ { diff --git a/packages/router-core/tests/public-hydration-contract.test.ts b/packages/router-core/tests/public-hydration-contract.test.ts index aea458b3f5..c593bdf020 100644 --- a/packages/router-core/tests/public-hydration-contract.test.ts +++ b/packages/router-core/tests/public-hydration-contract.test.ts @@ -1,3 +1,4 @@ +import { runInNewContext } from 'node:vm' import { afterEach, beforeEach, @@ -15,15 +16,37 @@ import { redirect, } from '../src' import { hydrate } from '../src/ssr/client' +import { attachRouterServerSsrUtils } from '../src/ssr/ssr-server' import { dehydrateSsrMatchId } from '../src/ssr/ssr-match-id' -import { createTestRouter, dehydrateToBootstrap } from './routerTestUtils' -import type { AnyRouteMatch, LocationRewrite } from '../src' +import { createTestRouter } from './routerTestUtils' +import type { AnyRouteMatch, AnyRouter, LocationRewrite } from '../src' import type { DehydratedRouter, TsrSsrGlobal } from '../src/ssr/types' import type { ServerManifest } from '../src/manifest' const testManifest: ServerManifest = { routes: {} } const browserWindow = window +async function dehydrateToBootstrap(router: AnyRouter): Promise { + attachRouterServerSsrUtils({ router, manifest: testManifest }) + try { + await router.load() + await router.serverSsr!.dehydrate() + + const script = router.serverSsr!.takeBufferedScripts() + expect(script?.children).toBeTruthy() + + const context: Record = { + document: { currentScript: { remove() {} } }, + } + context.self = context + runInNewContext(script!.children!, context) + + return context.$_TSR + } finally { + router.serverSsr?.cleanup() + } +} + function installHydrationPayload( mockWindow: { $_TSR?: TsrSsrGlobal }, matches: DehydratedRouter['matches'], @@ -132,7 +155,7 @@ describe('public hydration contracts', () => { }), isServer: true, }) - const bootstrap = await dehydrateToBootstrap(serverRouter, testManifest) + const bootstrap = await dehydrateToBootstrap(serverRouter) expect(bootstrap.router?.matches).toHaveLength(2) expect(bootstrap.router?.matches.at(-1)).toMatchObject({ s: 'pending', @@ -218,7 +241,7 @@ describe('public hydration contracts', () => { history: createMemoryHistory({ initialEntries: ['/client-only/child'] }), isServer: true, }) - const bootstrap = await dehydrateToBootstrap(serverRouter, testManifest) + const bootstrap = await dehydrateToBootstrap(serverRouter) const contextLanes: Array> = [] const headLanes: Array> = [] @@ -544,7 +567,7 @@ describe('public hydration contracts', () => { history: createMemoryHistory({ initialEntries: ['/page'] }), isServer: true, }) - const bootstrap = await dehydrateToBootstrap(serverRouter, testManifest) + const bootstrap = await dehydrateToBootstrap(serverRouter) const head = vi.fn(({ loaderData }) => ({ meta: [{ title: String(loaderData) }], @@ -623,7 +646,7 @@ describe('public hydration contracts', () => { history: createMemoryHistory({ initialEntries: ['/parent/child'] }), isServer: true, }) - const bootstrap = await dehydrateToBootstrap(serverRouter, testManifest) + const bootstrap = await dehydrateToBootstrap(serverRouter) expect(serverParentBeforeLoad).toHaveBeenCalledTimes(1) expect(serverChildBeforeLoad).toHaveBeenCalledTimes(1) @@ -706,7 +729,7 @@ describe('public hydration contracts', () => { history: createMemoryHistory({ initialEntries: ['/page'] }), isServer: true, }) - const bootstrap = await dehydrateToBootstrap(serverRouter, testManifest) + const bootstrap = await dehydrateToBootstrap(serverRouter) const transportedError = bootstrap.router?.matches.at(-1)?.e expect(transportedError).toMatchObject({ @@ -1385,7 +1408,7 @@ describe('public hydration contracts', () => { history: createMemoryHistory({ initialEntries: ['/page'] }), isServer: true, }) - const bootstrap = await dehydrateToBootstrap(serverRouter, testManifest) + const bootstrap = await dehydrateToBootstrap(serverRouter) const transportedError = bootstrap.router?.matches.at(-1)?.e const clientContextError = new Error('client context failed') diff --git a/packages/router-core/tests/replace-equal-deep.bench.ts b/packages/router-core/tests/replace-equal-deep.bench.ts deleted file mode 100644 index 044fbe38bc..0000000000 --- a/packages/router-core/tests/replace-equal-deep.bench.ts +++ /dev/null @@ -1,665 +0,0 @@ -import { describe, expect, test } from 'vitest' -import { - createNull, - deepEqual, - isPlainObject, - nullReplaceEqualDeep, - replaceEqualDeep, -} from '../src/utils' - -// Shapes the router feeds these helpers on every Link build / navigation. -const empty = {} -const emptyNull = createNull() -const search = { tab: 'specs', page: 2, sort: 'newest', filter: 'available' } -const searchCopy = { ...search } -const searchChanged = { ...search, page: 3 } -// parseSearch and path extraction produce null-prototype records. Exercise -// these separately from ordinary selector objects: their property storage differs. -const nullSearch = Object.assign(createNull(), search) -const nullSearchCopy = Object.assign(createNull(), searchCopy) -const nullSearchChanged = Object.assign(createNull(), searchChanged) -const decimalRecord = { x: 0.5, y: 1.5, width: 640.5, height: 480.5 } -const decimalRecordCopy = { ...decimalRecord } -const decimalRecordChanged = { ...decimalRecord, x: 1.5 } -// `?constructor=foo` decodes to an own `constructor` key on a null-proto record. -const searchWithConstructorKey = Object.assign(createNull(), { - constructor: 'foo', - page: 2, -}) -const searchWithConstructorKeyCopy = Object.assign(createNull(), { - constructor: 'foo', - page: 2, -}) -class Instance { - a = 1 -} -const instance = new Instance() -const nested = { - tab: 'specs', - filters: { category: 'hardware', available: true }, - ids: [1, 2, 3, 4], -} -const nestedCopy = { - tab: 'specs', - filters: { category: 'hardware', available: true }, - ids: [1, 2, 3, 4], -} -const nestedLeafChanged = { - tab: 'specs', - filters: { category: 'software', available: true }, - ids: [1, 2, 3, 4], -} -const list = Array.from({ length: 16 }, (_, index) => ({ id: index })) -const listCopy = list.map((item) => ({ ...item })) -const listChanged = list.map((item, index) => - index === 10 ? { id: -1 } : { ...item }, -) -const listShared = list.map((item, index) => (index === 10 ? { id: -1 } : item)) -const wide = Object.fromEntries( - Array.from({ length: 12 }, (_, index) => [`key${index}`, `value${index}`]), -) -const wideChanged = { ...wide, key7: 'changed' } -const searchAllChanged = { - tab: 'other', - page: 3, - sort: 'oldest', - filter: 'sold', -} -const searchReordered = { - filter: 'available', - sort: 'newest', - page: 2, - tab: 'specs', -} -const searchSubset = { tab: 'specs', page: 2, sort: 'newest' } -const wider = Object.fromEntries( - Array.from({ length: 64 }, (_, index) => [`key${index}`, `value${index}`]), -) -const widerChangedLast = { ...wider, key63: 'changed' } -const widerChangedFirst = { ...wider, key0: 'changed' } -const widerAllChanged = Object.fromEntries( - Object.keys(wider).map((key) => [key, 'changed']), -) -const widerSubset = Object.fromEntries(Object.entries(wider).slice(0, 8)) -const numbers = Array.from({ length: 1024 }, (_, index) => index) -const numbersCopy = [...numbers] -const numbersChangedLast = numbers.map((n, index) => (index === 1023 ? -1 : n)) -const numbersChangedFirst = numbers.map((n, index) => (index === 0 ? -1 : n)) -const numbersChangedMiddle = numbers.map((n, index) => (index === 512 ? -1 : n)) -const numbersAllChanged = numbers.map((n) => -n - 1) -const numbersShorter = numbers.slice(0, 512) -const numbersLonger = [...numbers, undefined, undefined] -const smallNumbers = [1, 2, 3, 4] -const smallNumbersChanged = [9, 2, 3, 4] -const consumedNumbers = replaceEqualDeep(numbers, numbersChangedLast) -const longList = Array.from({ length: 1024 }, (_, id) => ({ id })) -const longListCopy = [...longList] -const longListClonedLast = [...longList] -longListClonedLast[1023] = { id: 1023 } -const longListChangedLast = [...longList] -longListChangedLast[1023] = { id: -1 } -const longListClonedThenChanged = [...longListChangedLast] -longListClonedThenChanged[1022] = { id: 1022 } -const numericCases = [ - ['fractional', Array.from({ length: 1024 }, (_, index) => index + 0.5)], - [ - 'large integer', - Array.from({ length: 1024 }, (_, index) => 2 ** 40 + index), - ], -] as const -const numericResults = numericCases.map(([name, prev]) => { - const next = [...prev] - next[1023] = -1.5 - const result = replaceEqualDeep(prev, next) - expect(result).toStrictEqual(next) - return { name, prev, next, result } -}) -const mixedPairs: Array<[unknown, unknown]> = [ - [search, search], - [search, searchCopy], - [search, searchChanged], - [search, searchSubset], - [searchSubset, search], - [nested, nestedCopy], - [list, listChanged], - [list, listShared], - [smallNumbers, smallNumbersChanged], - [emptyNull, createNull()], - [searchWithConstructorKey, searchWithConstructorKeyCopy], -] - -expect(replaceEqualDeep(empty, {})).toBe(empty) -expect(replaceEqualDeep(search, searchCopy)).toBe(search) -expect(replaceEqualDeep(search, searchChanged)).toStrictEqual(searchChanged) -expect(nullReplaceEqualDeep(nullSearch, nullSearchCopy)).toBe(nullSearch) -expect(nullReplaceEqualDeep(nullSearch, searchCopy)).toBe(nullSearch) -expect(replaceEqualDeep(decimalRecord, decimalRecordCopy)).toBe(decimalRecord) -expect(replaceEqualDeep(decimalRecord, decimalRecordChanged)).toStrictEqual( - decimalRecordChanged, -) -expect(nullReplaceEqualDeep(nullSearch, nullSearchChanged)).toStrictEqual( - nullSearchChanged, -) -expect(replaceEqualDeep(nested, nestedCopy)).toBe(nested) -expect(replaceEqualDeep(nested, nestedLeafChanged).ids).toBe(nested.ids) -const nullNestedResult = nullReplaceEqualDeep(nested, nestedLeafChanged) -expect(nullNestedResult).toEqual(nestedLeafChanged) -expect(nullNestedResult.ids).toBe(nested.ids) -expect(Object.getPrototypeOf(nullNestedResult)).toBeNull() -expect(replaceEqualDeep(list, listCopy)).toBe(list) -expect(replaceEqualDeep(list, listChanged)[3]).toBe(list[3]) -expect(replaceEqualDeep(wide, wideChanged)).toStrictEqual(wideChanged) -expect(replaceEqualDeep(list, listShared)[3]).toBe(list[3]) -expect(replaceEqualDeep(search, searchAllChanged)).toStrictEqual( - searchAllChanged, -) -expect(replaceEqualDeep(search, searchReordered)).toBe(search) -expect(replaceEqualDeep(search, searchSubset)).toStrictEqual(searchSubset) -expect(replaceEqualDeep(wider, widerChangedLast)).toStrictEqual( - widerChangedLast, -) -expect(replaceEqualDeep(numbers, numbersCopy)).toBe(numbers) -expect(replaceEqualDeep(longList, longListCopy)).toBe(longList) -expect(replaceEqualDeep(longList, longListClonedLast)).toBe(longList) -expect(replaceEqualDeep(longList, longListChangedLast)).toStrictEqual( - longListChangedLast, -) -const sharedLongList = replaceEqualDeep(longList, longListClonedThenChanged) -expect(sharedLongList).toStrictEqual(longListClonedThenChanged) -expect(sharedLongList[1022]).toBe(longList[1022]) -expect(replaceEqualDeep(widerSubset, wider)).toStrictEqual(wider) -expect(replaceEqualDeep(wider, widerChangedFirst)).toStrictEqual( - widerChangedFirst, -) -expect(replaceEqualDeep(wider, widerAllChanged)).toStrictEqual(widerAllChanged) -expect(replaceEqualDeep(numbers, numbersChangedLast)[1023]).toBe(-1) -for (const [prev, next] of mixedPairs) { - expect(replaceEqualDeep(prev, next)).toStrictEqual(next) -} -for (const next of [ - numbersChangedFirst, - numbersChangedMiddle, - numbersAllChanged, - numbersShorter, - numbersLonger, -]) { - expect(replaceEqualDeep(numbers, next)).toStrictEqual(next) -} -expect(nullReplaceEqualDeep(emptyNull, {})).toBe(emptyNull) -expect( - nullReplaceEqualDeep(searchWithConstructorKey, searchWithConstructorKeyCopy), -).toBe(searchWithConstructorKey) -expect(deepEqual(search, searchCopy, true)).toBe(true) -expect(isPlainObject(search)).toBe(true) -expect(isPlainObject(emptyNull)).toBe(true) -expect(isPlainObject(searchWithConstructorKey)).toBe(true) -expect(isPlainObject(instance)).toBe(false) - -const iterations = 1_000 -let sink: unknown - -describe('isPlainObject', () => { - test('literal', async ({ bench }) => { - await bench('literal', () => { - for (let i = 0; i < iterations; i++) { - sink = isPlainObject(search) - } - }).run() - }) - - test('null-proto record', async ({ bench }) => { - await bench('null-proto record', () => { - for (let i = 0; i < iterations; i++) { - sink = isPlainObject(emptyNull) - } - }).run() - }) - - 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() - }) - - test('class instance', async ({ bench }) => { - await bench('class instance', () => { - for (let i = 0; i < iterations; i++) { - sink = isPlainObject(instance) - } - }).run() - }) -}) - -describe('replaceEqualDeep', () => { - test('equal empty objects', async ({ bench }) => { - await bench('equal empty objects', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(empty, {}) - } - }).run() - }) - - 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() - }) - - 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() - }) - - test('equal flat search', async ({ bench }) => { - await bench('equal flat search', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(search, searchCopy) - } - }).run() - }) - - 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() - }) - - 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() - }) - - 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() - }) - - 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() - }) - - 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() - }) - - 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() - }) - - 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() - }) - - 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() - }) - - 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() - }) - - 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() - }) - - test('equal nested search', async ({ bench }) => { - await bench('equal nested search', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(nested, nestedCopy) - } - }).run() - }) - - 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() - }) - - 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() - }) - - 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() - }) - - 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() - }) - - 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() - }) - - 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() - }) - - 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() - }) - - 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() - }) - - 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() - }) - - 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() - }) - - 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() - }) - - 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) { - 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() - }) - } - - 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 [ - ['cloned but equal', longListClonedLast], - ['changed', longListChangedLast], - ['changed after a cloned but equal item', longListClonedThenChanged], - ] as const) { - 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() - }) - } - - for (const length of [0, 1, 4]) { - const prev = Array.from({ length }, (_, index) => index) - const next = [...prev] - expect(replaceEqualDeep(prev, next)).toBe(prev) - 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() - }) - } - - 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() - }) - - 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 [ - ['first item changed', numbersChangedFirst], - ['middle item changed', numbersChangedMiddle], - ['all items changed', numbersAllChanged], - ['shortened', numbersShorter], - ['appended undefined values', numbersLonger], - ] as const) { - 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() - }) - } - - 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() - }) - - 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) { - 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', () => { - 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 < 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() - }) - - 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', () => { - test('equal empty objects', async ({ bench }) => { - await bench('equal empty objects', () => { - for (let i = 0; i < iterations; i++) { - sink = deepEqual(empty, {}) - } - }).run() - }) - - 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() - }) - - 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() - }) -}) - -export { sink } diff --git a/packages/router-core/tests/rewrite.bench.ts b/packages/router-core/tests/rewrite.bench.ts deleted file mode 100644 index 1f7b88d610..0000000000 --- a/packages/router-core/tests/rewrite.bench.ts +++ /dev/null @@ -1,180 +0,0 @@ -import { describe, expect, test } from 'vitest' -import { createMemoryHistory } from '@tanstack/history' -import { BaseRootRoute } from '../src' -import { - composeRewrites, - executeRewriteInput, - executeRewriteOutput, - rewriteBasepath, -} from '../src/rewrite' -import { createTestRouter } from './routerTestUtils' -import type { LocationRewrite } from '../src' - -describe.each([ - 'basepath only', - 'missing handlers', - 'input only', - 'output only', - 'noop', - 'mutation', - 'URL', - 'string', - 'nested composer', -] as const)('basepath composition (%s)', (returnType) => { - const unchanged = [ - 'basepath only', - 'missing handlers', - 'input only', - 'output only', - 'noop', - ].includes(returnType) - const transform = (url: URL, input: boolean) => { - if (unchanged) { - return - } - const result = - returnType === 'mutation' || returnType === 'nested composer' - ? url - : new URL(url) - result.pathname = input ? '/internal' : '/public' - if (returnType === 'URL') { - return result - } - if (returnType === 'string') { - return result.href - } - return - } - let custom: LocationRewrite | undefined = { - input: ({ url }) => transform(url, true), - output: ({ url }) => transform(url, false), - } - if (returnType === 'basepath only') { - custom = undefined - } else if (returnType === 'missing handlers') { - custom = {} - } else if (returnType === 'input only') { - delete custom.output - } else if (returnType === 'output only') { - delete custom.input - } else if (returnType === 'nested composer') { - custom = composeRewrites([ - custom, - {}, - { input: ({ url }) => url, output: ({ url }) => url }, - ]) - } - const history = createMemoryHistory({ initialEntries: ['/app/public'] }) - const router = createTestRouter({ - routeTree: new BaseRootRoute({}), - history, - basepath: '/app', - rewrite: custom, - scrollRestoration: false, - }) - history.destroy() - - for (const [name, rewrite] of [ - [ - custom ? 'public composer' : 'standalone basepath', - custom - ? composeRewrites([rewriteBasepath('/app'), custom]) - : rewriteBasepath('/app'), - ], - ['router composition', router.rewrite], - ] as const) { - let url = new URL('https://example.com/app/public?sort=name#title') - url = executeRewriteInput(rewrite, url) - expect(url.pathname).toBe(unchanged ? '/public' : '/internal') - url = executeRewriteOutput(rewrite, url) - expect(url.href).toBe('https://example.com/app/public?sort=name#title') - - 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, - }) - }) - } - - let trailingSlash = false - 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, - }) - }) -}) - -describe.each(['/', '/app'])('unchanged rewrite options (%s)', (basepath) => { - const history = createMemoryHistory({ - initialEntries: [basepath === '/' ? '/public' : '/app/public'], - }) - const router = createTestRouter({ - routeTree: new BaseRootRoute({}), - history, - basepath, - rewrite: { input: ({ url }) => url }, - scrollRestoration: false, - }) - history.destroy() - const rewrite = router.rewrite - router.update({}) - expect(router.rewrite).toBe(rewrite) - expect(router.latestLocation.pathname).toBe('/public') - - 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, - }) - }) -}) diff --git a/packages/router-core/tests/rewrite.test.ts b/packages/router-core/tests/rewrite.test.ts index 2494f050e5..c5ca2e9428 100644 --- a/packages/router-core/tests/rewrite.test.ts +++ b/packages/router-core/tests/rewrite.test.ts @@ -1,17 +1,15 @@ import { describe, expect, test } from 'vitest' -import { createMemoryHistory } from '@tanstack/history' -import { BaseRootRoute, composeRewrites } from '../src' import { + composeRewrites, executeRewriteInput, executeRewriteOutput, rewriteBasepath, } from '../src/rewrite' -import { createTestRouter } from './routerTestUtils' import type { LocationRewrite } from '../src' describe('rewrite helpers', () => { test('basepath rewrite strips input and restores output', () => { - const rewrite = rewriteBasepath('/app/') + const rewrite = rewriteBasepath({ basepath: '/app/' }) const inputUrl = new URL('https://example.com/app/posts') expect(executeRewriteInput(rewrite, inputUrl).pathname).toBe('/posts') @@ -21,40 +19,19 @@ describe('rewrite helpers', () => { }) test('basepath rewrite handles root output', () => { - const rewrite = rewriteBasepath('/app') + const rewrite = rewriteBasepath({ basepath: '/app' }) const url = new URL('https://example.com/') expect(executeRewriteOutput(rewrite, url).pathname).toBe('/app/') }) test('case-insensitive basepath input preserves original suffix casing', () => { - const rewrite = rewriteBasepath('/App') + const rewrite = rewriteBasepath({ basepath: '/App' }) const url = new URL('https://example.com/app/Users') expect(executeRewriteInput(rewrite, url).pathname).toBe('/Users') }) - test('case-sensitive basepath input only strips an exact-case basepath', () => { - const rewrite = rewriteBasepath('/App', true) - - expect( - executeRewriteInput(rewrite, new URL('https://example.com/app/users')) - .pathname, - ).toBe('/app/users') - expect( - executeRewriteInput(rewrite, new URL('https://example.com/App/users')) - .pathname, - ).toBe('/users') - }) - - test('basepath rewrite output collapses repeated slashes', () => { - const rewrite = rewriteBasepath('/app') - const url = new URL('https://example.com/') - url.pathname = '/posts//1' - - expect(executeRewriteOutput(rewrite, url).pathname).toBe('/app/posts/1') - }) - test('composeRewrites applies input forward and output backward', () => { const calls: Array = [] const first: LocationRewrite = { @@ -92,313 +69,4 @@ describe('rewrite helpers', () => { ).toBe('/cd') expect(calls).toEqual(['first-in', 'second-in', 'second-out', 'first-out']) }) - - test('composeRewrites supports arbitrary chains and mixed return types', () => { - const rewrite = composeRewrites([ - { - input: ({ url }): undefined => { - url.pathname += 'a' - }, - output: ({ url }): undefined => { - url.pathname += 'd' - }, - }, - {}, - { - input: ({ url }) => `${url.href}b`, - output: ({ url }) => `${url.href}c`, - }, - { - input: ({ url }) => new URL(`${url.href}c`), - output: ({ url }) => new URL(`${url.href}b`), - }, - { - output: ({ url }): undefined => { - url.pathname += 'a' - }, - }, - ]) - - expect( - executeRewriteInput(rewrite, new URL('https://example.com/')).pathname, - ).toBe('/abc') - expect( - executeRewriteOutput(rewrite, new URL('https://example.com/')).pathname, - ).toBe('/abcd') - }) - - test('composeRewrites accepts an empty chain', () => { - const rewrite = composeRewrites([]) - const url = new URL('https://example.com/posts') - - expect(executeRewriteInput(rewrite, url)).toBe(url) - expect(executeRewriteOutput(rewrite, url)).toBe(url) - }) -}) - -describe('router rewrites', () => { - test.each([undefined, '/', '', '///'])( - 'keeps the direct rewrite path for basepath %s', - (basepath) => { - const router = createTestRouter({ - routeTree: new BaseRootRoute({}), - history: createMemoryHistory({ initialEntries: ['/public'] }), - basepath, - }) - - expect(router.rewrite).toBeUndefined() - expect(router.latestLocation.pathname).toBe('/public') - expect(router.buildLocation({ to: '/public' }).publicHref).toBe('/public') - - const rewrite: LocationRewrite = { input: ({ url }) => url } - router.update({ rewrite }) - expect(router.rewrite).toBe(rewrite) - expect(router.state.location.pathname).toBe('/public') - }, - ) - - test.each([ - [undefined, '/app/Users', '/Users'], - [false, '/app/Users', '/Users'], - [true, '/app/Users', '/app/Users'], - [true, '/App/Users', '/Users'], - ] as const)( - 'initializes basepath with caseSensitive %s at %s', - (caseSensitive, pathname, expected) => { - const router = createTestRouter({ - routeTree: new BaseRootRoute({}), - history: createMemoryHistory({ initialEntries: [pathname] }), - basepath: '/App', - caseSensitive, - }) - - expect(router.latestLocation.pathname).toBe(expected) - expect(router.state.location.pathname).toBe(expected) - }, - ) - - test.each([false, true])( - 'updates basepath case sensitivity and stored location (custom rewrite: %s)', - (customRewrite) => { - const router = createTestRouter({ - routeTree: new BaseRootRoute({}), - history: createMemoryHistory({ initialEntries: ['/app/Users'] }), - basepath: '/App', - rewrite: customRewrite ? { input: ({ url }) => url } : undefined, - }) - - expect(router.state.location.pathname).toBe('/Users') - - router.update({ caseSensitive: true }) - expect(router.latestLocation.pathname).toBe('/app/Users') - expect(router.state.location.pathname).toBe('/app/Users') - - router.update({ caseSensitive: false }) - expect(router.latestLocation.pathname).toBe('/Users') - expect(router.state.location.pathname).toBe('/Users') - expect(router.buildLocation({ to: '/Users' }).publicHref).toBe( - '/App/Users', - ) - }, - ) - - test.each(['mutation', 'URL', 'string'] as const)( - 'composes basepath around custom rewrites returning %s', - (returnType) => { - const calls: Array = [] - const rewrite = (url: URL, direction: 'input' | 'output') => { - calls.push(`${direction}:${url.pathname}`) - const result = returnType === 'mutation' ? url : new URL(url) - result.pathname = direction === 'input' ? '/internal' : '/public' - if (returnType === 'URL') { - return result - } - if (returnType === 'string') { - return result.href - } - return - } - const router = createTestRouter({ - routeTree: new BaseRootRoute({}), - history: createMemoryHistory({ initialEntries: ['/app/public'] }), - basepath: '/app', - rewrite: { - input: ({ url }) => rewrite(url, 'input'), - output: ({ url }) => rewrite(url, 'output'), - }, - }) - - expect(router.latestLocation.pathname).toBe('/internal') - expect(calls).toEqual(['input:/public']) - expect(router.buildLocation({ to: '/internal' }).publicHref).toBe( - '/app/public', - ) - expect(calls).toEqual(['input:/public', 'output:/internal']) - }, - ) - - test('rebuilds rewrites and stored locations when basepath or custom rewrite changes', () => { - const router = createTestRouter({ - routeTree: new BaseRootRoute({}), - history: createMemoryHistory({ initialEntries: ['/app/public'] }), - basepath: '/app', - rewrite: { - input: ({ url }): undefined => { - url.pathname = url.pathname.replace('/public', '/internal') - }, - output: ({ url }): undefined => { - url.pathname = url.pathname.replace('/internal', '/public') - }, - }, - }) - const checkLocations = (pathname: string, outputHref: string) => { - expect(router.latestLocation).toMatchObject({ - pathname, - publicHref: '/app/public', - }) - expect(router.state.location).toMatchObject({ - pathname, - publicHref: '/app/public', - }) - expect(router.buildLocation({ to: '/internal' }).publicHref).toBe( - outputHref, - ) - } - - checkLocations('/internal', '/app/public') - router.update({ basepath: '/other' }) - checkLocations('/app/internal', '/other/public') - - router.update({ - rewrite: { - input: ({ url }) => new URL('/replacement', url), - output: ({ url }) => new URL('/updated', url), - }, - }) - checkLocations('/replacement', '/other/updated') - - router.update({ rewrite: undefined }) - checkLocations('/app/public', '/other/internal') - - router.update({ basepath: '/' }) - checkLocations('/app/public', '/internal') - expect(router.rewrite).toBeUndefined() - }) - - test.each(['URL', 'string'] as const)( - 'preserves query, hash, and external origin from a custom %s output', - (returnType) => { - const router = createTestRouter({ - routeTree: new BaseRootRoute({}), - history: createMemoryHistory({ initialEntries: ['/app/internal'] }), - origin: 'https://example.com', - basepath: '/app', - rewrite: { - output: ({ url }) => { - const rewritten = new URL(url) - rewritten.hostname = 'external.example' - rewritten.pathname = '/public' - return returnType === 'URL' ? rewritten : rewritten.href - }, - }, - }) - - expect( - router.buildLocation({ - to: '/internal', - search: { sort: 'name' }, - hash: 'section', - }), - ).toMatchObject({ - publicHref: 'https://external.example/app/public?sort=name#section', - external: true, - search: { sort: 'name' }, - hash: 'section', - }) - }, - ) - - test.each(['input', 'output'] as const)( - 'composes basepath with a custom rewrite providing only %s', - (direction) => { - const router = createTestRouter({ - routeTree: new BaseRootRoute({}), - history: createMemoryHistory({ initialEntries: ['/app/original'] }), - basepath: '/app', - rewrite: { - [direction]: ({ url }: { url: URL }): undefined => { - url.pathname = '/rewritten' - }, - }, - }) - - expect(router.latestLocation.pathname).toBe( - direction === 'input' ? '/rewritten' : '/original', - ) - expect(router.buildLocation({ to: '/original' }).publicHref).toBe( - direction === 'output' ? '/app/rewritten' : '/app/original', - ) - }, - ) - - test('reads custom handlers added, replaced, or removed after composition', () => { - const rewrite: LocationRewrite = {} - const router = createTestRouter({ - routeTree: new BaseRootRoute({}), - history: createMemoryHistory({ initialEntries: ['/app/public'] }), - basepath: '/app', - rewrite, - }) - const parse = () => router.parseLocation(router.history.location).pathname - - expect(parse()).toBe('/public') - rewrite.input = ({ url }): undefined => { - url.pathname = '/internal' - } - rewrite.output = ({ url }): undefined => { - url.pathname = '/public' - } - expect(parse()).toBe('/internal') - expect(router.buildLocation({ to: '/internal' }).publicHref).toBe( - '/app/public', - ) - - rewrite.input = ({ url }) => new URL('/replaced', url) - expect(parse()).toBe('/replaced') - - delete rewrite.input - delete rewrite.output - expect(parse()).toBe('/public') - expect(router.buildLocation({ to: '/internal' }).publicHref).toBe( - '/app/internal', - ) - }) - - test('composes a nested public rewrite chain inside the basepath', () => { - const router = createTestRouter({ - routeTree: new BaseRootRoute({}), - history: createMemoryHistory({ initialEntries: ['/app/public'] }), - basepath: '/app', - rewrite: composeRewrites([ - { - input: ({ url }): undefined => { - url.pathname = url.pathname.replace('/public', '/intermediate') - }, - output: ({ url }): undefined => { - url.pathname = url.pathname.replace('/intermediate', '/public') - }, - }, - { - input: ({ url }) => url.href.replace('/intermediate', '/internal'), - output: ({ url }) => - new URL(url.href.replace('/internal', '/intermediate')), - }, - ]), - }) - - expect(router.latestLocation.pathname).toBe('/internal') - expect(router.buildLocation({ to: '/internal' }).publicHref).toBe( - '/app/public', - ) - }) }) diff --git a/packages/router-core/tests/route-initialization.test.ts b/packages/router-core/tests/route-initialization.test.ts deleted file mode 100644 index 8d44447b43..0000000000 --- a/packages/router-core/tests/route-initialization.test.ts +++ /dev/null @@ -1,60 +0,0 @@ -import { afterEach, expect, test, vi } from 'vitest' -import { BaseRootRoute, BaseRoute } from '../src' -import { processRouteTree } from '../src/new-process-route-tree' -import type { AnyRoute } from '../src' - -afterEach(() => vi.restoreAllMocks()) - -test('initializes routes parent-first before reading their IDs and paths', () => { - const root = new BaseRootRoute({}) - const layout = new BaseRoute({ - getParentRoute: () => root, - path: '/layout', - }) - const child = new BaseRoute({ - getParentRoute: () => layout, - path: '/$id', - }) - const sibling = new BaseRoute({ - getParentRoute: () => root, - path: '/sibling', - }) - const routes = [root, layout, child, sibling] - const calls = routes.map((route) => vi.spyOn(route, 'init')) - const { routesById } = processRouteTree( - root.addChildren([layout.addChildren([child]), sibling]), - ) - for (const [originalIndex, init] of calls.entries()) { - expect(init).toHaveBeenCalledExactlyOnceWith(originalIndex) - expect(routes[originalIndex]!.originalIndex).toBe(originalIndex) - } - const order = calls.map((init) => init.mock.invocationCallOrder[0]!) - expect(order).toEqual([...order].sort((a, b) => a - b)) - expect(root.id).toBe('__root__') - expect(child.fullPath).toBe('/layout/$id') - for (const route of routes) { - expect(routesById[route.id]).toBe(route) - } -}) - -test('normalizes nested route IDs without changing pathless layout paths', () => { - const root = new BaseRootRoute({}) - const layout = new BaseRoute({ - getParentRoute: () => root, - id: '//_layout//', - }) - const item = new BaseRoute({ - getParentRoute: () => layout, - path: '//items//$id//', - }) - const { routesById } = processRouteTree( - root.addChildren([layout.addChildren([item])]), - ) - expect(root.id).toBe('__root__') - expect(layout.id).toBe('/_layout/') - expect(layout.fullPath).toBe('/') - expect(item.id).toBe('/_layout/items/$id/') - expect(item.fullPath).toBe('/items/$id/') - expect(item.to).toBe('/items/$id') - expect(routesById[item.id]).toBe(item) -}) diff --git a/packages/router-core/tests/route-interpolation.test.ts b/packages/router-core/tests/route-interpolation.test.ts deleted file mode 100644 index 8743f8bc04..0000000000 --- a/packages/router-core/tests/route-interpolation.test.ts +++ /dev/null @@ -1,280 +0,0 @@ -import { afterEach, describe, expect, test, vi } from 'vitest' -import { createMemoryHistory } from '@tanstack/history' -import { BaseRootRoute, BaseRoute } from '../src' -import { - cleanPath, - compileDecodeCharMap, - hasMissingPathParams, - interpolatePath, -} from '../src/path' -import * as routeTreeUtils from '../src/new-process-route-tree' -import { createTestRouter } from './routerTestUtils' - -afterEach(() => vi.restoreAllMocks()) - -test.each([ - { path: '/static', params: {}, missing: false }, - { path: '/$id', params: {}, missing: true }, - { path: '/$id', params: { id: undefined }, missing: false }, - { path: '/$id', params: { id: '' }, missing: false }, - { path: '/{-$id}', params: {}, missing: false }, - { path: '/pre{-$id}suffix', params: { id: null }, missing: false }, - { path: '/files/$', params: {}, missing: true }, - { path: '/files/$', params: { _splat: null }, missing: true }, - { path: '/files/$', params: { _splat: '' }, missing: true }, - { path: '/files/{$}.txt', params: { _splat: 0 }, missing: false }, - { path: '/files/{$}.txt', params: { _splat: false }, missing: false }, - { path: '/files/$/ignored', params: { _splat: 'a/b' }, missing: false }, -])( - 'preserves navigation availability for $path: $params', - ({ path, params, missing }) => { - const segments = routeTreeUtils.parseSegments(false, { fullPath: path }, 0) - expect(hasMissingPathParams(segments, params)).toBe(missing) - }, -) - -test('encodes splats equivalently without interpreting literal encoded separators', () => { - const segments = routeTreeUtils.parseSegments( - false, - { fullPath: '/files/$' }, - 0, - ) - for (const allowed of [[], ['@', '+'], ['%'], ['/']]) { - const decoder = compileDecodeCharMap(allowed) - for (const value of [ - '/a//b/', - 'docs/a b/c+d?x#y', - 'literal%2F/100%/caf\u00e9', - 'folder/\u6f22\u5b57/file', - ]) { - const expected = value - .split('/') - .map((part) => decoder(encodeURIComponent(part))) - .join('/') - expect( - interpolatePath('/files/$', segments, { _splat: value }, decoder), - ).toBe(`/files/${expected}`) - } - } -}) - -describe.each([false, true])( - 'prepared route interpolation (server: %s)', - (server) => { - test.each([ - '/', - '/static/path/', - '/items/$id', - '/$id/$id/', - '/items/Pre{$id}Suffix/{-$lang}', - '/items/Pre{-$id}Suffix/$lang', - '/files/$', - '/files/Pre{$}Suffix/', - '/files/$/child', - '/{-$lang}/files/{$}.txt', - '//items//$id//', - '/literal$dollar/{$id}/', - ])('keeps substitution and metadata live for %s', (path) => { - const root = new BaseRootRoute({}) - const route = new BaseRoute({ getParentRoute: () => root, path }) - const history = createMemoryHistory({ initialEntries: ['/'] }) - createTestRouter({ - routeTree: root.addChildren([route]), - history, - isServer: server, - scrollRestoration: false, - }) - history.destroy() - // The reference is the standalone parse buildLocation uses for templates - // without a processed route. - const template = routeTreeUtils.parseSegments( - false, - { fullPath: cleanPath(path) }, - 0, - ) - const decoder = compileDecodeCharMap(['@', '+']) - const inputs: Array> = [ - {}, - { id: '', lang: null, _splat: '' }, - { id: 'one /@+?', lang: 'en', _splat: 'docs/a b/100%' }, - { id: 0, lang: false, _splat: 0 }, - { id: 'next', lang: undefined, _splat: 'next/file' }, - ] - for (const params of [...inputs, ...inputs]) { - const expectedUsed = Object.create(null) - const actualUsed = Object.create(null) - const expected = interpolatePath( - path, - template, - params, - decoder, - expectedUsed, - ) - expect( - route._interpolation - ? interpolatePath( - path, - route._interpolation, - params, - decoder, - actualUsed, - ) - : path, - ).toBe(expected) - expect(actualUsed).toEqual(expectedUsed) - expect( - route._interpolation - ? routeTreeUtils.getParamNames(route._interpolation) - : [], - ).toEqual(routeTreeUtils.getParamNames(template)) - expect( - route._interpolation - ? hasMissingPathParams(route._interpolation, params) - : false, - ).toBe(hasMissingPathParams(template, params)) - } - }) - - test('does not change prepared segments when an encoder throws', () => { - const root = new BaseRootRoute({}) - const route = new BaseRoute({ - getParentRoute: () => root, - path: '/$first/{-$second}', - }) - const history = createMemoryHistory({ initialEntries: ['/'] }) - createTestRouter({ - routeTree: root.addChildren([route]), - history, - isServer: server, - scrollRestoration: false, - }) - history.destroy() - const prepared = route._interpolation - expect(prepared).toBeDefined() - expect(() => - interpolatePath(route.fullPath, route._interpolation!, { - first: '\uD800', - second: 'two', - }), - ).toThrow(URIError) - expect(route._interpolation).toBe(prepared) - expect( - interpolatePath(route.fullPath, route._interpolation!, { - first: 'one', - second: 'two', - }), - ).toBe('/one/two') - }) - }, -) - -test('never reparses a processed route for first use, Link misses or match metadata', () => { - const root = new BaseRootRoute({}) - const route = new BaseRoute({ - getParentRoute: () => root, - path: '/items/Pre{$id}Suffix/{-$lang}', - }) - const history = createMemoryHistory({ initialEntries: ['/'] }) - const router = createTestRouter({ - routeTree: root.addChildren([route]), - history, - pathParamsAllowedCharacters: ['@'], - scrollRestoration: false, - }) - history.destroy() - const prepared = route._interpolation - expect(prepared).toBeDefined() - const parse = vi.spyOn(routeTreeUtils, 'parseSegments') - routeTreeUtils.parseSegments( - false, - { fullPath: '/unregistered-control/$id' }, - 0, - ) - expect(parse).toHaveBeenCalled() - parse.mockClear() - router.buildLocation({ - to: '/items/Pre{$id}Suffix/{-$lang}', - params: { id: 'first' }, - }) - for (let id = 0; id < 256; id++) { - expect( - router.buildLocation({ - to: '/items/Pre{$id}Suffix/{-$lang}', - params: { id: String(id), lang: 'en' }, - }).href, - ).toBe(`/items/Pre${id}Suffix/en`) - expect( - router.matchRoutes(`/items/Pre${id}Suffix/en`, {}).at(-1)?._strictParams, - ).toEqual({ id: String(id), lang: 'en' }) - } - expect( - router.buildLocation({ - to: '/items/Pre{$id}Suffix/{-$lang}', - params: { id: '@last' }, - }).href, - ).toBe('/items/Pre@lastSuffix') - expect(route._interpolation).toBe(prepared) - expect(parse).not.toHaveBeenCalled() -}) - -test.each([false, true])( - 'uses prepared segments for either trailing slash variant (server: %s)', - (server) => { - const root = new BaseRootRoute({}) - const route = new BaseRoute({ - getParentRoute: () => root, - path: '/files/pre{$}.txt/', - }) - const history = createMemoryHistory({ initialEntries: ['/'] }) - createTestRouter({ - routeTree: root.addChildren([route]), - history, - isServer: server, - scrollRestoration: false, - }) - history.destroy() - const parse = vi.spyOn(routeTreeUtils, 'parseSegments') - for (const path of [ - '/files/pre{$}.txt', - '/files/pre{$}.txt/', - '/files/pre{$}.txt', - ]) { - expect( - interpolatePath(path, route._interpolation!, { _splat: 'a/b' }), - ).toBe(path.endsWith('/') ? '/files/prea/b.txt//' : '/files/prea/b.txt') - } - expect(parse).not.toHaveBeenCalled() - }, -) - -test.each([false, true])( - 'preserves inherited wildcard tails (server: %s)', - (server) => { - for (const path of ['/files/{$}.txt', '/{-$lang}/files/$', '/files/$']) { - const root = new BaseRootRoute({}) - const parent = new BaseRoute({ getParentRoute: () => root, path }) - const child = new BaseRoute({ - getParentRoute: () => parent, - path: '/child', - }) - const history = createMemoryHistory({ initialEntries: ['/'] }) - createTestRouter({ - routeTree: root.addChildren([parent.addChildren([child])]), - history, - isServer: server, - scrollRestoration: false, - }) - history.destroy() - const params = { _splat: 'a/b', lang: 'en' } - expect( - interpolatePath(child.fullPath, child._interpolation!, params), - ).toBe( - interpolatePath( - child.fullPath, - routeTreeUtils.parseSegments(false, { fullPath: child.fullPath }, 0), - params, - ), - ) - } - }, -) diff --git a/packages/router-core/tests/route-tree-caches.test.ts b/packages/router-core/tests/route-tree-caches.test.ts deleted file mode 100644 index 5f2f4721cf..0000000000 --- a/packages/router-core/tests/route-tree-caches.test.ts +++ /dev/null @@ -1,415 +0,0 @@ -import { afterEach, beforeEach, expect, test, vi } from 'vitest' -import { createMemoryHistory } from '@tanstack/history' -import { BaseRootRoute, BaseRoute } from '../src' -import * as routeTreeUtils from '../src/new-process-route-tree' -import { createRequestHandler } from '../src/ssr/createRequestHandler' -import { createTestRouter } from './routerTestUtils' -import type { AnyRoute, AnyRouter } from '../src' - -const disposers: Array<() => void> = [] - -beforeEach(() => { - vi.stubEnv('NODE_ENV', 'production') - vi.stubGlobal('__TSR_CACHE__', undefined) -}) - -afterEach(() => { - for (const dispose of disposers.splice(0)) { - dispose() - } - vi.restoreAllMocks() - vi.unstubAllGlobals() - vi.unstubAllEnvs() -}) - -function createRoutes() { - const root = new BaseRootRoute({}) - const item = new BaseRoute({ - getParentRoute: () => root, - path: '/items/$id', - }) - return { root, item, routeTree: root.addChildren([item]) } -} - -function history() { - const result = createMemoryHistory({ initialEntries: ['/'] }) - disposers.push(result.destroy) - return result -} - -test.each([false, true])( - 'builds canonical pathnames and encoded hrefs (server: %s)', - (isServer) => { - const { routeTree } = createRoutes() - const router = createTestRouter({ routeTree, history: history(), isServer }) - for (const [id, pathname, href] of [ - ['one two', '/items/one two', '/items/one%20two'], - ['caf\u00e9', '/items/caf\u00e9', '/items/caf%C3%A9'], - ['a/b', '/items/a%2Fb', '/items/a%2Fb'], - ['%2F', '/items/%252F', '/items/%252F'], - ['a\\b', '/items/a%5Cb', '/items/a%5Cb'], - ['a?b#c', '/items/a%3Fb%23c', '/items/a%3Fb%23c'], - ['a\tb', '/items/a%09b', '/items/a%09b'], - ] as const) { - for (let repeat = 0; repeat < 2; repeat++) { - const result = router.buildLocation({ - to: '/items/$id', - params: { id }, - }) - expect(result.pathname).toBe(pathname) - expect(result.href).toBe(href) - } - } - }, -) - -test('reuses server caches after request cleanup without sharing match state', async () => { - const { routeTree, item, root } = createRoutes() - const routers: Array = [] - const request = () => - createRequestHandler({ - request: new Request('http://localhost/'), - createRouter: () => { - const router = createTestRouter({ routeTree, isServer: true }) - routers.push(router) - return router - }, - })(({ router }) => { - disposers.push(router.history.destroy) - return new Response( - router.buildLocation({ - to: '/items/$id', - params: { id: 'one two' }, - }).href, - ) - }) - - expect(await (await request()).text()).toBe('/items/one%20two') - const branch = item._branch - const firstLocation = routers[0]!.latestLocation - const lightweightResult = routers[0]!['lightweightCache'].get(firstLocation) - expect(branch).toEqual([root, item]) - expect(lightweightResult).toBeDefined() - - expect(await (await request()).text()).toBe('/items/one%20two') - expect(item._branch).toBe(branch) - expect(routers[0]).not.toBe(routers[1]) - expect(routers[0]!.resolvePathCache).toBe(routers[1]!.resolvePathCache) - expect(routers[0]!['lightweightCache']).not.toBe( - routers[1]!['lightweightCache'], - ) - expect(routers[1]!['lightweightCache'].get(firstLocation)).toBeUndefined() - expect(routers[1]!.latestLocation).not.toBe(firstLocation) - expect(routers[0]!._cache).not.toBe(routers[1]!._cache) -}) - -test.each([ - { mode: 'production', isServer: false }, - { mode: 'development', isServer: true }, -])( - 'does not share router cache groups in $mode (server: $isServer)', - ({ mode, isServer }) => { - vi.stubEnv('NODE_ENV', mode) - const first = createTestRouter({ - routeTree: createRoutes().routeTree, - history: history(), - isServer, - }) - const second = createTestRouter({ - routeTree: createRoutes().routeTree, - history: history(), - isServer, - }) - expect(first.resolvePathCache).not.toBe(second.resolvePathCache) - expect(first['lightweightCache']).not.toBe(second['lightweightCache']) - expect(globalThis.__TSR_CACHE__).toBeUndefined() - }, -) - -test.each(['production', 'development'])( - 'refreshes server matching caches when case sensitivity changes in %s', - (mode) => { - vi.stubEnv('NODE_ENV', mode) - const { root, item } = createRoutes() - const strict = new BaseRoute({ - getParentRoute: () => root, - path: '/strict', - caseSensitive: true, - }) - const relaxed = new BaseRoute({ - getParentRoute: () => root, - path: '/relaxed', - caseSensitive: false, - }) - const router = createTestRouter({ - routeTree: root.addChildren([item, strict, relaxed]), - history: history(), - isServer: true, - caseSensitive: false, - }) - expect(router.getMatchedRoutes('/ITEMS/one')[2]).toBe(item) - - for (const caseSensitive of [true, false]) { - router.buildLocation({ - to: '/items/$id', - params: { id: 'one' }, - search: true, - }) - const previousTree = router.processedTree - const previousResolve = router.resolvePathCache - const previousLightweight = router['lightweightCache'] - expect(previousTree.matchCache.get('/ITEMS/one')).toBeDefined() - expect(previousLightweight.get(router.latestLocation)).toBeDefined() - - router.update({ caseSensitive }) - - expect(router.processedTree).not.toBe(previousTree) - expect(router.resolvePathCache).not.toBe(previousResolve) - expect(router['lightweightCache']).not.toBe(previousLightweight) - expect(router.getMatchedRoutes('/ITEMS/one')[2] === item).toBe( - !caseSensitive, - ) - expect(router.getMatchedRoutes('/items/one')[2]).toBe(item) - expect(router.getMatchedRoutes('/STRICT')[2]).not.toBe(strict) - expect(router.getMatchedRoutes('/strict')[2]).toBe(strict) - expect(router.getMatchedRoutes('/RELAXED')[2]).toBe(relaxed) - - const currentTree = router.processedTree - router.update({ caseSensitive }) - expect(router.processedTree).toBe(currentTree) - } - }, -) - -test.each([false, true])( - 'only reuses a server route tree with matching case sensitivity (cached: %s)', - (caseSensitive) => { - const { routeTree, item } = createRoutes() - const createRouter = (sensitive: boolean) => - createTestRouter({ - routeTree, - history: history(), - isServer: true, - caseSensitive: sensitive, - }) - const first = createRouter(caseSensitive) - expect(first.getMatchedRoutes('/ITEMS/one')[2] === item).toBe( - !caseSensitive, - ) - - const same = createRouter(caseSensitive) - expect(same.processedTree).toBe(first.processedTree) - expect(same.resolvePathCache).toBe(first.resolvePathCache) - - const different = createRouter(!caseSensitive) - expect(different.processedTree).not.toBe(first.processedTree) - expect(different.resolvePathCache).not.toBe(first.resolvePathCache) - expect(different.getMatchedRoutes('/ITEMS/one')[2] === item).toBe( - caseSensitive, - ) - expect(different.getMatchedRoutes('/items/one')[2]).toBe(item) - - const reused = createRouter(caseSensitive) - expect(reused.processedTree).toBe(first.processedTree) - for (const router of [first, same, reused]) { - expect(router.getMatchedRoutes('/ITEMS/one')[2] === item).toBe( - !caseSensitive, - ) - expect(router.getMatchedRoutes('/items/one')[2]).toBe(item) - } - }, -) - -test('never accesses the server cache on the client', () => { - const getCache = vi.fn(() => { - throw new Error('Client read the server cache') - }) - const setCache = vi.fn(() => { - throw new Error('Client wrote the server cache') - }) - Object.defineProperty(globalThis, '__TSR_CACHE__', { - configurable: true, - get: getCache, - set: setCache, - }) - const router = createTestRouter({ - routeTree: createRoutes().routeTree, - history: history(), - isServer: false, - caseSensitive: false, - }) - const processedTree = router.processedTree - router.update({ caseSensitive: true }) - expect(router.processedTree).toBe(processedTree) - router.update({ routeTree: createRoutes().routeTree }) - expect(getCache).not.toHaveBeenCalled() - expect(setCache).not.toHaveBeenCalled() -}) - -test('keeps different route objects independent and resets derived caches when rebuilding', () => { - vi.stubEnv('NODE_ENV', 'development') - const firstTree = createRoutes() - const secondTree = createRoutes() - const first = createTestRouter({ - routeTree: firstTree.routeTree, - history: history(), - }) - const second = createTestRouter({ - routeTree: secondTree.routeTree, - history: history(), - }) - for (const router of [first, second]) { - expect( - router.buildLocation({ to: '/items/$id', params: { id: 'one' } }).href, - ).toBe('/items/one') - } - expect(firstTree.item._branch).not.toBe(secondTree.item._branch) - expect(firstTree.item._interpolation).not.toBe(secondTree.item._interpolation) - - const previousResolve = first.resolvePathCache - const previousLightweight = first['lightweightCache'] - const previousBranch = firstTree.item._branch - const previousInterpolation = firstTree.item._interpolation - first.setRoutes(first.buildRouteTree()) - expect(first.resolvePathCache).not.toBe(previousResolve) - expect(first['lightweightCache']).not.toBe(previousLightweight) - expect(firstTree.item._branch).toBeUndefined() - expect(firstTree.item._interpolation).not.toBe(previousInterpolation) - expect([...firstTree.item._interpolation!]).toEqual([ - ...previousInterpolation!, - ]) - expect( - first.buildLocation({ to: '/items/$id', params: { id: 'one' } }).href, - ).toBe('/items/one') - expect(firstTree.item._branch).not.toBe(previousBranch) -}) - -test('refreshes branches and segments when an existing route is reparented', () => { - vi.stubEnv('NODE_ENV', 'development') - const root = new BaseRootRoute({}) - const left = new BaseRoute({ getParentRoute: () => root, path: '/left' }) - const right = new BaseRoute({ getParentRoute: () => root, path: '/right' }) - let parent: AnyRoute = left - const child = new BaseRoute({ - getParentRoute: () => parent, - path: '/child/$id', - }) - const router = createTestRouter({ - routeTree: root.addChildren([left.addChildren([child]), right]), - history: history(), - }) - expect( - router.buildLocation({ to: '/left/child/$id', params: { id: 'one two' } }) - .href, - ).toBe('/left/child/one%20two') - expect(child._branch).toEqual([root, left, child]) - const previousInterpolation = child._interpolation - - parent = right - left.addChildren([]) - right.addChildren([child]) - router.setRoutes(router.buildRouteTree()) - expect(child._branch).toBeUndefined() - expect(child._interpolation).not.toBe(previousInterpolation) - expect(child.fullPath).toBe('/right/child/$id') - expect(child._interpolation?.[0]).toBe('/right/child') - const parse = vi.spyOn(routeTreeUtils, 'parseSegments') - expect( - router.buildLocation({ to: '/right/child/$id', params: { id: 'one two' } }) - .href, - ).toBe('/right/child/one%20two') - expect(child._branch).toEqual([root, right, child]) - expect(parse).not.toHaveBeenCalled() -}) - -test('uses updated callbacks with rebuilt segments in development', () => { - vi.stubEnv('NODE_ENV', 'development') - const { routeTree, item } = createRoutes() - const router = createTestRouter({ routeTree, history: history() }) - expect( - router.buildLocation({ to: '/items/$id', params: { id: 'one' } }).href, - ).toBe('/items/one') - const prepared = item._interpolation - item.options.params = { - stringify: ({ id }) => ({ id: `updated ${id}` }), - } - router.setRoutes(router.buildRouteTree()) - expect(item._interpolation).not.toBe(prepared) - const parse = vi.spyOn(routeTreeUtils, 'parseSegments') - expect( - router.buildLocation({ to: '/items/$id', params: { id: 'one' } }).href, - ).toBe('/items/updated%20one') - expect(parse).not.toHaveBeenCalled() -}) - -test('uses fixed encodings and trailing-slash policies on independent routes', () => { - const allowAt = createTestRouter({ - routeTree: createRoutes().routeTree, - history: history(), - isServer: true, - trailingSlash: 'never', - pathParamsAllowedCharacters: ['@'], - }) - const allowPlus = createTestRouter({ - routeTree: createRoutes().routeTree, - history: history(), - isServer: true, - trailingSlash: 'always', - pathParamsAllowedCharacters: ['+'], - }) - for (let round = 0; round < 3; round++) { - expect( - allowAt.buildLocation({ to: '/items/$id', params: { id: '@+' } }) - .pathname, - ).toBe('/items/@%2B') - expect( - allowPlus.buildLocation({ to: '/items/$id', params: { id: '@+' } }) - .pathname, - ).toBe('/items/%40+/') - } - const allowAtWithSlash = createTestRouter({ - routeTree: createRoutes().routeTree, - history: history(), - isServer: true, - trailingSlash: 'always', - pathParamsAllowedCharacters: ['@'], - }) - expect( - allowAtWithSlash.buildLocation({ to: '/items/$id', params: { id: '@+' } }) - .pathname, - ).toBe('/items/@%2B/') - expect( - allowAt.buildLocation({ to: '/items/$id', params: { id: '@+' } }).pathname, - ).toBe('/items/@%2B') -}) - -test('does not reparse a legacy fallback already registered in the tree', () => { - const { routeTree, item } = createRoutes() - const parse = vi.spyOn(routeTreeUtils, 'parseSegments') - const router = createTestRouter({ - routeTree, - notFoundRoute: item, - history: history(), - }) - expect(router.routesById[item.id]).toBe(item) - expect(item._interpolation).toBeDefined() - expect(parse).not.toHaveBeenCalled() -}) - -test('formats masked destinations without registered templates', () => { - const { routeTree } = createRoutes() - const router = createTestRouter({ - routeTree, - history: history(), - pathParamsAllowedCharacters: ['@'], - }) - const build = () => - router.buildLocation({ - to: '/items/$id', - params: { id: '@one' }, - mask: { to: '/pretty/$id', params: { id: '@one' } }, - }) - - expect(build().maskedLocation?.pathname).toBe('/pretty/@one') - expect(build().maskedLocation?.pathname).toBe('/pretty/@one') -}) diff --git a/packages/router-core/tests/route-tree-construction.bench.ts b/packages/router-core/tests/route-tree-construction.bench.ts deleted file mode 100644 index e567f06d36..0000000000 --- a/packages/router-core/tests/route-tree-construction.bench.ts +++ /dev/null @@ -1,103 +0,0 @@ -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' - -type Shape = 'static' | 'dynamic' | 'nested' | 'mixed' - -function createTree(count: number, shape: Shape) { - const root = new BaseRootRoute({}) - const child = (parent: AnyRoute, path: string) => - new BaseRoute({ getParentRoute: () => parent, path }) - if (shape === 'nested') { - return root.addChildren( - Array.from({ length: count / 10 }, (_, group) => { - const parent = child(root, `/orgs/group-${group}/$org`) - return parent.addChildren( - Array.from({ length: 9 }, (_, index) => - child(parent, `/items/section-${index}/$id`), - ), - ) - }), - ) - } - return root.addChildren( - Array.from({ length: count }, (_, index) => { - const path = - shape === 'static' - ? `/static-${index}/about` - : shape === 'dynamic' - ? `/section-${index}/$id` - : [ - `/mixed-${index}/$org/items/$id`, - `/mixed-${index}/{-$lang}/$id`, - `/mixed-${index}/pre{$id}suffix/{-$lang}`, - `/mixed-${index}/files/prefix{$}.txt`, - ][index % 4]! - return child(root, path) - }), - ) -} - -// Keep first-use interpolation and object allocation out of the processing-only case. -for (const count of [100, 1000, 10000]) { - describe.each(['static', 'dynamic', 'nested', 'mixed'])( - `route-tree construction (${count} routes, %s)`, - (shape) => { - let tree = createTree(count, shape) - let result = processRouteTree(tree) - const expectedPath = - shape === 'static' - ? '/static-0/about' - : shape === 'dynamic' - ? '/section-0/one' - : shape === 'nested' - ? '/orgs/group-0/one/items/section-0/two' - : '/mixed-0/one/items/two' - const verify = () => { - expect(Object.keys(result.routesById)).toHaveLength(count + 1) - expect( - findRouteMatch(expectedPath, result.processedTree), - ).not.toBeNull() - } - verify() - - test('processRouteTree + route.init on fresh objects', async ({ - bench, - }) => { - await bench( - 'processRouteTree + route.init on fresh objects', - { - beforeEach: () => { - tree = createTree(count, shape) - }, - afterAll: verify, - }, - () => { - result = processRouteTree(tree) - }, - ).run({ - time: 1500, - warmupTime: 500, - throws: true, - }) - }) - - 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/routerTestUtils.ts b/packages/router-core/tests/routerTestUtils.ts index 79a4122c74..413b810b95 100644 --- a/packages/router-core/tests/routerTestUtils.ts +++ b/packages/router-core/tests/routerTestUtils.ts @@ -1,33 +1,17 @@ -import { runInNewContext } from 'node:vm' -import { expect } from 'vitest' import { batch, createAtom } from '@tanstack/store' -import { createMemoryHistory } from '@tanstack/history' import { isServer } from '@tanstack/router-core/isServer' import { - BaseRootRoute, RouterCore, createNonReactiveMutableStore, createNonReactiveReadonlyStore, } from '../src' import { createRequestHandler } from '../src/ssr/createRequestHandler' -import { - SEGMENT_TYPE_PATHNAME, - SEGMENT_TYPE_WILDCARD, - parseSegment, - processRouteTree, -} from '../src/new-process-route-tree' -import { attachRouterServerSsrUtils } from '../src/ssr/ssr-server' -import type { interpolatePath } from '../src/path' -import type { SegmentKind } from '../src/new-process-route-tree' -import type { ServerManifest } from '../src/manifest' -import type { TsrSsrGlobal } from '../src/ssr/types' import type { RouterHistory } from '@tanstack/history' import type { - AnyRoute, AnyRouter, + AnyRoute, GetStoreConfig, RouterConstructorOptions, - RouterOptions, TrailingSlashOption, } from '../src' @@ -65,105 +49,6 @@ export function createTestRouter< return new RouterCore(options, getStoreConfig) } -type RouteTreeInput = Parameters[0] -type FixtureNode = { - init?: RouteTreeInput['init'] - children?: ReadonlyArray -} - -const fixtureInit = () => {} - -function prepareFixture( - route: T, -): asserts route is T & Pick { - if (!route.init) { - // Raw matcher fixtures already specify their derived paths and IDs. - Object.defineProperty(route, 'init', { value: fixtureInit }) - } - for (const child of route.children ?? []) { - prepareFixture(child) - } -} - -export function processTestRouteTree< - TRoute extends Omit, ->(routeTree: TRoute, caseSensitive = false) { - prepareFixture(routeTree) - return processRouteTree(routeTree, caseSensitive) -} - -export type PathInterpolationTestOptions = { - path: string - params: Record - decoder?: Parameters[3] - server?: boolean -} - -export function createTestPathInterpolator( - options: Pick< - RouterOptions, - 'isServer' | 'pathParamsAllowedCharacters' - > = {}, -) { - const router = createTestRouter({ - routeTree: new BaseRootRoute({}), - history: createMemoryHistory({ initialEntries: ['/'] }), - scrollRestoration: false, - trailingSlash: 'preserve', - ...options, - }) - router.history.destroy() - return ( - options: Pick, - ): string => { - return router.buildLocation({ to: options.path, params: options.params }) - .pathname - } -} - -export function parseTestPathname(to: string | undefined) { - const path = to ?? '' - const segments: Array<{ - type: SegmentKind - value: string - prefixSegment?: string - suffixSegment?: string - }> = [] - let cursor = 0 - while (cursor < path.length) { - const start = cursor - const next = path.indexOf('/', start) - const end = next === -1 ? path.length : next - const data = parseSegment(path, start, end) - cursor = end + 1 - if (typeof data === 'string') { - segments.push({ type: SEGMENT_TYPE_PATHNAME, value: data }) - } else { - const [type, key, prefix, suffix] = data - const splat = type === SEGMENT_TYPE_WILDCARD - if (splat) { - cursor = path.length + 1 - } - const segment: (typeof segments)[number] = { - type, - value: splat - ? suffix === undefined - ? path.substring(start) - : '$' - : key, - } - if (prefix) { - segment.prefixSegment = prefix - } - if (suffix) { - segment.suffixSegment = suffix - } - segments.push(segment) - } - } - return segments -} - /** Materialize the request-local server result as the HTTP response users see. */ export function loadServerResponse( router: AnyRouter, @@ -184,38 +69,3 @@ export function loadServerResponse( }) }) } - -export async function dehydrateToBootstrap( - router: AnyRouter, - manifest: ServerManifest, -): Promise { - attachRouterServerSsrUtils({ router, manifest }) - try { - await router.load() - await router.serverSsr!.dehydrate() - - const scripts = router.serverSsr!.takeInitialHydrationScriptTags() - expect(scripts?.before.length).toBeGreaterThan(0) - expect(scripts?.boundary.children).toContain('$tsr-stream-boundary') - expect(scripts?.boundary.attrs).not.toHaveProperty('id') - - const context: Record = { - document: { - currentScript: { - remove() {}, - }, - }, - } - context.self = context - for (const script of scripts!.before) { - expect(script.attrs?.['data-tsr-stream-part']).toBe('') - expect(script.children).toBeTruthy() - runInNewContext(script.children!, context) - } - - expect(context.$_TSR).toBeDefined() - return context.$_TSR - } finally { - router.serverSsr?.cleanup() - } -} diff --git a/packages/router-core/tests/scroll-restoration-lifecycle.test.ts b/packages/router-core/tests/scroll-restoration-lifecycle.test.ts deleted file mode 100644 index e410d9aa55..0000000000 --- a/packages/router-core/tests/scroll-restoration-lifecycle.test.ts +++ /dev/null @@ -1,187 +0,0 @@ -import { createMemoryHistory } from '@tanstack/history' -import { afterEach, beforeEach, expect, test, vi } from 'vitest' -import { - BaseRootRoute, - getElementScrollRestorationEntry, - setupScrollRestoration, -} from '../src' -import { createTestRouter } from './routerTestUtils' - -let listeners: Array< - [ - Window | Document, - string, - EventListenerOrEventListenerObject, - boolean | AddEventListenerOptions | undefined, - ] -> - -beforeEach(() => { - listeners = [] - for (const target of [window, document]) { - const add = target.addEventListener.bind(target) - vi.spyOn(target, 'addEventListener').mockImplementation( - (type, listener, options) => { - listeners.push([target, type, listener, options]) - add(type, listener, options) - }, - ) - } -}) - -afterEach(() => { - for (const [target, type, listener, options] of listeners) { - target.removeEventListener(type, listener, options) - } - document.body.replaceChildren() - history.scrollRestoration = 'auto' - vi.restoreAllMocks() -}) - -function createRouter( - options: Parameters[0] = { - routeTree: new BaseRootRoute({}), - }, -) { - return createTestRouter({ - history: createMemoryHistory(), - scrollRestoration: true, - ...options, - }) -} - -test.each([false, true])( - 'hands off native restoration before taking a pagehide snapshot (persisted=%s)', - (persisted) => { - const modes: Array = [] - createRouter({ - routeTree: new BaseRootRoute({}), - getScrollRestorationKey: () => { - modes.push(history.scrollRestoration) - return `lifecycle-${persisted}` - }, - }) - dispatchEvent(new PageTransitionEvent('pagehide', { persisted })) - expect(modes).toEqual(['auto']) - expect(history.scrollRestoration).toBe('auto') - }, -) - -test.each([false, true])( - 'reclaims native restoration only for a persisted pageshow (persisted=%s)', - (persisted) => { - createRouter() - history.scrollRestoration = 'auto' - dispatchEvent(new PageTransitionEvent('pageshow', { persisted })) - expect(history.scrollRestoration).toBe(persisted ? 'manual' : 'auto') - }, -) - -test('still hands off native restoration when a custom key throws', () => { - const failure = new Error('custom scroll key failed') - const errors: Array = [] - addEventListener('error', (event) => { - errors.push(event.error) - event.preventDefault() - }) - createRouter({ - routeTree: new BaseRootRoute({}), - getScrollRestorationKey: () => { - throw failure - }, - }) - dispatchEvent(new PageTransitionEvent('pagehide')) - expect(errors).toEqual([failure]) - expect(history.scrollRestoration).toBe('auto') -}) - -test('hands off native restoration when storage persistence throws', () => { - const warn = vi.spyOn(console, 'warn').mockImplementation(() => {}) - vi.spyOn(Storage.prototype, 'setItem').mockImplementation(() => { - throw new Error('storage unavailable') - }) - createRouter() - dispatchEvent(new PageTransitionEvent('pagehide')) - expect(history.scrollRestoration).toBe('auto') - expect(warn).toHaveBeenCalledOnce() -}) - -test('preserves live nested scroll snapshots across repeated hide/show cycles without repeated setup', () => { - const element = document.createElement('div') - element.dataset.scrollRestorationId = 'lifecycle-nested' - document.body.append(element) - const router = createRouter({ - routeTree: new BaseRootRoute({}), - getScrollRestorationKey: () => 'lifecycle-nested', - }) - setupScrollRestoration(router) - expect(listeners.filter(([, type]) => type === 'pageshow')).toHaveLength(1) - for (const scrollTop of [80, 120]) { - element.scrollTop = scrollTop - element.dispatchEvent(new Event('scroll', { bubbles: true })) - dispatchEvent(new PageTransitionEvent('pagehide', { persisted: true })) - expect(history.scrollRestoration).toBe('auto') - expect( - getElementScrollRestorationEntry(router, { - id: 'lifecycle-nested', - getKey: router.options.getScrollRestorationKey, - }), - ).toEqual({ scrollX: 0, scrollY: scrollTop }) - dispatchEvent(new PageTransitionEvent('pageshow', { persisted: true })) - expect(history.scrollRestoration).toBe('manual') - } -}) - -test('leaves native restoration alone when router restoration is disabled', () => { - history.scrollRestoration = 'auto' - createRouter({ routeTree: new BaseRootRoute({}), scrollRestoration: false }) - dispatchEvent(new PageTransitionEvent('pagehide', { persisted: true })) - dispatchEvent(new PageTransitionEvent('pageshow', { persisted: true })) - expect(history.scrollRestoration).toBe('auto') -}) - -test('can enable restoration after disabled setup without duplicate lifecycle listeners', () => { - history.scrollRestoration = 'auto' - const router = createRouter({ - routeTree: new BaseRootRoute({}), - scrollRestoration: false, - getScrollRestorationKey: () => 'lifecycle-forced', - }) - expect(history.scrollRestoration).toBe('auto') - setupScrollRestoration(router, true) - setupScrollRestoration(router, true) - expect(history.scrollRestoration).toBe('manual') - for (const event of ['pagehide', 'pageshow']) { - expect(listeners.filter(([, type]) => type === event)).toHaveLength(1) - } - const element = document.createElement('div') - element.dataset.scrollRestorationId = 'lifecycle-forced' - document.body.append(element) - element.scrollTop = 40 - element.dispatchEvent(new Event('scroll', { bubbles: true })) - dispatchEvent(new PageTransitionEvent('pagehide', { persisted: true })) - expect(history.scrollRestoration).toBe('auto') - expect( - getElementScrollRestorationEntry(router, { - id: 'lifecycle-forced', - getKey: router.options.getScrollRestorationKey, - }), - ).toEqual({ scrollX: 0, scrollY: 40 }) - dispatchEvent(new PageTransitionEvent('pageshow', { persisted: true })) - expect(history.scrollRestoration).toBe('manual') -}) - -test('does not take over browser restoration or register listeners on the server', () => { - history.scrollRestoration = 'auto' - const router = createRouter({ - routeTree: new BaseRootRoute({}), - isServer: true, - }) - setupScrollRestoration(router, true) - expect(history.scrollRestoration).toBe('auto') - expect( - listeners.filter(([, type]) => - ['pagehide', 'pageshow', 'scroll'].includes(type), - ), - ).toEqual([]) -}) diff --git a/packages/router-core/tests/scroll-restoration.test.ts b/packages/router-core/tests/scroll-restoration.test.ts index 03e957e3da..c02a8f8783 100644 --- a/packages/router-core/tests/scroll-restoration.test.ts +++ b/packages/router-core/tests/scroll-restoration.test.ts @@ -66,7 +66,10 @@ describe('setupScrollRestoration', () => { window.history.scrollRestoration = 'auto' - createRouter({ scrollRestoration: true }) + const router = createRouter({ scrollRestoration: true }) + + expect(router._scroll.restoring).toBe(true) + expect(router._scroll.restoration).toBe(true) expect(window.history.scrollRestoration).toBe('manual') expect( windowAddEventListener.mock.calls.some(([event]) => event === 'pagehide'), @@ -149,7 +152,13 @@ describe('setupScrollRestoration', () => { window.history.scrollRestoration = 'auto' - createRouter(scrollRestoration === undefined ? {} : { scrollRestoration }) + const router = createRouter( + scrollRestoration === undefined ? {} : { scrollRestoration }, + ) + + expect(router._scroll.restoring).toBeUndefined() + expect(router._scroll.restoration).toBeUndefined() + expect(router._scroll.reset).toBe(true) expect(window.history.scrollRestoration).toBe('auto') expect( windowAddEventListener.mock.calls.some( diff --git a/packages/router-core/tests/search-context-boundaries.test.ts b/packages/router-core/tests/search-context-boundaries.test.ts deleted file mode 100644 index 5daec53aaa..0000000000 --- a/packages/router-core/tests/search-context-boundaries.test.ts +++ /dev/null @@ -1,57 +0,0 @@ -import { expect, test } from 'vitest' -import { createMemoryHistory } from '@tanstack/history' -import { BaseRootRoute, BaseRoute } from '../src' -import { createTestRouter, loadServerResponse } from './routerTestUtils' - -const path = '/parent/child?name=Alice&__proto__=%7B%22isAdmin%22%3Atrue%7D' - -function createRouteTree() { - const rootRoute = new BaseRootRoute() - const parentRoute = new BaseRoute({ - getParentRoute: () => rootRoute, - path: '/parent', - beforeLoad: ({ search }): Record => search, - }) - const childRoute = new BaseRoute({ - getParentRoute: () => parentRoute, - path: '/child', - loader: ({ context }) => ({ - name: context.name, - access: context.isAdmin ? 'admin' : 'visitor', - }), - }) - - return { - routeTree: rootRoute.addChildren([parentRoute.addChildren([childRoute])]), - childRoute, - } -} - -test('search-derived ancestor context does not grant inherited properties to a client loader', async () => { - const { routeTree, childRoute } = createRouteTree() - const router = createTestRouter({ - routeTree, - history: createMemoryHistory({ initialEntries: [path] }), - isServer: false, - }) - - await router.load() - - expect( - router.state.matches.find((match) => match.routeId === childRoute.id) - ?.loaderData, - ).toEqual({ name: 'Alice', access: 'visitor' }) -}) - -test('search-derived ancestor context does not grant inherited properties to an SSR loader', async () => { - const { routeTree, childRoute } = createRouteTree() - const router = createTestRouter({ routeTree, isServer: true }) - - const response = await loadServerResponse(router, path) - - expect(response.status).toBe(200) - expect( - router.state.matches.find((match) => match.routeId === childRoute.id) - ?.loaderData, - ).toEqual({ name: 'Alice', access: 'visitor' }) -}) diff --git a/packages/router-core/tests/searchParams-parse.bench.ts b/packages/router-core/tests/searchParams-parse.bench.ts index 79f7e3e5ac..ff94dcb99e 100644 --- a/packages/router-core/tests/searchParams-parse.bench.ts +++ b/packages/router-core/tests/searchParams-parse.bench.ts @@ -1,4 +1,4 @@ -import { describe, expect, test } from 'vitest' +import { bench, describe, expect } from 'vitest' import { defaultParseSearch, parseSearchWith } from '../src' const iterations = 1_000 @@ -184,96 +184,60 @@ const searches = Object.fromEntries( ) describe('default search parsing', () => { - test('ordinary string values', async ({ bench }) => { - await bench('ordinary string values', () => { - parseBatch(searches.ordinaryStrings!) - }).run() + bench('ordinary string values', () => { + parseBatch(searches.ordinaryStrings!) }) - test('ordinary strings outside JSON-literal initials', async ({ bench }) => { - await bench('ordinary strings outside JSON-literal initials', () => { - parseBatch(searches.nonLiteralInitialStrings!) - }).run() + bench('ordinary strings outside JSON-literal initials', () => { + parseBatch(searches.nonLiteralInitialStrings!) }) - test('ordinary strings with JSON-literal initials', async ({ bench }) => { - await bench('ordinary strings with JSON-literal initials', () => { - parseBatch(searches.jsonInitialStrings!) - }).run() + bench('ordinary strings with JSON-literal initials', () => { + parseBatch(searches.jsonInitialStrings!) }) - test('empty string values', async ({ bench }) => { - await bench('empty string values', () => { - parseBatch(searches.emptyStrings!) - }).run() + bench('empty string values', () => { + parseBatch(searches.emptyStrings!) }) - 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 strings with non-JSON punctuation starts', () => { + parseBatch(searches.punctuationStrings!) }) - 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('ordinary f/n/t words outside JSON-literal prefixes', () => { + parseBatch(searches.nonLiteralPrefixStrings!) }) - 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 JSON-literal prefixes', () => { + parseBatch(searches.jsonLiteralPrefixStrings!) }) - test('application words with complete JSON-literal prefixes', async ({ - bench, - }) => { - await bench('application words with complete JSON-literal prefixes', () => { - parseBatch(searches.jsonLiteralWordStrings!) - }).run() + bench('application words with complete JSON-literal prefixes', () => { + parseBatch(searches.jsonLiteralWordStrings!) }) - test('JSON-literal prefixes followed by punctuation', async ({ bench }) => { - await bench('JSON-literal prefixes followed by punctuation', () => { - parseBatch(searches.jsonLiteralBoundaryStrings!) - }).run() + bench('JSON-literal prefixes followed by punctuation', () => { + parseBatch(searches.jsonLiteralBoundaryStrings!) }) - test('JSON-compatible string values', async ({ bench }) => { - await bench('JSON-compatible string values', () => { - parseBatch(searches.jsonStrings!) - }).run() + bench('JSON-compatible string values', () => { + parseBatch(searches.jsonStrings!) }) - test('mixed application values', async ({ bench }) => { - await bench('mixed application values', () => { - parseBatch(searches.mixedValues!) - }).run() + bench('mixed application values', () => { + parseBatch(searches.mixedValues!) }) - test('primitives already converted by decode', async ({ bench }) => { - await bench('primitives already converted by decode', () => { - parseBatch(searches.decodedPrimitives!) - }).run() + bench('primitives already converted by decode', () => { + parseBatch(searches.decodedPrimitives!) }) - test('strings requiring JSON.parse', async ({ bench }) => { - await bench('strings requiring JSON.parse', () => { - parseBatch(searches.parsedJson!) - }).run() + bench('strings requiring JSON.parse', () => { + parseBatch(searches.parsedJson!) }) - test('JSON with leading whitespace', async ({ bench }) => { - await bench('JSON with leading whitespace', () => { - parseBatch(searches.whitespaceJson!) - }).run() + bench('JSON with leading whitespace', () => { + parseBatch(searches.whitespaceJson!) }) - test('malformed JSON retains original strings', async ({ bench }) => { - await bench('malformed JSON retains original strings', () => { - parseBatch(searches.malformedJson!) - }).run() + bench('malformed JSON retains original strings', () => { + parseBatch(searches.malformedJson!) }) }) @@ -284,20 +248,16 @@ expect(customParse(searches.ordinaryStrings!)).toEqual({ category: 'HARDWARE', sort: 'NEWEST', }) -test('custom search parser ordinary strings', async ({ bench }) => { - await bench('custom search parser ordinary strings', () => { - parseBatch(searches.ordinaryStrings!, customParse) - }).run() +bench('custom search parser ordinary strings', () => { + parseBatch(searches.ordinaryStrings!, customParse) }) const throwingParse = parseSearchWith(() => { throw new Error('not parseable') }) expect(throwingParse(searches.ordinaryStrings!)).toEqual(ordinaryStrings) -test('custom search parser rejected strings', async ({ bench }) => { - await bench('custom search parser rejected strings', () => { - parseBatch(searches.ordinaryStrings!, throwingParse) - }).run() +bench('custom search parser rejected strings', () => { + parseBatch(searches.ordinaryStrings!, throwingParse) }) const encodedMixed = new URLSearchParams([ @@ -319,10 +279,8 @@ expect(defaultParseSearch(encodedMixed)).toEqual({ category: 'favorite', tag: ['one', 'two'], }) -test('encoded mixed search with repeated keys', async ({ bench }) => { - await bench('encoded mixed search with repeated keys', () => { - parseBatch(encodedMixed) - }).run() +bench('encoded mixed search with repeated keys', () => { + parseBatch(encodedMixed) }) void benchmarkSink diff --git a/packages/router-core/tests/searchParams.bench.ts b/packages/router-core/tests/searchParams.bench.ts index 32d42b96fd..35fda3060f 100644 --- a/packages/router-core/tests/searchParams.bench.ts +++ b/packages/router-core/tests/searchParams.bench.ts @@ -1,4 +1,4 @@ -import { describe, expect, test } from 'vitest' +import { bench, describe, expect } from 'vitest' import { defaultStringifySearch } from '../src' const iterations = 1_000 @@ -112,88 +112,56 @@ function stringifyBatch(search: Record) { } describe('default search serialization', () => { - test('empty object', async ({ bench }) => { - await bench('empty object', () => { - stringifyBatch({}) - }).run() + bench('empty object', () => { + stringifyBatch({}) }) - test('only undefined values', async ({ bench }) => { - await bench('only undefined values', () => { - stringifyBatch({ first: undefined, second: undefined }) - }).run() + bench('only undefined values', () => { + stringifyBatch({ first: undefined, second: undefined }) }) - test('ordinary string values', async ({ bench }) => { - await bench('ordinary string values', () => { - stringifyBatch(ordinaryStrings) - }).run() + bench('ordinary string values', () => { + stringifyBatch(ordinaryStrings) }) - test('ordinary strings outside JSON-literal initials', async ({ bench }) => { - await bench('ordinary strings outside JSON-literal initials', () => { - stringifyBatch(nonLiteralInitialStrings) - }).run() + bench('ordinary strings outside JSON-literal initials', () => { + stringifyBatch(nonLiteralInitialStrings) }) - test('ordinary strings with JSON-literal initials', async ({ bench }) => { - await bench('ordinary strings with JSON-literal initials', () => { - stringifyBatch(jsonInitialStrings) - }).run() + bench('ordinary strings with JSON-literal initials', () => { + stringifyBatch(jsonInitialStrings) }) - test('empty string values', async ({ bench }) => { - await bench('empty string values', () => { - stringifyBatch(emptyStrings) - }).run() + bench('empty string values', () => { + stringifyBatch(emptyStrings) }) - test('ordinary strings with non-JSON punctuation starts', async ({ - bench, - }) => { - await bench('ordinary strings with non-JSON punctuation starts', () => { - stringifyBatch(punctuationStrings) - }).run() + bench('ordinary strings with non-JSON punctuation starts', () => { + stringifyBatch(punctuationStrings) }) - 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('ordinary f/n/t words outside JSON-literal prefixes', () => { + stringifyBatch(nonLiteralPrefixStrings) }) - test('application words with JSON-literal prefixes', async ({ bench }) => { - await bench('application words with JSON-literal prefixes', () => { - stringifyBatch(jsonLiteralPrefixStrings) - }).run() + bench('application words with JSON-literal prefixes', () => { + stringifyBatch(jsonLiteralPrefixStrings) }) - test('application words with complete JSON-literal prefixes', async ({ - bench, - }) => { - await bench('application words with complete JSON-literal prefixes', () => { - stringifyBatch(jsonLiteralWordStrings) - }).run() + bench('application words with complete JSON-literal prefixes', () => { + stringifyBatch(jsonLiteralWordStrings) }) - test('JSON-literal prefixes followed by punctuation', async ({ bench }) => { - await bench('JSON-literal prefixes followed by punctuation', () => { - stringifyBatch(jsonLiteralBoundaryStrings) - }).run() + bench('JSON-literal prefixes followed by punctuation', () => { + stringifyBatch(jsonLiteralBoundaryStrings) }) - test('JSON-compatible string values', async ({ bench }) => { - await bench('JSON-compatible string values', () => { - stringifyBatch(jsonStrings) - }).run() + bench('JSON-compatible string values', () => { + stringifyBatch(jsonStrings) }) - test('mixed application values', async ({ bench }) => { - await bench('mixed application values', () => { - stringifyBatch(mixedValues) - }).run() + bench('mixed application values', () => { + stringifyBatch(mixedValues) }) }) diff --git a/packages/router-core/tests/server-history.test.ts b/packages/router-core/tests/server-history.test.ts deleted file mode 100644 index 6343a08cd2..0000000000 --- a/packages/router-core/tests/server-history.test.ts +++ /dev/null @@ -1,246 +0,0 @@ -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) => { - const root = new BaseRootRoute() - const targetLoader = vi.fn(() => 'target') - const router = createTestRouter({ - isServer, - history: createMemoryHistory({ initialEntries: ['/'] }), - routeTree: root.addChildren([ - new BaseRoute({ getParentRoute: () => root, path: '/' }), - new BaseRoute({ - getParentRoute: () => root, - path: '/target', - loader: targetLoader, - }), - ]), - }) - await router.load() - const load = vi.spyOn(router, 'load') - - await router.navigate({ to: '/target' }) - expect(router.history.length).toBe(isServer ? 1 : 2) - expect(router.state.location.pathname).toBe(isServer ? '/' : '/target') - await router.navigate({ to: '/', replace: true }) - expect(router.history.length).toBe(isServer ? 1 : 2) - expect(router.history.location.pathname).toBe('/') - expect(targetLoader).toHaveBeenCalledTimes(isServer ? 0 : 1) - expect(load).toHaveBeenCalledTimes(isServer ? 0 : 2) - }, -) - -test('server navigation entry points resolve without building or loading', async () => { - const router = createTestRouter({ - isServer: true, - history: createServerHistory('/'), - routeTree: new BaseRootRoute(), - }) - const location = router.buildLocation({ to: '/' }) - const build = vi.spyOn(router, 'buildLocation') - const load = vi.spyOn(router, 'load') - await router.navigate({ to: '/' }) - await router.navigate({ href: 'https://example.com', reloadDocument: true }) - await router.navigate({ to: '/', reloadDocument: true, replace: true }) - await router.buildAndCommitLocation({ to: '/' }) - await router.commitLocation(location) - - expect(build).not.toHaveBeenCalled() - expect(load).not.toHaveBeenCalled() - expect(router._pendingLocation).toBeUndefined() - expect(router._commitPromise).toBeUndefined() -}) - -test.each(['beforeLoad', 'loader'] as const)( - 'navigation during %s leaves the request load intact', - async (hook) => { - const targetLoader = vi.fn() - const root = new BaseRootRoute() - const router = createTestRouter({ - isServer: true, - routeTree: root.addChildren([ - new BaseRoute({ - getParentRoute: () => root, - path: '/', - [hook]: async ({ - navigate, - }: { - navigate: (opts: { to: string }) => Promise - }) => { - await navigate({ to: '/target' }) - return { value: 'request data' } - }, - }), - new BaseRoute({ - getParentRoute: () => root, - path: '/target', - loader: targetLoader, - }), - ]), - }) - const load = vi.spyOn(router, 'load') - const response = await loadServerResponse(router, '/') - - expect(response.status).toBe(200) - expect(load).toHaveBeenCalledTimes(1) - expect(targetLoader).not.toHaveBeenCalled() - expect(router.state.location.pathname).toBe('/') - expect(router.history.location.pathname).toBe('/') - expect(router.state.matches.at(-1)?.status).toBe('success') - router.history.push('/target') - expect(router.history.location.pathname).toBe('/') - }, -) - -test('server redirects still produce HTTP redirect responses', async () => { - const router = createTestRouter({ - isServer: true, - routeTree: new BaseRootRoute({ - beforeLoad: () => { - throw redirect({ href: '/login', statusCode: 307 }) - }, - }), - }) - const response = await loadServerResponse(router, '/') - expect(response.status).toBe(307) - expect(response.headers.get('Location')).toBe('/login') - expect(router.history.location.pathname).toBe('/') -}) diff --git a/packages/router-core/tests/server-loader-abort-error.test.ts b/packages/router-core/tests/server-loader-abort-error.test.ts index e3b5d3c3ef..bc079ce239 100644 --- a/packages/router-core/tests/server-loader-abort-error.test.ts +++ b/packages/router-core/tests/server-loader-abort-error.test.ts @@ -1,36 +1,25 @@ import { describe, expect, test, vi } from 'vitest' import { createMemoryHistory } from '@tanstack/history' -import { - BaseRootRoute, - BaseRoute, - createControlledPromise, - redirect, -} from '../src' +import { BaseRootRoute, BaseRoute, createControlledPromise } from '../src' import { createRequestHandler } from '../src/ssr/server' import { createTestRouter, loadServerResponse } from './routerTestUtils' describe('loader user-thrown abort values', () => { - test.each([ - { - isServer: false, - thrownType: 'AbortSignal', - createThrownValue: (signal: AbortSignal) => signal, - }, - { - isServer: false, - thrownType: 'AbortError', - createThrownValue: () => - new DOMException('The operation was aborted.', 'AbortError'), - }, - { - isServer: true, - thrownType: 'AbortError', - createThrownValue: () => - Object.assign(new Error('The operation was aborted.'), { - name: 'AbortError', - }), - }, - ])( + test.each( + ([false, true] as const).flatMap((isServer) => [ + { + isServer, + thrownType: 'AbortSignal', + createThrownValue: (signal: AbortSignal) => signal, + }, + { + isServer, + thrownType: 'AbortError', + createThrownValue: () => + new DOMException('The operation was aborted.', 'AbortError'), + }, + ]), + )( 'treats a user-thrown $thrownType as an ordinary route error (isServer=$isServer)', async ({ isServer, createThrownValue }) => { let matchSignal: AbortSignal | undefined @@ -61,9 +50,9 @@ describe('loader user-thrown abort values', () => { const match = router.state.matches.find( (item) => item.routeId === abortingRoute.id, ) - // A server match remains ordinary route failure during reduction. Its - // controller is left alone: the payload finished, so nothing is pending. - expect(matchSignal?.aborted).toBe(false) + // A server match remains ordinary route failure during reduction, then + // its controller is retired when the request response is cleaned up. + expect(matchSignal?.aborted).toBe(isServer) expect(match?.status).toBe('error') expect(match?.error).toBe(thrownValue) }, @@ -126,7 +115,7 @@ describe('loader user-thrown abort values', () => { expect(render).not.toHaveBeenCalled() }) - test('response cleanup aborts deferred loader data with a shared AbortError reason', async () => { + test('response cleanup aborts the controller retained by deferred loader data', async () => { const deferred = createControlledPromise() let loaderSignal: AbortSignal | undefined const rootRoute = new BaseRootRoute({}) @@ -148,66 +137,7 @@ describe('loader user-thrown abort values', () => { expect(response.status).toBe(200) expect(loaderSignal?.aborted).toBe(true) - const firstReason = loaderSignal?.reason - expect(firstReason).toMatchObject({ - name: 'AbortError', - message: expect.stringContaining('settled'), - }) - expect(firstReason).not.toBeInstanceOf(DOMException) - - const nextDeferred = createControlledPromise() - const nextRootRoute = new BaseRootRoute({}) - const nextRouter = createTestRouter({ - routeTree: nextRootRoute.addChildren([ - new BaseRoute({ - getParentRoute: () => nextRootRoute, - path: '/next', - loader: ({ abortController }) => { - loaderSignal = abortController.signal - return { deferred: nextDeferred } - }, - }), - ]), - history: createMemoryHistory({ initialEntries: ['/next'] }), - isServer: true, - }) - - const nextResponse = await loadServerResponse(nextRouter, '/next') - - expect(nextResponse.status).toBe(200) - expect(loaderSignal?.reason).toBe(firstReason) deferred.resolve('late data') - nextDeferred.resolve('late data') - }) - - test('redirect aborts match controllers with an AbortError-shaped reason', async () => { - let loaderSignal: AbortSignal | undefined - const rootRoute = new BaseRootRoute() - const sourceRoute = new BaseRoute({ - getParentRoute: () => rootRoute, - path: '/source', - loader: ({ abortController }) => { - loaderSignal = abortController.signal - return redirect({ - href: 'https://other.example/ignored', - headers: { Location: '/target' }, - }) - }, - }) - const router = createTestRouter({ - routeTree: rootRoute.addChildren([sourceRoute]), - isServer: true, - }) - - const response = await loadServerResponse(router, '/source') - - expect(response.status).toBe(307) - expect(loaderSignal?.aborted).toBe(true) - expect(loaderSignal?.reason).toMatchObject({ - name: 'AbortError', - message: expect.stringContaining('redirect'), - }) - expect(loaderSignal?.reason).not.toHaveProperty('matches') }) test('request cancellation thrown from route context does not call onError', async () => { @@ -298,17 +228,15 @@ describe('loader user-thrown abort values', () => { path: '/work', loader, }) - const createRouter = vi.fn(() => - createTestRouter({ - routeTree: rootRoute.addChildren([route]), - history: createMemoryHistory({ initialEntries: ['/work'] }), - isServer: true, - }), - ) + const router = createTestRouter({ + routeTree: rootRoute.addChildren([route]), + history: createMemoryHistory({ initialEntries: ['/work'] }), + isServer: true, + }) const requestController = new AbortController() const render = vi.fn(() => new Response('must not render')) const handler = createRequestHandler({ - createRouter, + createRouter: () => router, request: new Request('http://localhost/work', { signal: requestController.signal, }), @@ -324,39 +252,10 @@ describe('loader user-thrown abort values', () => { requestController.abort(cancellation) await expect(response).rejects.toBe(cancellation) - expect(createRouter).not.toHaveBeenCalled() expect(loader).not.toHaveBeenCalled() expect(render).not.toHaveBeenCalled() }) - test('request cancellation wins after manifest lookup resolves', async () => { - const rootRoute = new BaseRootRoute({}) - const createRouter = vi.fn(() => - createTestRouter({ - routeTree: rootRoute, - history: createMemoryHistory({ initialEntries: ['/'] }), - isServer: true, - }), - ) - const requestController = new AbortController() - const render = vi.fn(() => new Response('must not render')) - const handler = createRequestHandler({ - createRouter, - request: new Request('http://localhost/', { - signal: requestController.signal, - }), - getRouterManifest: () => Promise.resolve({ routes: {} }), - }) - - const response = handler(render) - const cancellation = new Error('request disconnected') - queueMicrotask(() => requestController.abort(cancellation)) - - await expect(response).rejects.toBe(cancellation) - expect(createRouter).not.toHaveBeenCalled() - expect(render).not.toHaveBeenCalled() - }) - test('request cancellation does not wait for custom dehydration', async () => { const dehydrateStarted = createControlledPromise() const dehydrate = createControlledPromise() diff --git a/packages/router-core/tests/ssr-match-id.bench.ts b/packages/router-core/tests/ssr-match-id.bench.ts index 33e0bb5945..3f6a7c0a6e 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 { describe, test } from 'vitest' -import { dehydrateSsrMatchId } from '../src/ssr/ssr-match-id' +import { bench, describe, expect } from 'vitest' +import { dehydrateSsrMatchId, hydrateSsrMatchId } from '../src/ssr/ssr-match-id' const typicalIds = Array.from( { length: 100 }, @@ -11,27 +11,42 @@ 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', () => { - 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('encode 100 typical match IDs', () => { + let size = 0 + for (const id of typicalIds) { + size += 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() + 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 }) }) diff --git a/packages/router-core/tests/ssr-match-id.test.ts b/packages/router-core/tests/ssr-match-id.test.ts index 221b15c3e6..65e1cc4ebb 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 } from '../src/ssr/ssr-match-id' +import { dehydrateSsrMatchId, hydrateSsrMatchId } from '../src/ssr/ssr-match-id' describe('ssr match id codec', () => { it('removes forward slashes in dehydrated ids', () => { @@ -8,16 +8,35 @@ describe('ssr match id codec', () => { ) expect(dehydratedId).not.toContain('/') - expect(dehydratedId).not.toContain('\0') + expect(hydrateSsrMatchId(dehydratedId)).toBe( + '/$orgId/projects/$projectId//acme/projects/dashboard/{}', + ) }) it('leaves ids without slashes unchanged', () => { - expect(dehydrateSsrMatchId('plain-id')).toBe('plain-id') + const id = 'plain-id' + + expect(dehydrateSsrMatchId(id)).toBe(id) + expect(hydrateSsrMatchId(id)).toBe(id) }) - it('keeps distinct slash-delimited ids distinct', () => { - expect(dehydrateSsrMatchId('/posts/1')).not.toBe( - dehydrateSsrMatchId('/posts1'), + 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('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-core/tests/ssr-server-cleanup.test.ts b/packages/router-core/tests/ssr-server-cleanup.test.ts index 84e718812c..a4d0b96588 100644 --- a/packages/router-core/tests/ssr-server-cleanup.test.ts +++ b/packages/router-core/tests/ssr-server-cleanup.test.ts @@ -1,36 +1,14 @@ -import { runInNewContext } from 'node:vm' import { createMemoryHistory } from '@tanstack/history' -import { createStream } from 'seroval' -import { afterEach, describe, expect, test, vi } from 'vitest' -import { BaseRootRoute, BaseRoute, RawStream } from '../src' +import { afterEach, describe, expect, onTestFinished, test, vi } from 'vitest' +import { BaseRootRoute, BaseRoute } from '../src' import { createRequestHandler } from '../src/ssr/createRequestHandler' import { bindSsrResponseToRequest, createSsrStreamResponse, } from '../src/ssr/handlerCallback' -import { - HYDRATION_SCRIPT_BOUNDARY_BYTES, - HydrationScriptOutputState, - createHydrationScripts, -} from '../src/ssr/hydrationScripts' import { attachRouterServerSsrUtils } from '../src/ssr/ssr-server' -import { - transformHtmlStringWithRouter, - transformReadableStreamWithRouter, -} from '../src/ssr/transformStreamWithRouter' +import { transformStreamWithRouter } from '../src/ssr/transformStreamWithRouter' import { createTestRouter } from './routerTestUtils' -import type { - HydrationScriptOutput, - InitialHydrationScriptTags, -} from '../src/ssr/hydrationScripts' - -type HydrationScripts = ReturnType -const HYDRATION_SCRIPT_BOUNDARY_SUFFIX = new TextDecoder().decode( - HYDRATION_SCRIPT_BOUNDARY_BYTES, -) -const HYDRATION_SCRIPT_BOUNDARY_SOURCE = - `document.currentScript.remove()` + - HYDRATION_SCRIPT_BOUNDARY_SUFFIX.slice(0, -''.length) /** * CI-stable tests for the SSR cleanup contract. These do not rely on GC @@ -67,53 +45,20 @@ afterEach(() => { vi.restoreAllMocks() }) -function renderInitialScripts(scripts: InitialHydrationScriptTags) { - return [...scripts.before, scripts.boundary] - .map((script) => { - const id = script.attrs?.id ? ` id="${script.attrs.id}"` : '' - return `${script.children ?? ''}` - }) - .join('') -} - -async function waitFor(check: () => boolean) { - for (let index = 0; index < 20; index++) { - if (check()) { - return - } - await Promise.resolve() - } - throw new Error('condition was not reached') -} - -function drainHydrationOutput(output: HydrationScriptOutput) { - const decoder = new TextDecoder() - let text = '' - while ( - output.state === HydrationScriptOutputState.Ready || - output.state === HydrationScriptOutputState.Active - ) { - text += decoder.decode(output.pullChunk(), { stream: true }) - } - return text + decoder.decode() -} - describe('serverSsr.cleanup', () => { test('onCleanup listeners run exactly once', () => { const router = buildRouter() attachRouterServerSsrUtils({ router, manifest: undefined }) - const serverSsr = router.serverSsr! let calls = 0 - serverSsr.onCleanup(() => { + router.serverSsr!.onCleanup(() => { calls++ }) - serverSsr.cleanup() - serverSsr.cleanup() + router.serverSsr!.cleanup() + // Second call: serverSsr is undefined now, must short-circuit safely. + router.serverSsr?.cleanup() expect(calls).toBe(1) - expect(router.ssr).toBeUndefined() - expect(router.serverSsr).toBeUndefined() }) test('listener that re-enters cleanup() does not re-fire siblings', () => { @@ -168,148 +113,6 @@ describe('serverSsr.cleanup', () => { expect(router.serverSsr).toBeUndefined() }) - test('cleanup cancels and unlocks a pending RawStream reader', async () => { - const pullStarted = deferred() - let cancelCalls = 0 - const stream = new ReadableStream( - { - pull() { - pullStarted.resolve() - return new Promise(() => {}) - }, - cancel() { - cancelCalls++ - return new Promise(() => {}) - }, - }, - { highWaterMark: 0 }, - ) - const router = buildRouter({ value: new RawStream(stream) }) - attachRouterServerSsrUtils({ router, manifest: undefined }) - - await router.load() - const serverSsr = router.serverSsr! - await serverSsr.dehydrate() - await pullStarted.promise - expect(stream.locked).toBe(true) - - serverSsr.cleanup() - expect(cancelCalls).toBe(1) - expect(stream.locked).toBe(false) - - serverSsr.cleanup() - expect(cancelCalls).toBe(1) - expect(router.ssr).toBeUndefined() - expect(router.serverSsr).toBeUndefined() - }) - - test('hydration output notifies once before cleanup', async () => { - const value = deferred() - const router = buildRouter({ value: value.promise }) - attachRouterServerSsrUtils({ router, manifest: undefined }) - await router.load() - const serverSsr = router.serverSsr! - await serverSsr.dehydrate() - serverSsr.takeInitialHydrationScriptTags() - const output = serverSsr.hydrationScripts.claimOutput() - let calls = 0 - output.subscribe(() => { - calls++ - }) - - serverSsr.hydrationScripts.liftBarrier() - value.resolve('done') - await waitFor(() => output.state === HydrationScriptOutputState.Ready) - expect(calls).toBe(1) - serverSsr.cleanup() - await Promise.resolve() - - expect(calls).toBe(1) - expect(output.state).toBe(HydrationScriptOutputState.Done) - expect(router.serverSsr).toBeUndefined() - }) - - test('cleanup stops work from late serialization values', async () => { - const value = deferred() - const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) - const router = buildRouter({ value: value.promise }) - - try { - attachRouterServerSsrUtils({ router, manifest: undefined }) - await router.load() - await router.serverSsr!.dehydrate() - router.serverSsr!.cleanup() - - value.resolve(() => {}) - await Promise.resolve() - await Promise.resolve() - - expect(errorSpy).not.toHaveBeenCalled() - } finally { - router.serverSsr?.cleanup() - errorSpy.mockRestore() - } - }) - - test('cleanup while custom dehydration waits does not start serialization', async () => { - const dehydratedData = deferred>() - const router = buildRouter() - router.options.dehydrate = () => dehydratedData.promise - attachRouterServerSsrUtils({ router, manifest: undefined }) - - await router.load() - const serverSsr = router.serverSsr! - const dehydration = serverSsr.dehydrate() - - serverSsr.cleanup() - dehydratedData.resolve({ late: 'ignored' }) - await dehydration - - expect(router.serverSsr).toBeUndefined() - }) - - test('request abort unwinds an argument-free custom dehydration hook', async () => { - const abortController = new AbortController() - const reason = new Error('request-aborted') - const dehydratedData = deferred>() - const router = buildRouter() - const dehydrate = vi.fn(() => dehydratedData.promise) - router.options.dehydrate = dehydrate - attachRouterServerSsrUtils({ router, manifest: undefined }) - - await router.load() - const dehydration = router.serverSsr!.dehydrate({ - signal: abortController.signal, - }) - expect(dehydrate).toHaveBeenCalledWith() - abortController.abort(reason) - - await expect(dehydration).rejects.toBe(reason) - router.serverSsr?.cleanup() - dehydratedData.resolve({ late: 'ignored' }) - }) - - test('request abort stops dehydration after an already-settled custom hook', async () => { - const abortController = new AbortController() - const reason = new Error('request-aborted') - const router = buildRouter() - router.options.dehydrate = () => Promise.resolve({ ready: true }) - attachRouterServerSsrUtils({ router, manifest: undefined }) - - await router.load() - const serverSsr = router.serverSsr! - const scripts = serverSsr.hydrationScripts as HydrationScripts - const pushSerializedSource = vi.spyOn(scripts, 'pushSerializedSource') - const dehydration = serverSsr.dehydrate({ - signal: abortController.signal, - }) - queueMicrotask(() => abortController.abort(reason)) - - await expect(dehydration).rejects.toBe(reason) - expect(pushSerializedSource).not.toHaveBeenCalled() - serverSsr.cleanup() - }) - test('serialization completion does not clear render-finished listeners', async () => { const value = deferred() const router = buildRouter({ value: value.promise }) @@ -323,14 +126,12 @@ describe('serverSsr.cleanup', () => { renderFinishedCalls++ }) - router.serverSsr!.takeInitialHydrationScriptTags() - const output = router.serverSsr!.hydrationScripts.claimOutput() - router.serverSsr!.hydrationScripts.liftBarrier() + const serializationDone = new Promise((resolve) => { + router.serverSsr!.onSerializationFinished(resolve) + }) value.resolve('done') - await waitFor(() => output.state === HydrationScriptOutputState.Ready) - drainHydrationOutput(output) - expect(output.state).toBe(HydrationScriptOutputState.Done) + await serializationDone expect(renderFinishedCalls).toBe(0) router.serverSsr!.setRenderFinished() @@ -339,39 +140,6 @@ describe('serverSsr.cleanup', () => { router.serverSsr?.cleanup() }) - test('waits for the initial record after a completed Seroval stream', async () => { - const completedStream = createStream() - completedStream.next('stream value') - completedStream.return('stream done') - const lateValue = deferred() - const router = buildRouter({ - completedStream, - lateValue: lateValue.promise, - }) - attachRouterServerSsrUtils({ router, manifest: undefined }) - - await router.load() - const serverSsr = router.serverSsr! - await serverSsr.dehydrate() - const initialHydration = renderInitialScripts( - serverSsr.takeInitialHydrationScriptTags()!, - ) - expect(initialHydration).toContain('stream value') - - const output = serverSsr.hydrationScripts.claimOutput() - serverSsr.setRenderFinished() - expect(output.state).toBe(HydrationScriptOutputState.Waiting) - - lateValue.resolve('late value') - await waitFor(() => output.state === HydrationScriptOutputState.Ready) - const hydration = drainHydrationOutput(output) - expect(hydration).toContain('late value') - expect(hydration).toContain('$_TSR.e()') - expect(output.state).toBe(HydrationScriptOutputState.Done) - - serverSsr.cleanup() - }) - test('render-finished listeners can synchronously finish serialization', async () => { const value = deferred() const router = buildRouter({ value: value.promise }) @@ -379,190 +147,57 @@ describe('serverSsr.cleanup', () => { await router.load() await router.serverSsr!.dehydrate() - router.serverSsr!.takeInitialHydrationScriptTags() - const output = router.serverSsr!.hydrationScripts.claimOutput() + router.serverSsr!.takeBufferedScripts() router.serverSsr!.onRenderFinished(() => { value.resolve('done') }) + const serializationDone = new Promise((resolve) => { + router.serverSsr!.onSerializationFinished(resolve) + }) router.serverSsr!.setRenderFinished() - await waitFor(() => output.state === HydrationScriptOutputState.Ready) + await serializationDone - expect(drainHydrationOutput(output)).toContain('$_TSR.e()') - expect(output.state).toBe(HydrationScriptOutputState.Done) + expect(router.serverSsr!.takeBufferedHtml()).toContain('$_TSR.e()') router.serverSsr?.cleanup() }) - test('render-finished is one-shot and invokes late listeners immediately', () => { - const router = buildRouter() - attachRouterServerSsrUtils({ router, manifest: undefined }) - const serverSsr = router.serverSsr! - const earlyListener = vi.fn() - const lateListener = vi.fn() - - serverSsr.onRenderFinished(earlyListener) - serverSsr.setRenderFinished() - serverSsr.setRenderFinished() - serverSsr.onRenderFinished(lateListener) - serverSsr.setRenderFinished() - - expect(earlyListener).toHaveBeenCalledOnce() - expect(lateListener).toHaveBeenCalledOnce() - serverSsr.cleanup() - }) - - test('a late output claim exposes completed serialization', async () => { + test('late serialization listener runs safely and returns unsubscribe', async () => { const router = buildRouter() attachRouterServerSsrUtils({ router, manifest: undefined }) await router.load() await router.serverSsr!.dehydrate() - router.serverSsr!.takeInitialHydrationScriptTags() - const output = router.serverSsr!.hydrationScripts.claimOutput() let calls = 0 - const unsubscribe = output.subscribe(() => { + const unsubscribe = router.serverSsr!.onSerializationFinished(() => { calls++ }) - expect(output.state).toBe(HydrationScriptOutputState.Done) - expect(calls).toBe(0) + expect(calls).toBe(1) expect(() => unsubscribe()).not.toThrow() router.serverSsr?.cleanup() }) - test('stream pass-through only reserves when no SSR work is pending', async () => { + test('stream fast path only reserves when no SSR work is pending', async () => { const router = buildRouter() attachRouterServerSsrUtils({ router, manifest: undefined }) await router.load() await router.serverSsr!.dehydrate() - const initialScripts = router.serverSsr!.takeInitialHydrationScriptTags() - expect(initialScripts?.boundary.children).toBe( - HYDRATION_SCRIPT_BOUNDARY_SOURCE, - ) - expect(initialScripts?.boundary.attrs).not.toHaveProperty('id') + const barrierScript = router.serverSsr!.takeBufferedScripts() + expect(barrierScript).toBeDefined() - expect(router.serverSsr!.hydrationScripts.reserveFastPath()).toBe(true) - let renderFinishedCalls = 0 - router.serverSsr!.onRenderFinished(() => { - renderFinishedCalls++ - }) router.serverSsr!.setRenderFinished() - expect(renderFinishedCalls).toBe(1) - expect(router.serverSsr!.hydrationScripts.reserveFastPath()).toBe(false) + expect(router.serverSsr!.reserveStreamFastPath()).toBe(true) + expect(router.serverSsr!.reserveStreamFastPath()).toBe(false) router.serverSsr?.cleanup() }) - test('initial boundary ends with the exact scanner suffix', async () => { - const router = buildRouter() - attachRouterServerSsrUtils({ router, manifest: undefined }) - - await router.load() - await router.serverSsr!.dehydrate() - const scripts = router.serverSsr!.takeInitialHydrationScriptTags()! - const boundaryHtml = renderInitialScripts({ - before: [], - boundary: scripts.boundary, - }) - - expect(boundaryHtml).toBe( - ``, - ) - expect(boundaryHtml.endsWith(HYDRATION_SCRIPT_BOUNDARY_SUFFIX)).toBe(true) - - router.serverSsr?.cleanup() - }) - - test('the final hydration tag cleans adjacent parts before adapter scripts', () => { - const hydrationScripts = createHydrationScripts(undefined, ['void 0']) - const scripts = hydrationScripts.takeInitialHydrationScriptTags()! - const cleanupTag = scripts.before.at(-1)! - const nodes: Array = [] - const createNode = (marked: boolean) => { - const node = { - hasAttribute(name: string) { - return marked && name === 'data-tsr-stream-part' - }, - remove() { - nodes.splice(nodes.indexOf(this), 1) - }, - } - Object.defineProperty(node, 'previousElementSibling', { - get() { - return nodes[nodes.indexOf(node) - 1] ?? null - }, - }) - return node - } - const olderPart = createNode(true) - const unrelated = createNode(false) - const firstPart = createNode(true) - const cleanup = createNode(true) - nodes.push(olderPart, unrelated, firstPart, cleanup) - - runInNewContext(cleanupTag.children!, { - document: { currentScript: cleanup }, - }) - - const routeScript = createNode(false) - const assetScript = createNode(false) - nodes.push(routeScript, assetScript) - - expect(nodes).toEqual([olderPart, unrelated, routeScript, assetScript]) - hydrationScripts.cleanup() - }) - - test('a failed hydration tag leaves its transport node', () => { - for (const brokenSource of [ - 'throw new Error("runtime failure")', - 'const = "syntax failure"', - ]) { - const hydrationScripts = createHydrationScripts(undefined, [brokenSource]) - const scripts = hydrationScripts.takeInitialHydrationScriptTags()! - const nodes: Array<{ remove: () => void }> = [] - const part = { - previousElementSibling: null, - hasAttribute: () => true, - remove() { - nodes.splice(nodes.indexOf(this), 1) - }, - } - nodes.push(part) - - expect(() => - runInNewContext(scripts.before[0]!.children!, { - document: { currentScript: part }, - }), - ).toThrow() - expect(nodes).toEqual([part]) - hydrationScripts.cleanup() - } - }) - - test('the boundary removes only itself when there are no initial parts', () => { - const hydrationScripts = createHydrationScripts(undefined, []) - const scripts = hydrationScripts.takeInitialHydrationScriptTags()! - const nodes: Array<{ remove: () => void }> = [] - const boundary = { - remove() { - nodes.splice(nodes.indexOf(this), 1) - }, - } - nodes.push(boundary) - - runInNewContext(scripts.boundary.children!, { - document: { currentScript: boundary }, - }) - - expect(nodes).toEqual([]) - hydrationScripts.cleanup() - }) - - test('stream pass-through rejects while SSR work is pending', async () => { + test('stream fast path rejects while SSR work is pending', async () => { const value = deferred() const router = buildRouter({ value: value.promise }) attachRouterServerSsrUtils({ router, manifest: undefined }) @@ -570,226 +205,47 @@ describe('serverSsr.cleanup', () => { await router.load() await router.serverSsr!.dehydrate() - expect(router.serverSsr!.hydrationScripts.reserveFastPath()).toBe(false) - const initialScripts = router.serverSsr!.takeInitialHydrationScriptTags() - expect(initialScripts?.boundary.children).toBe( - HYDRATION_SCRIPT_BOUNDARY_SOURCE, - ) - expect(initialScripts?.boundary.attrs).not.toHaveProperty('id') - expect(router.serverSsr!.hydrationScripts.reserveFastPath()).toBe(false) + expect(router.serverSsr!.reserveStreamFastPath()).toBe(false) + const barrierScript = router.serverSsr!.takeBufferedScripts() + expect(barrierScript).toBeDefined() + expect(router.serverSsr!.reserveStreamFastPath()).toBe(false) + const serializationDone = new Promise((resolve) => { + router.serverSsr!.onSerializationFinished(resolve) + }) value.resolve('done') - await Promise.resolve() - await Promise.resolve() + await serializationDone - expect(router.serverSsr!.hydrationScripts.reserveFastPath()).toBe(false) - const output = router.serverSsr!.hydrationScripts.claimOutput() + expect(router.serverSsr!.reserveStreamFastPath()).toBe(false) router.serverSsr!.setRenderFinished() - await waitFor(() => output.state === HydrationScriptOutputState.Ready) - const hydration = drainHydrationOutput(output) - expect(hydration).toContain('done') - expect(output.state).toBe(HydrationScriptOutputState.Done) - expect(router.serverSsr!.hydrationScripts.reserveFastPath(output)).toBe( - true, - ) - expect(router.serverSsr!.hydrationScripts.reserveFastPath(output)).toBe( - false, - ) + expect(router.serverSsr!.reserveStreamFastPath()).toBe(false) + expect(router.serverSsr!.takeBufferedHtml()).toContain(' { + test('throwing injected listener does not skip later listeners', () => { const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) - const router = buildRouter({ unsupported: () => {} }) - - try { - attachRouterServerSsrUtils({ router, manifest: undefined }) - await router.load() - await expect(router.serverSsr!.dehydrate()).rejects.toBeInstanceOf(Error) - - expect(errorSpy).toHaveBeenCalledWith( - 'Serialization error:', - expect.any(Error), - ) - } finally { - router.serverSsr?.cleanup() - errorSpy.mockRestore() - } - }) - - test('an invalid deferred value fails instead of leaving hydration pending', async () => { - const invalidValue = deferred() - const validValue = deferred() - const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) - const router = buildRouter({ - invalidValue: invalidValue.promise, - validValue: validValue.promise, - }) - - try { - attachRouterServerSsrUtils({ router, manifest: undefined }) - await router.load() - await router.serverSsr!.dehydrate() - router.serverSsr!.takeInitialHydrationScriptTags() - const output = router.serverSsr!.hydrationScripts.claimOutput() - router.serverSsr!.hydrationScripts.liftBarrier() - invalidValue.resolve(() => {}) - await waitFor(() => output.state === HydrationScriptOutputState.Failed) - - expect(output.error).toBeInstanceOf(Error) - expect(errorSpy).toHaveBeenCalledWith( - 'Serialization error:', - output.error, - ) - - validValue.resolve('ignored') - await Promise.resolve() - await Promise.resolve() - expect(output.state).toBe(HydrationScriptOutputState.Failed) - expect(router.serverSsr!.hydrationScripts.reserveFastPath(output)).toBe( - false, - ) - } finally { - router.serverSsr?.cleanup() - errorSpy.mockRestore() - } - }) - - test('a rejected hydration source stops serialization before stream creation', async () => { - const lateValue = deferred() - const router = buildRouter({ lateValue: lateValue.promise }) - const onCleanup = vi.fn() - - try { - attachRouterServerSsrUtils({ router, manifest: undefined }) - router.serverSsr!.onCleanup(onCleanup) - await router.load() - const scripts = router.serverSsr!.hydrationScripts as HydrationScripts - const backlogError = new Error('hydration backlog full') - const pushSerializedSource = vi - .spyOn(scripts, 'pushSerializedSource') - .mockImplementation(() => { - scripts.fail(backlogError) - return false - }) - - await router.serverSsr!.dehydrate() - - const output = scripts.claimOutput() - expect(output.state).toBe(HydrationScriptOutputState.Failed) - expect(output.error).toBe(backlogError) - expect(pushSerializedSource).toHaveBeenCalledOnce() - - lateValue.resolve('ignored') - await Promise.resolve() - await Promise.resolve() - expect(pushSerializedSource).toHaveBeenCalledOnce() - router.serverSsr!.cleanup() - expect(onCleanup).toHaveBeenCalledExactlyOnceWith(false) - } finally { - router.serverSsr?.cleanup() - } - }) - - test('a hydration backlog failure aborts pending loader work during cleanup', async () => { - const pending = deferred() - const onCleanup = vi.fn() - const cancelSource = vi.fn() - let loaderSignal: AbortSignal | undefined - let chunks = 0 - const source = new ReadableStream( - { - pull(controller) { - // Bound the producer even if backlog protection regresses. - if (chunks++ < 5_000) { - controller.enqueue(Uint8Array.of(1)) - } - }, - cancel: cancelSource, - }, - { highWaterMark: 0 }, - ) - const rootRoute = new BaseRootRoute({}) - const indexRoute = new BaseRoute({ - getParentRoute: () => rootRoute, - path: '/', - loader: ({ abortController }) => { - loaderSignal = abortController.signal - return { pending: pending.promise, stream: new RawStream(source) } - }, - }) - const router = createTestRouter({ - routeTree: rootRoute.addChildren([indexRoute]), - history: createMemoryHistory({ initialEntries: ['/'] }), - isServer: true, - }) - attachRouterServerSsrUtils({ router, manifest: undefined }) - const serverSsr = router.serverSsr! - serverSsr.onCleanup(onCleanup) - - try { - await router.load() - await serverSsr.dehydrate() - // The renderer has not returned its stream, so nothing drains the backlog. - const output = serverSsr.hydrationScripts.claimOutput() - await vi.waitFor(() => { - expect(output.state).toBe(HydrationScriptOutputState.Failed) - expect(cancelSource).toHaveBeenCalledOnce() - }) - expect(String(output.error)).toContain( - 'backlog exceeded maximum source-part count', - ) - expect(loaderSignal?.aborted).toBe(false) - - serverSsr.cleanup() - - expect(onCleanup).toHaveBeenCalledExactlyOnceWith(false) - expect(loaderSignal?.aborted).toBe(true) - expect(source.locked).toBe(false) - expect(router.serverSsr).toBeUndefined() - expect(router.ssr).toBeUndefined() - } finally { - serverSsr.cleanup() - pending.resolve('done') - if (!source.locked) { - await source.cancel() - } - } - }) - - test('the hydration channel permits only one subscriber', () => { const router = buildRouter() - attachRouterServerSsrUtils({ router, manifest: undefined }) - const output = router.serverSsr!.hydrationScripts.claimOutput() - const unsubscribe = output.subscribe(() => {}) + try { + attachRouterServerSsrUtils({ router, manifest: undefined }) - expect(() => output.subscribe(() => {})).toThrow('already has a subscriber') - unsubscribe() - expect(() => output.subscribe(() => {})).not.toThrow() - router.serverSsr!.cleanup() - }) + const calls: Array = [] + router.serverSsr!.onInjectedHtml(() => { + calls.push('a') + throw new Error('boom') + }) + router.serverSsr!.onInjectedHtml(() => { + calls.push('b') + }) - test('the claimed output receives scripts buffered before the claim', async () => { - const value = deferred() - const router = buildRouter({ value: value.promise }) - attachRouterServerSsrUtils({ router, manifest: undefined }) - await router.load() - await router.serverSsr!.dehydrate() - router.serverSsr!.takeInitialHydrationScriptTags() + router.serverSsr!.injectHtml('') - router.serverSsr!.hydrationScripts.liftBarrier() - value.resolve('buffered') - await Promise.resolve() - await Promise.resolve() - - const output = router.serverSsr!.hydrationScripts.claimOutput() - - expect(output.state).toBe(HydrationScriptOutputState.Ready) - const hydration = drainHydrationOutput(output) - expect(hydration).toContain('buffered') - expect(hydration).toContain('$_TSR.e()') - router.serverSsr!.cleanup() + expect(calls).toEqual(['a', 'b']) + } finally { + router.serverSsr?.cleanup() + errorSpy.mockRestore() + } }) test('server SSR attach lifecycle runs listeners at attach time', () => { @@ -811,9 +267,9 @@ describe('serverSsr.cleanup', () => { expect(calls).toEqual(['attach', 'cleanup']) }) - test('request handler cleans SSR state before returning a plain body', async () => { + test('request handler cleans plain response body after drain', async () => { const router = buildRouter() - let cleanupEffects = 0 + let cleanupCalls = 0 const handler = createRequestHandler({ createRouter: () => router, request: new Request('http://localhost/'), @@ -821,19 +277,21 @@ describe('serverSsr.cleanup', () => { const response = await handler(({ router: requestRouter }) => { const serverSsr = requestRouter.serverSsr! - serverSsr.onCleanup(() => { - cleanupEffects++ - }) + const cleanup = serverSsr.cleanup + serverSsr.cleanup = () => { + cleanupCalls++ + cleanup() + } return Promise.resolve(new Response('plain')) }) - expect(cleanupEffects).toBe(1) + expect(cleanupCalls).toBe(1) await response.text() - expect(cleanupEffects).toBe(1) + expect(cleanupCalls).toBe(1) expect(router.serverSsr).toBeUndefined() }) - test('request handler cleans SSR state before returning a plain stream', async () => { + test('request handler cleans plain response body on cancel', async () => { const router = buildRouter() let cleanupCalls = 0 const handler = createRequestHandler({ @@ -892,7 +350,7 @@ describe('serverSsr.cleanup', () => { const requestController = new AbortController() const renderStarted = deferred() const renderResult = deferred>() - let cleanupEffects = 0 + let cleanupCalls = 0 let cancelCalls = 0 let lateStreamResponse!: ReturnType const handler = createRequestHandler({ @@ -904,9 +362,11 @@ describe('serverSsr.cleanup', () => { const response = handler(({ router: requestRouter }) => { const serverSsr = requestRouter.serverSsr! - serverSsr.onCleanup(() => { - cleanupEffects++ - }) + const cleanup = serverSsr.cleanup + serverSsr.cleanup = () => { + cleanupCalls++ + cleanup() + } lateStreamResponse = createSsrStreamResponse( requestRouter, new Response( @@ -927,13 +387,13 @@ describe('serverSsr.cleanup', () => { requestController.abort(cancellation) await expect(response).rejects.toBe(cancellation) - expect(cleanupEffects).toBe(1) + expect(cleanupCalls).toBe(1) expect(router.serverSsr).toBeUndefined() renderResult.resolve(lateStreamResponse) await Promise.resolve() await Promise.resolve() - expect(cleanupEffects).toBe(1) + expect(cleanupCalls).toBe(1) expect(cancelCalls).toBe(1) expect(router.serverSsr).toBeUndefined() }) @@ -968,6 +428,58 @@ describe('serverSsr.cleanup', () => { }) }) + test.each(['throw', 'reject'] as const)( + 'reports a %s from disposal of a late render response', + async (failureMode) => { + const router = buildRouter() + const requestController = new AbortController() + const renderStarted = deferred() + const renderResult = deferred() + const cleanupError = new Error('late stream cleanup failed') + const dispose = vi.fn(() => { + if (failureMode === 'throw') { + throw cleanupError + } + return Promise.reject(cleanupError) + }) + const consoleError = vi + .spyOn(console, 'error') + .mockImplementation(() => undefined) + const handler = createRequestHandler({ + createRouter: () => router, + request: new Request('http://localhost/', { + signal: requestController.signal, + }), + }) + onTestFinished(() => { + consoleError.mockRestore() + }) + onTestFinished(() => { + router.serverSsr?.cleanup() + }) + + const response = handler(() => { + renderStarted.resolve() + return renderResult.promise + }) + + await renderStarted.promise + const cancellation = new Error('request disconnected') + requestController.abort(cancellation) + await expect(response).rejects.toBe(cancellation) + + renderResult.resolve({ + response: new Response('stream'), + serverSsrCleanup: 'stream', + dispose, + }) + await vi.waitFor(() => { + expect(consoleError).toHaveBeenCalledWith(cleanupError) + }) + expect(dispose).toHaveBeenCalledOnce() + }, + ) + test('request abort disposes a stream after response handoff', async () => { const router = buildRouter() const requestController = new AbortController() @@ -1010,11 +522,53 @@ describe('serverSsr.cleanup', () => { expect(router.serverSsr).toBeUndefined() }) + test.each(['throw', 'reject'] as const)( + 'reports a custom stream disposal %s after request abort', + async (failureMode) => { + const router = buildRouter() + attachRouterServerSsrUtils({ router, manifest: undefined }) + let cleanupCalls = 0 + const cleanup = router.serverSsr!.cleanup + router.serverSsr!.cleanup = () => { + cleanupCalls++ + cleanup() + } + const cleanupError = new Error('custom stream cleanup failed') + const dispose = vi.fn(() => { + if (failureMode === 'throw') { + throw cleanupError + } + return Promise.reject(cleanupError) + }) + const consoleError = vi + .spyOn(console, 'error') + .mockImplementation(() => undefined) + const requestController = new AbortController() + + bindSsrResponseToRequest( + router, + { + response: new Response('stream'), + serverSsrCleanup: 'stream', + dispose, + }, + requestController.signal, + ) + requestController.abort(new Error('request disconnected')) + + await vi.waitFor(() => { + expect(consoleError).toHaveBeenCalledWith(cleanupError) + }) + expect(dispose).toHaveBeenCalledOnce() + expect(cleanupCalls).toBe(1) + expect(router.serverSsr).toBeUndefined() + }, + ) + test('request handler defers cleanup for stream response metadata', async () => { const router = buildRouter() let cleanupCalls = 0 let controller!: ReadableStreamDefaultController - let initialScriptHtml = '' const handler = createRequestHandler({ createRouter: () => router, request: new Request('http://localhost/'), @@ -1027,18 +581,12 @@ describe('serverSsr.cleanup', () => { cleanupCalls++ cleanup() } - const initialScripts = serverSsr.takeInitialHydrationScriptTags() - expect(initialScripts?.boundary.children).toBe( - HYDRATION_SCRIPT_BOUNDARY_SOURCE, - ) - expect(initialScripts?.boundary.attrs).not.toHaveProperty('id') - initialScriptHtml = renderInitialScripts(initialScripts!) const appStream = new ReadableStream({ start(c) { controller = c }, }) - const responseStream = transformReadableStreamWithRouter( + const responseStream = transformStreamWithRouter( requestRouter, appStream as any, ) @@ -1050,334 +598,10 @@ describe('serverSsr.cleanup', () => { }) expect(cleanupCalls).toBe(0) - controller.enqueue( - new TextEncoder().encode( - `${initialScriptHtml}ok`, - ), - ) + controller.enqueue(new TextEncoder().encode('ok')) controller.close() await response.text() expect(cleanupCalls).toBe(1) expect(router.serverSsr).toBeUndefined() }) - - test('external cleanup releases a discarded stream transform immediately', async () => { - // Mirrors a request handler that discards a stream response (for example a - // middleware throwing after the handler returned): the bare cleanup() in - // its finally block must tear the transform down at once instead of - // leaving the renderer pinned until the lifetime timer. - const router = buildRouter() - attachRouterServerSsrUtils({ router, manifest: undefined }) - const serverSsr = router.serverSsr! - serverSsr.takeInitialHydrationScriptTags() - - const upstreamCancelled = { value: false, reason: undefined as unknown } - const appStream = new ReadableStream({ - start(c) { - c.enqueue(new TextEncoder().encode('')) - }, - cancel(reason) { - upstreamCancelled.value = true - upstreamCancelled.reason = reason - }, - }) - const aborts: Array = [] - const responseStream = transformReadableStreamWithRouter( - router, - appStream as any, - { - onAbort: (reason) => aborts.push(reason), - }, - ) - - // The response is never read and never cancelled. - serverSsr.cleanup() - - expect(upstreamCancelled.value).toBe(true) - expect((upstreamCancelled.reason as Error).name).toBe('AbortError') - expect(aborts).toHaveLength(1) - expect(router.serverSsr).toBeUndefined() - await expect(responseStream.getReader().read()).rejects.toMatchObject({ - name: 'AbortError', - }) - }) - - test('concurrent dehydrate calls throw instead of double-serializing', async () => { - const router = buildRouter() - attachRouterServerSsrUtils({ router, manifest: undefined }) - const serverSsr = router.serverSsr! - - const first = serverSsr.dehydrate() - await expect(serverSsr.dehydrate()).rejects.toThrow( - 'router is already dehydrated', - ) - await first - await expect(serverSsr.dehydrate()).rejects.toThrow( - 'router is already dehydrated', - ) - serverSsr.cleanup() - }) - - test('onCleanup after cleanup invokes the listener immediately', () => { - const router = buildRouter() - attachRouterServerSsrUtils({ router, manifest: undefined }) - const serverSsr = router.serverSsr! - serverSsr.cleanup() - - const listener = vi.fn() - serverSsr.onCleanup(listener) - expect(listener).toHaveBeenCalledTimes(1) - }) - - test('a late onCleanup listener that throws is contained', () => { - const router = buildRouter() - attachRouterServerSsrUtils({ router, manifest: undefined }) - const serverSsr = router.serverSsr! - serverSsr.cleanup() - - const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) - try { - expect(() => - serverSsr.onCleanup(() => { - throw new Error('late-listener-boom') - }), - ).not.toThrow() - expect(errorSpy).toHaveBeenCalledWith( - 'Error in SSR cleanup listener:', - expect.objectContaining({ message: 'late-listener-boom' }), - ) - } finally { - errorSpy.mockRestore() - } - }) - - test('binding a stream response after cleanup still observes request abort', async () => { - const router = buildRouter() - attachRouterServerSsrUtils({ router, manifest: undefined }) - const cancel = vi.fn() - const streamResponse = createSsrStreamResponse( - router, - new Response(new ReadableStream({ cancel })), - ) - const dispose = vi.spyOn(streamResponse, 'dispose') - router.serverSsr!.cleanup() - - const controller = new AbortController() - const addSpy = vi.spyOn(controller.signal, 'addEventListener') - const result = bindSsrResponseToRequest( - router, - streamResponse, - controller.signal, - ) - - expect(result.serverSsrCleanup).toBe('stream') - expect(addSpy).toHaveBeenCalledOnce() - - const reason = new Error('request disconnected') - controller.abort(reason) - await Promise.resolve() - - expect(dispose).toHaveBeenCalledExactlyOnceWith(reason) - expect(cancel).toHaveBeenCalledExactlyOnceWith(reason) - }) - - test.each(['pass-through', 'merge'])( - 'shares the %s transform abort listener with final response disposal', - async (mode) => { - const router = buildRouter() - attachRouterServerSsrUtils({ router, manifest: undefined }) - const serverSsr = router.serverSsr! - if (mode === 'pass-through') { - serverSsr.disableHydration() - } - const cleanup = vi.fn() - serverSsr.onCleanup(cleanup) - const requestAbort = new AbortController() - const add = vi.spyOn(requestAbort.signal, 'addEventListener') - const remove = vi.spyOn(requestAbort.signal, 'removeEventListener') - const cancelSource = vi.fn(() => new Promise(() => {})) - const source = new ReadableStream({ cancel: cancelSource }) - const transformed = transformReadableStreamWithRouter(router, source, { - signal: requestAbort.signal, - }) - const original = createSsrStreamResponse( - router, - new Response(transformed), - ) - const cancelFinal = vi.fn(() => new Promise(() => {})) - const response = new Response(new ReadableStream({ cancel: cancelFinal })) - const dispose = vi.fn((reason?: unknown): undefined => { - original.dispose(reason) - void response.body!.cancel(reason).catch(() => {}) - }) - bindSsrResponseToRequest( - router, - { ...original, response, dispose }, - requestAbort.signal, - ) - - expect(add).toHaveBeenCalledOnce() - const reason = new Error('request disconnected') - const reader = transformed.getReader() - const rejected = expect(reader.read()).rejects.toBe(reason) - requestAbort.abort(reason) - await rejected - - expect(dispose).toHaveBeenCalledExactlyOnceWith(reason) - expect(cancelFinal).toHaveBeenCalledExactlyOnceWith(reason) - expect(cancelSource).toHaveBeenCalledExactlyOnceWith(reason) - expect(source.locked).toBe(false) - expect(cleanup).toHaveBeenCalledOnce() - expect(remove).toHaveBeenCalledOnce() - expect(router.serverSsr).toBeUndefined() - reader.releaseLock() - }, - ) - - test('successful transform completion removes abort handling without disposing the response', async () => { - const router = buildRouter() - attachRouterServerSsrUtils({ router, manifest: undefined }) - router.serverSsr!.disableHydration() - const requestAbort = new AbortController() - const add = vi.spyOn(requestAbort.signal, 'addEventListener') - const remove = vi.spyOn(requestAbort.signal, 'removeEventListener') - const cancel = vi.fn() - const source = new ReadableStream({ - start(controller) { - controller.enqueue(new TextEncoder().encode('done')) - controller.close() - }, - cancel, - }) - const transformed = transformReadableStreamWithRouter(router, source, { - signal: requestAbort.signal, - }) - const result = createSsrStreamResponse(router, new Response(transformed)) - const dispose = vi.spyOn(result, 'dispose') - bindSsrResponseToRequest(router, result, requestAbort.signal) - - expect(await result.response.text()).toBe('done') - requestAbort.abort(new Error('request ended after completion')) - expect(add).toHaveBeenCalledOnce() - expect(remove).toHaveBeenCalledOnce() - expect(dispose).not.toHaveBeenCalled() - expect(cancel).not.toHaveBeenCalled() - expect(source.locked).toBe(false) - expect(router.serverSsr).toBeUndefined() - }) - - test.each(['custom response', 'no signal', 'different signal'])( - 'keeps request binding for a %s', - async (mode) => { - const router = buildRouter() - attachRouterServerSsrUtils({ router, manifest: undefined }) - router.serverSsr!.disableHydration() - const requestAbort = new AbortController() - const add = vi.spyOn(requestAbort.signal, 'addEventListener') - const cancel = vi.fn() - const source = new ReadableStream({ cancel }) - const body = - mode === 'custom response' - ? source - : transformReadableStreamWithRouter(router, source, { - signal: - mode === 'different signal' - ? new AbortController().signal - : undefined, - }) - const result = createSsrStreamResponse(router, new Response(body)) - const dispose = vi.spyOn(result, 'dispose') - bindSsrResponseToRequest(router, result, requestAbort.signal) - const reason = new Error('request disconnected') - requestAbort.abort(reason) - await Promise.resolve() - - expect(add).toHaveBeenCalledOnce() - expect(dispose).toHaveBeenCalledExactlyOnceWith(reason) - expect(cancel).toHaveBeenCalledOnce() - expect(source.locked).toBe(false) - expect(router.serverSsr).toBeUndefined() - }, - ) - - test('already-aborted response handoff disposes immediately without adding a listener', async () => { - const router = buildRouter() - attachRouterServerSsrUtils({ router, manifest: undefined }) - const cancel = vi.fn() - const result = createSsrStreamResponse( - router, - new Response(new ReadableStream({ cancel })), - ) - const dispose = vi.spyOn(result, 'dispose') - const requestAbort = new AbortController() - const reason = new Error('request already disconnected') - requestAbort.abort(reason) - const add = vi.spyOn(requestAbort.signal, 'addEventListener') - bindSsrResponseToRequest(router, result, requestAbort.signal) - await Promise.resolve() - - expect(add).not.toHaveBeenCalled() - expect(dispose).toHaveBeenCalledExactlyOnceWith(reason) - expect(cancel).toHaveBeenCalledExactlyOnceWith(reason) - expect(router.serverSsr).toBeUndefined() - }) - - test('disabled hydration streams through pass-through without a boundary', async () => { - const router = buildRouter() - attachRouterServerSsrUtils({ router, manifest: undefined }) - const serverSsr = router.serverSsr! - serverSsr.disableHydration() - - // No boundary anywhere in the document. - const html = '
static page
' - const appStream = new ReadableStream({ - start(c) { - c.enqueue(new TextEncoder().encode(html)) - c.close() - }, - }) - - const responseStream = transformReadableStreamWithRouter( - router, - appStream as any, - ) - const text = await new Response(responseStream as any).text() - - expect(text).toBe(html) - expect(text).not.toContain('$tsr-stream-boundary') - expect(text).not.toContain('data-tsr-stream-part') - expect(router.serverSsr).toBeUndefined() - }) - - test('disabled hydration renders strings through the eager fast path', async () => { - const router = buildRouter() - attachRouterServerSsrUtils({ router, manifest: undefined }) - router.serverSsr!.disableHydration() - - const html = 'no hydration' - const text = await transformHtmlStringWithRouter(router, html) - - expect(text).toBe('' + html) - expect(router.serverSsr).toBeUndefined() - }) - - test('disableHydration and dehydrate are mutually exclusive', async () => { - const disabledFirst = buildRouter() - attachRouterServerSsrUtils({ router: disabledFirst, manifest: undefined }) - disabledFirst.serverSsr!.disableHydration() - // Idempotent second call. - expect(() => disabledFirst.serverSsr!.disableHydration()).not.toThrow() - await expect(disabledFirst.serverSsr!.dehydrate()).rejects.toThrow( - 'hydration is disabled for this request', - ) - disabledFirst.serverSsr!.cleanup() - - const dehydratedFirst = buildRouter() - attachRouterServerSsrUtils({ router: dehydratedFirst, manifest: undefined }) - await dehydratedFirst.serverSsr!.dehydrate() - expect(() => dehydratedFirst.serverSsr!.disableHydration()).toThrow( - 'cannot disable hydration after dehydrate()', - ) - dehydratedFirst.serverSsr!.cleanup() - }) }) diff --git a/packages/router-core/tests/ssr-server-manifest.test.ts b/packages/router-core/tests/ssr-server-manifest.test.ts index 95b7588e87..6cdc98a87b 100644 --- a/packages/router-core/tests/ssr-server-manifest.test.ts +++ b/packages/router-core/tests/ssr-server-manifest.test.ts @@ -1,18 +1,15 @@ -import { runInNewContext } from 'node:vm' -import { describe, expect, test } from 'vitest' import { createMemoryHistory } from '@tanstack/history' +import { runInNewContext } from 'node:vm' import { BaseRootRoute, BaseRoute } from '../src' -import { GLOBAL_TSR } from '../src/ssr/constants' - import { attachRouterServerSsrUtils } from '../src/ssr/ssr-server' +import { GLOBAL_TSR } from '../src/ssr/constants' import { createTestRouter } from './routerTestUtils' -import type { AnyRouter } from '../src' +import { describe, expect, test } from 'vitest' import type { ManifestCssLink, ManifestRouteAssets, ServerManifest, } from '../src/manifest' -import type { InitialHydrationScriptTags } from '../src/ssr/hydrationScripts' import type { DehydratedRouter } from '../src/ssr/types' function buildRouter() { @@ -82,16 +79,14 @@ async function dehydrateManifest() { await router.load() await router.serverSsr!.dehydrate() - const scripts = router.serverSsr!.takeInitialHydrationScriptTags() - expect(scripts?.boundary.children).toContain('$tsr-stream-boundary') - expect(scripts?.boundary.attrs).not.toHaveProperty('id') + const script = router.serverSsr!.takeBufferedScripts() + expect(script?.tag).toBe('script') + expect(script?.children).toBeTruthy() - return parseSerializedRouter(scripts!).manifest! + return parseSerializedRouter(script!.children!).manifest! } -function parseSerializedRouter( - scripts: InitialHydrationScriptTags, -): DehydratedRouter { +function parseSerializedRouter(serialized: string): DehydratedRouter { const context: Record = { document: { currentScript: { @@ -101,17 +96,7 @@ function parseSerializedRouter( } context.self = context - expect(scripts.boundary.children).toContain('$tsr-stream-boundary') - expect(scripts.boundary.attrs).not.toHaveProperty('id') - - const streamParts = scripts.before - expect(streamParts.length).toBeGreaterThan(0) - for (const script of streamParts) { - expect(script.tag).toBe('script') - expect(script.attrs?.['data-tsr-stream-part']).toBe('') - expect(script.children).toBeTruthy() - runInNewContext(script.children!, context) - } + runInNewContext(serialized, context) const router = context[GLOBAL_TSR]?.router expect(router).toBeDefined() @@ -119,40 +104,6 @@ function parseSerializedRouter( } describe('attachRouterServerSsrUtils manifest dehydration', () => { - test.each([ - { label: 'false', value: false, expectedProperty: true }, - { label: 'zero', value: 0, expectedProperty: true }, - { label: 'an empty string', value: '', expectedProperty: true }, - { label: 'null', value: null, expectedProperty: true }, - { label: 'undefined', value: undefined, expectedProperty: false }, - ])( - 'preserves $label custom dehydration values', - async ({ value, expectedProperty }) => { - const router: AnyRouter = buildRouter() - router.options.dehydrate = () => value - attachRouterServerSsrUtils({ router, manifest: undefined }) - - try { - await router.load() - await router.serverSsr!.dehydrate() - const scripts = router.serverSsr!.takeInitialHydrationScriptTags() - const dehydratedRouter = parseSerializedRouter(scripts!) - - expect( - Object.prototype.hasOwnProperty.call( - dehydratedRouter, - 'dehydratedData', - ), - ).toBe(expectedProperty) - if (expectedProperty) { - expect(dehydratedRouter.dehydratedData).toBe(value) - } - } finally { - router.serverSsr?.cleanup() - } - }, - ) - test('omits unmatched route assets by default', async () => { const manifest = await dehydrateManifest() @@ -175,8 +126,11 @@ describe('attachRouterServerSsrUtils manifest dehydration', () => { await router.load() await router.serverSsr!.dehydrate() - const scripts = router.serverSsr!.takeInitialHydrationScriptTags() - const dehydratedManifest = parseSerializedRouter(scripts!).manifest! + const script = router.serverSsr!.takeBufferedScripts() + expect(script?.children).toBeTruthy() + const dehydratedManifest = parseSerializedRouter( + script!.children!, + ).manifest! expect(dehydratedManifest.scriptFormat).toBe('iife') }) @@ -279,8 +233,11 @@ describe('attachRouterServerSsrUtils manifest dehydration', () => { }, }) - const scripts = router.serverSsr!.takeInitialHydrationScriptTags() - const dehydratedManifest = parseSerializedRouter(scripts!).manifest! + const script = router.serverSsr!.takeBufferedScripts() + expect(script?.children).toBeTruthy() + const dehydratedManifest = parseSerializedRouter( + script!.children!, + ).manifest! expect(dehydratedManifest.routes.__root__).toMatchObject({ preloads: [ @@ -323,8 +280,11 @@ describe('attachRouterServerSsrUtils manifest dehydration', () => { }, }) - const scripts = router.serverSsr!.takeInitialHydrationScriptTags() - const dehydratedManifest = parseSerializedRouter(scripts!).manifest! + const script = router.serverSsr!.takeBufferedScripts() + expect(script?.children).toBeTruthy() + const dehydratedManifest = parseSerializedRouter( + script!.children!, + ).manifest! expect(dehydratedManifest.routes.__root__?.preloads).toEqual([ { href: '/assets/rsc-client.js', crossOrigin: 'anonymous' }, @@ -350,8 +310,9 @@ describe('attachRouterServerSsrUtils manifest dehydration', () => { await router.serverSsr!.dehydrate() - const scripts = router.serverSsr!.takeInitialHydrationScriptTags() - const dehydratedRouter = parseSerializedRouter(scripts!) + const script = router.serverSsr!.takeBufferedScripts() + expect(script?.children).toBeTruthy() + const dehydratedRouter = parseSerializedRouter(script!.children!) const dehydratedManifest = dehydratedRouter.manifest! const rootInlineCss = dehydratedManifest.inlineStyle const allLinks = Object.values(dehydratedManifest.routes).flatMap( @@ -376,73 +337,6 @@ describe('attachRouterServerSsrUtils manifest dehydration', () => { ]) }) - test('memoizes prepared inline CSS while composing request assets freshly', async () => { - const router = buildRouter() - const manifest = buildInlineManifest() - const requestAssets: ManifestRouteAssets = { - preloads: ['/assets/request.js'], - } - - attachRouterServerSsrUtils({ - router, - manifest, - getRequestAssets: () => requestAssets, - }) - - await router.load() - - const first = router.ssr!.manifest - const second = router.ssr!.manifest - // The composed manifest is fresh because request assets are mutable, while - // the immutable inline CSS preparation is reused for this route set. - expect(second).not.toBe(first) - expect(second?.inlineStyle).toBe(first?.inlineStyle) - expect(first?.inlineStyle).toMatchObject({ - children: '.shared{color:red}', - }) - expect(first?.routes.__root__?.preloads).toEqual([ - '/assets/request.js', - '/assets/root.js', - ]) - }) - - test('refreshes the composed manifest when a stable request-assets object changes', async () => { - const router = buildRouter() - const manifest = buildManifest() - const requestAssets: ManifestRouteAssets = { - preloads: ['/assets/discovered-early.js'], - } - - attachRouterServerSsrUtils({ - router, - manifest, - getRequestAssets: () => requestAssets, - }) - - try { - await router.load() - - const beforeDiscovery = router.ssr!.manifest - expect(beforeDiscovery?.routes.__root__?.preloads).toEqual([ - '/assets/discovered-early.js', - '/assets/root.js', - ]) - - // React Start RSC retains this object and replaces these members as it - // discovers client references during the request. - requestAssets.preloads = ['/assets/discovered-late.js'] - - const afterDiscovery = router.ssr!.manifest - expect(afterDiscovery).not.toBe(beforeDiscovery) - expect(afterDiscovery?.routes.__root__?.preloads).toEqual([ - '/assets/discovered-late.js', - '/assets/root.js', - ]) - } finally { - router.serverSsr?.cleanup() - } - }) - test('strips only inlinable stylesheet links from dehydrated manifest data', async () => { const router = buildRouter() const manifest: ServerManifest = { @@ -488,8 +382,11 @@ describe('attachRouterServerSsrUtils manifest dehydration', () => { await router.serverSsr!.dehydrate() - const scripts = router.serverSsr!.takeInitialHydrationScriptTags() - const dehydratedManifest = parseSerializedRouter(scripts!).manifest! + const script = router.serverSsr!.takeBufferedScripts() + expect(script?.children).toBeTruthy() + const dehydratedManifest = parseSerializedRouter( + script!.children!, + ).manifest! expect(dehydratedManifest.routes.__root__?.css).toEqual([ { @@ -548,9 +445,11 @@ describe('attachRouterServerSsrUtils manifest dehydration', () => { expect(router.ssr!.manifest?.inlineStyle?.children).toBe('.root{}.parent{}') await router.serverSsr!.dehydrate() - const scripts = router.serverSsr!.takeInitialHydrationScriptTags() - expect(scripts).toBeDefined() - const dehydratedManifest = parseSerializedRouter(scripts!).manifest! + const script = router.serverSsr!.takeBufferedScripts() + expect(script?.children).toBeTruthy() + const dehydratedManifest = parseSerializedRouter( + script!.children!, + ).manifest! expect(dehydratedManifest.routes[childRoute.id]).toBeUndefined() }) diff --git a/packages/router-core/tests/transformStreamBackpressure.perf.test.ts b/packages/router-core/tests/transformStreamBackpressure.perf.test.ts index 12531988c0..267241f416 100644 --- a/packages/router-core/tests/transformStreamBackpressure.perf.test.ts +++ b/packages/router-core/tests/transformStreamBackpressure.perf.test.ts @@ -1,24 +1,19 @@ -// On-demand backpressure test for transformReadableStreamWithRouter. +// On-demand backpressure test for transformStreamWithRouter. // // NOT run in CI by default. To execute: // RUN_BACKPRESSURE_PERF=1 pnpm --filter @tanstack/router-core test:unit -- transformStreamBackpressure // // Validates fix for TanStack/router#7402 // without a backpressure gate the read loop in -// transformReadableStreamWithRouter calls controller.enqueue unconditionally, +// transformStreamWithRouter calls controller.enqueue unconditionally, // allowing controller.[[queue]] to accumulate Uint8Array chunks (external // memory) when the consumer drains slower than the producer. +import { ReadableStream } from 'node:stream/web' import { describe, expect, it } from 'vitest' -import { - HYDRATION_SCRIPT_BOUNDARY_BYTES, - HydrationScriptOutputState, -} from '../src/ssr/hydrationScripts' -import { transformReadableStreamWithRouter } from '../src/ssr/transformStreamWithRouter' -import type { HydrationScriptOutput } from '../src/ssr/hydrationScripts' +import { transformStreamWithRouter } from '../src/ssr/transformStreamWithRouter' const enabled = process.env.RUN_BACKPRESSURE_PERF === '1' const requiresGc = typeof (globalThis as any).gc === 'function' -const SCRIPT_BARRIER_HTML = `'.length)}` function createFastProducer( chunkCount: number, @@ -54,211 +49,242 @@ function createFastProducer( } function makeRouter() { - const output: HydrationScriptOutput = { - state: HydrationScriptOutputState.Done, - error: undefined, - pullChunk() { - throw new Error('Finished hydration output cannot be pulled') - }, - subscribe() { - return () => {} - }, - } return { serverSsr: { - hydrationScripts: { - reserveFastPath: () => true, - claimOutput: () => output, - liftBarrier: () => {}, - isInitialTaken: () => true, - startSerializationTimeout: () => {}, - }, + isSerializationFinished: () => true, + reserveStreamFastPath: () => true, + onInjectedHtml: () => () => {}, + onSerializationFinished: () => () => {}, + takeBufferedHtml: () => undefined, setRenderFinished: () => {}, - onCleanup: () => {}, cleanup: () => {}, }, } as any } // Main-path router fake: serialization NOT finished synchronously, so the -// transform runs the full scanner + script merger path. Exposes hooks to -// emit router script batches and signal serialization finished. +// transform runs the full scanner + pending HTML/scripts path. Exposes +// hooks to inject HTML and signal serialization finished. function makeMainPathRouter(): { router: any + injectHtml: (html: string) => void finishSerialization: () => void } { - let state: HydrationScriptOutput['state'] = HydrationScriptOutputState.Waiting - let listener: (() => void) | undefined - const output: HydrationScriptOutput = { - get state() { - return state - }, - error: undefined, - pullChunk() { - throw new Error('No hydration output is ready') - }, - subscribe(onChange) { - listener = onChange - return () => { - if (listener === onChange) { - listener = undefined - } - } - }, - } + let buffered = '' + const injectedListeners: Array<() => void> = [] + const serializationListeners: Array<() => void> = [] const router: any = { serverSsr: { - hydrationScripts: { - reserveFastPath: () => false, - claimOutput: () => output, - liftBarrier: () => {}, - isInitialTaken: () => true, - startSerializationTimeout: () => {}, + isSerializationFinished: () => false, + reserveStreamFastPath: () => false, + onInjectedHtml: (cb: () => void) => { + injectedListeners.push(cb) + return () => { + const i = injectedListeners.indexOf(cb) + if (i >= 0) injectedListeners.splice(i, 1) + } + }, + onSerializationFinished: (cb: () => void) => { + serializationListeners.push(cb) + return () => { + const i = serializationListeners.indexOf(cb) + if (i >= 0) serializationListeners.splice(i, 1) + } + }, + takeBufferedHtml: () => { + const v = buffered + buffered = '' + return v || undefined }, setRenderFinished: () => {}, - onCleanup: () => {}, cleanup: () => {}, + liftScriptBarrier: () => {}, }, } return { router, + injectHtml: (html) => { + buffered += html + for (const l of injectedListeners) l() + }, finishSerialization: () => { - state = HydrationScriptOutputState.Done - listener?.() + for (const l of serializationListeners) l() }, } } -describe.runIf(enabled)( - 'transformReadableStreamWithRouter backpressure', - () => { - it('does not run producer arbitrarily ahead of slow consumer', async () => { - const CHUNKS = 200 - const CHUNK_BYTES = 8 * 1024 // 8KB per chunk - const producer = createFastProducer(CHUNKS, CHUNK_BYTES) - const router = makeRouter() +describe.runIf(enabled)('transformStreamWithRouter backpressure', () => { + it('does not run producer arbitrarily ahead of slow consumer', async () => { + const CHUNKS = 200 + const CHUNK_BYTES = 8 * 1024 // 8KB per chunk + const producer = createFastProducer(CHUNKS, CHUNK_BYTES) + const router = makeRouter() - const out = transformReadableStreamWithRouter(router, producer.stream) + const out = transformStreamWithRouter(router, producer.stream) - const reader = out.getReader() - let consumed = 0 - let maxLead = 0 - for (;;) { - // Throttled consumer: ~5ms per chunk. - await new Promise((r) => setTimeout(r, 5)) - const { done } = await reader.read() - if (done) { - break - } - consumed++ - const lead = producer.getProduced() - consumed - if (lead > maxLead) { - maxLead = lead - } + const reader = out.getReader() + let consumed = 0 + let maxLead = 0 + while (true) { + // Throttled consumer: ~5ms per chunk. + await new Promise((r) => setTimeout(r, 5)) + const { done } = await reader.read() + if (done) break + consumed++ + const lead = producer.getProduced() - consumed + if (lead > maxLead) maxLead = lead + } + + // Producer should never be more than a small constant number of chunks + // ahead of the consumer. ReadableStream default HWM is 1 for byte + // streams; allow generous slack for scheduling jitter. + expect(maxLead).toBeLessThanOrEqual(8) + expect(consumed).toBe(CHUNKS) + }) + + it('bounded external memory under sustained load', async () => { + expect(requiresGc, 'Run with node --expose-gc').toBe(true) + const CHUNKS = 1000 + const CHUNK_BYTES = 16 * 1024 + const producer = createFastProducer(CHUNKS, CHUNK_BYTES, { + freshChunks: true, + }) + const router = makeRouter() + + const out = transformStreamWithRouter(router, producer.stream) + const reader = out.getReader() + + let consumed = 0 + let peakExternal = 0 + const baseline = process.memoryUsage().external + while (true) { + await new Promise((r) => setTimeout(r, 2)) + const { done } = await reader.read() + if (done) break + consumed++ + if (consumed % 50 === 0) { + ;(globalThis as any).gc() + const ext = process.memoryUsage().external - baseline + if (ext > peakExternal) peakExternal = ext } + } - // Producer should never be more than a small constant number of chunks - // ahead of the consumer. ReadableStream default HWM is 1 for byte - // streams; allow generous slack for scheduling jitter. - expect(maxLead).toBeLessThanOrEqual(8) - expect(consumed).toBe(CHUNKS) + // Without backpressure, peak external memory scales w/ CHUNKS*CHUNK_BYTES + // (~16MB). With backpressure, only a few chunks worth. + expect(peakExternal).toBeLessThan(2 * 1024 * 1024) // 2MB ceiling + expect(consumed).toBe(CHUNKS) + }) + + it('main path: scanner+inject path also honors backpressure', async () => { + // Same shape as fast-path test but with a router that forces the + // scanner+inject code path. Producer emits valid HTML fragments + // (ending at closing tags) so the scanner can release them. + const CHUNKS = 200 + const CHUNK_BYTES = 8 * 1024 + const filler = 'a'.repeat(CHUNK_BYTES - '

'.length) + const chunkStr = `

${filler}

` + const encoded = new TextEncoder().encode(chunkStr) + + let produced = 0 + const stream = new ReadableStream({ + pull(controller) { + if (produced >= CHUNKS) { + controller.close() + return + } + produced++ + controller.enqueue(encoded) + }, }) - it('bounded external memory under sustained load', async () => { - expect(requiresGc, 'Run with node --expose-gc').toBe(true) - const CHUNKS = 1000 - const CHUNK_BYTES = 16 * 1024 - const producer = createFastProducer(CHUNKS, CHUNK_BYTES, { - freshChunks: true, - }) - const router = makeRouter() + const { router, finishSerialization } = makeMainPathRouter() + const out = transformStreamWithRouter(router, stream) + // Mark serialization finished immediately so tryFinish() proceeds once + // upstream closes. + finishSerialization() - const out = transformReadableStreamWithRouter(router, producer.stream) - const reader = out.getReader() + const reader = out.getReader() + let consumed = 0 + let bytes = 0 + let maxLead = 0 + while (true) { + await new Promise((r) => setTimeout(r, 5)) + const { done, value } = await reader.read() + if (done) break + consumed++ + bytes += value.byteLength + const lead = produced - consumed + if (lead > maxLead) maxLead = lead + } - ;(globalThis as any).gc() - ;(globalThis as any).gc() - let consumed = 0 - let peakExternal = 0 - const baseline = process.memoryUsage().external - for (;;) { - await new Promise((r) => setTimeout(r, 2)) - const { done } = await reader.read() - if (done) { - break + expect(maxLead).toBeLessThanOrEqual(8) + expect(consumed).toBe(CHUNKS) + expect(bytes).toBe(CHUNKS * encoded.byteLength) + }) + + it('main path: injected scripts under slow consumer do not balloon memory', async () => { + expect(requiresGc, 'Run with node --expose-gc').toBe(true) + + // Producer emits a steady stream of app HTML. While that streams, the + // router injects many large '.length) + const scriptStr = `` + + const { router, injectHtml, finishSerialization } = makeMainPathRouter() + + let produced = 0 + const stream = new ReadableStream({ + pull(controller) { + if (produced >= APP_CHUNKS) { + controller.close() + return } - consumed++ - if (consumed % 50 === 0) { - ;(globalThis as any).gc() - const ext = process.memoryUsage().external - baseline - if (ext > peakExternal) { - peakExternal = ext - } - } - } - - // Without backpressure, peak external memory scales w/ CHUNKS*CHUNK_BYTES - // (~16MB). With backpressure, only a few chunks worth. - expect(peakExternal).toBeLessThan(2 * 1024 * 1024) // 2MB ceiling - expect(consumed).toBe(CHUNKS) + produced++ + // Inject some scripts as part of producing this chunk to simulate + // a render that emits HTML AND injects head scripts concurrently. + for (let i = 0; i < INJECT_PER_APP_CHUNK; i++) injectHtml(scriptStr) + controller.enqueue(appBytes) + }, }) - it('main path: scanner+inject path also honors backpressure', async () => { - // Same shape as fast-path test but with a router that forces the - // scanner+inject code path. Producer emits valid HTML fragments - // (ending at closing tags) so the scanner can release them. - const CHUNKS = 200 - const CHUNK_BYTES = 8 * 1024 - const filler = 'a'.repeat(CHUNK_BYTES - '

'.length) - const chunkStr = `

${filler}

` - const encoded = new TextEncoder().encode(chunkStr) - const firstFiller = 'a'.repeat( - CHUNK_BYTES - '

'.length - SCRIPT_BARRIER_HTML.length, - ) - const firstEncoded = new TextEncoder().encode( - `

${firstFiller}${SCRIPT_BARRIER_HTML}

`, - ) + const out = transformStreamWithRouter(router, stream) + finishSerialization() + const reader = out.getReader() - let produced = 0 - const stream = new ReadableStream({ - pull(controller) { - if (produced >= CHUNKS) { - controller.close() - return - } - produced++ - controller.enqueue(produced === 1 ? firstEncoded : encoded) - }, - }) - - const { router, finishSerialization } = makeMainPathRouter() - const out = transformReadableStreamWithRouter(router, stream) - // Mark serialization finished immediately so tryFinish() proceeds once - // upstream closes. - finishSerialization() - - const reader = out.getReader() - let consumed = 0 - let bytes = 0 - let maxLead = 0 - for (;;) { - await new Promise((r) => setTimeout(r, 5)) - const { done, value } = await reader.read() - if (done) { - break - } - consumed++ - bytes += value.byteLength - const lead = produced - consumed - if (lead > maxLead) { - maxLead = lead - } + const baseline = process.memoryUsage().external + let peakExternal = 0 + let consumed = 0 + let totalText = '' + while (true) { + await new Promise((r) => setTimeout(r, 2)) + const { done, value } = await reader.read() + if (done) break + consumed++ + totalText += Buffer.from(value).toString('utf8') + if (consumed % 25 === 0) { + ;(globalThis as any).gc() + const ext = process.memoryUsage().external - baseline + if (ext > peakExternal) peakExternal = ext } + } - expect(maxLead).toBeLessThanOrEqual(8) - // The merger splits the first renderer record at the router boundary. - expect(consumed).toBe(CHUNKS + 1) - expect(bytes).toBe(CHUNKS * encoded.byteLength) - }) - }, -) + // Total bytes produced ≈ APP_CHUNKS * (APP_CHUNK_BYTES + 5*SCRIPT_BYTES) + // ≈ 200 * (4KB + 20KB) ≈ 4.8MB + // With backpressure peak external should stay well below total. + expect(peakExternal).toBeLessThan(2 * 1024 * 1024) + expect(totalText.split(appChunkStr).length - 1).toBe(APP_CHUNKS) + expect(totalText.split(scriptStr).length - 1).toBe( + APP_CHUNKS * INJECT_PER_APP_CHUNK, + ) + }) +}) diff --git a/packages/router-core/tests/transformStreamWithRouter.test.ts b/packages/router-core/tests/transformStreamWithRouter.test.ts index e5ce1d8d50..903efeb0c9 100644 --- a/packages/router-core/tests/transformStreamWithRouter.test.ts +++ b/packages/router-core/tests/transformStreamWithRouter.test.ts @@ -1,256 +1,111 @@ -// CI-stable tests for transformReadableStreamWithRouter behavior. +// CI-stable tests for transformStreamWithRouter behavior. // // These exercise the deterministic side-effects of the SSR memory fix // (TanStack/router#7402) without relying on GC, timing of real I/O, or // process.memoryUsage(). On-demand backpressure/external-memory // assertions live in transformStreamBackpressure.perf.test.ts. -import { PassThrough, Readable } from 'node:stream' +import { ReadableStream } from 'node:stream/web' +import { PassThrough } from 'node:stream' import { describe, expect, test, vi } from 'vitest' import { createMemoryHistory } from '@tanstack/history' import { BaseRootRoute, BaseRoute } from '../src' -import { GLOBAL_TSR } from '../src/ssr/constants' -import { - HYDRATION_SCRIPT_BOUNDARY_BYTES, - HydrationScriptOutputState, - MAX_HYDRATION_OUTPUT_CHUNK_BYTES, -} from '../src/ssr/hydrationScripts' -import { - createSsrStreamResponse, - replaceSsrResponse, -} from '../src/ssr/handlerCallback' +import { GLOBAL_TSR, TSR_SCRIPT_BARRIER_ID } from '../src/ssr/constants' +import { createSsrStreamResponse } from '../src/ssr/handlerCallback' import { attachRouterServerSsrUtils } from '../src/ssr/ssr-server' import { - transformHtmlStringWithRouter, transformPipeableStreamWithRouter, transformReadableStreamWithRouter, + transformStreamWithRouter, } from '../src/ssr/transformStreamWithRouter' -import { - DOCUMENT_CLOSE_BYTES, - SCRIPT_CLOSE, -} from '../src/ssr/htmlBoundaryScanner' import { createTestRouter } from './routerTestUtils' import type { RouterManagedTag } from '../src/manifest' -import type { HydrationScriptOutput } from '../src/ssr/hydrationScripts' -const decoder = new TextDecoder() -const DOCUMENT_CLOSE = decoder.decode(DOCUMENT_CLOSE_BYTES) -const HYDRATION_SCRIPT_BOUNDARY_SUFFIX = decoder.decode( - HYDRATION_SCRIPT_BOUNDARY_BYTES, -) -const HYDRATION_SCRIPT_BOUNDARY_SOURCE = - `document.currentScript.remove()` + - HYDRATION_SCRIPT_BOUNDARY_SUFFIX.slice(0, -SCRIPT_CLOSE.length) -const SCRIPT_BARRIER_HTML = `` - -function internalSplitOffsets(value: string) { - return Array.from({ length: value.length - 1 }, (_, index) => index + 1) -} - -type FakeHydrationScripts = { - reserveFastPath: (output?: HydrationScriptOutput) => boolean - claimOutput: () => HydrationScriptOutput - liftBarrier: () => void - isInitialTaken: () => boolean - startSerializationTimeout: (timeoutMs: number) => void -} +const MAX_LEFTOVER_CHARS = 2048 +const MAX_ROUTER_HTML_CHARS = 16 * 1024 * 1024 type FakeServerSsr = { - hydrationScripts: FakeHydrationScripts + isSerializationFinished: () => boolean + reserveStreamFastPath: () => boolean + onInjectedHtml: (listener: () => void) => () => void + onSerializationFinished: (listener: () => void) => () => void + takeBufferedHtml: () => string | undefined setRenderFinished: () => void - onCleanup: (listener: () => void) => void cleanup: () => void + liftScriptBarrier?: () => void } -type MakeRouterOptions = Partial> & - Partial - type FakeRouter = { serverSsr?: FakeServerSsr } -type FakeHydrationRecord = { - bytes: Uint8Array - offset: number -} - -function makeRouter(opts: MakeRouterOptions = {}): { +function makeRouter(opts: Partial = {}): { router: FakeRouter cleanupCalls: { count: number } - claimCalls: { count: number } - emitHydrationRecord: (record: string) => void - emitScriptBatch: (parts: ReadonlyArray) => void + injectHtml: (html: string) => void finishSerialization: () => void - failHydrationOutput: (error: unknown) => void } { const cleanupCalls = { count: 0 } - const claimCalls = { count: 0 } - const cleanupListeners: Array<() => void> = [] let cleanedUp = false - let producerDone = false - let claimed = false - let failure: unknown - let activeRecord: FakeHydrationRecord | undefined - const records: Array = [] - let listener: (() => void) | undefined - let state: HydrationScriptOutput['state'] = HydrationScriptOutputState.Waiting - let serializationTimeout: ReturnType | undefined - const encoder = new TextEncoder() - - function updateState() { - const nextState = - failure !== undefined - ? HydrationScriptOutputState.Failed - : activeRecord - ? HydrationScriptOutputState.Active - : records.length > 0 - ? HydrationScriptOutputState.Ready - : producerDone - ? HydrationScriptOutputState.Done - : HydrationScriptOutputState.Waiting - if (state !== nextState) { - state = nextState - listener?.() - } - } - - const output: HydrationScriptOutput = { - get state() { - return state - }, - get error() { - return failure - }, - pullChunk() { - if (state === HydrationScriptOutputState.Ready) { - activeRecord = records.shift()! - } else if (state !== HydrationScriptOutputState.Active) { - throw new Error('Fake hydration output is not ready') - } - - const record = activeRecord! - const end = Math.min( - record.offset + MAX_HYDRATION_OUTPUT_CHUNK_BYTES, - record.bytes.length, - ) - const chunk = record.bytes.subarray(record.offset, end) - record.offset = end - if (end === record.bytes.length) { - activeRecord = undefined - } - updateState() - return chunk - }, - subscribe(onChange) { - if (listener) { - throw new Error('Fake hydration output already has a subscriber') - } - listener = onChange - return () => { - if (listener === onChange) { - listener = undefined - } - } - }, - } - - const { - reserveFastPath = () => false, - claimOutput = () => { - claimCalls.count++ - if (claimed) { - throw new Error('Fake hydration output already has a consumer') - } - claimed = true - return output - }, - liftBarrier = () => {}, - isInitialTaken = () => true, - startSerializationTimeout = (timeoutMs: number) => { - if ( - producerDone || - failure !== undefined || - serializationTimeout !== undefined - ) { - return - } - serializationTimeout = setTimeout(() => { - serializationTimeout = undefined - failure = new Error('Serialization timeout after app render finished') - console.error('Serialization timeout after app render finished') - updateState() - }, timeoutMs) - }, - ...serverSsrOverrides - } = opts + let buffered = '' + const injectedListeners: Array<() => void> = [] + const serializationListeners: Array<() => void> = [] const router: FakeRouter = { serverSsr: { - hydrationScripts: { - reserveFastPath, - claimOutput, - liftBarrier, - isInitialTaken, - startSerializationTimeout, + isSerializationFinished: () => false, + reserveStreamFastPath: () => false, + onInjectedHtml: (cb) => { + injectedListeners.push(cb) + return () => { + const i = injectedListeners.indexOf(cb) + if (i >= 0) injectedListeners.splice(i, 1) + } + }, + onSerializationFinished: (cb) => { + serializationListeners.push(cb) + return () => { + const i = serializationListeners.indexOf(cb) + if (i >= 0) serializationListeners.splice(i, 1) + } + }, + takeBufferedHtml: () => { + const v = buffered + buffered = '' + return v || undefined }, setRenderFinished: () => {}, - onCleanup: (cleanupListener: () => void) => { - if (cleanedUp) { - return - } - cleanupListeners.push(cleanupListener) - }, cleanup: () => { - if (cleanedUp) { - return - } + if (cleanedUp) return cleanedUp = true cleanupCalls.count++ - if (serializationTimeout !== undefined) { - clearTimeout(serializationTimeout) - serializationTimeout = undefined - } - records.length = 0 - activeRecord = undefined - failure = undefined - listener = undefined - state = HydrationScriptOutputState.Done - // Mirror the real implementation: snapshot + clear, then notify. - const pendingCleanupListeners = cleanupListeners.slice() - cleanupListeners.length = 0 - for (const cleanupListener of pendingCleanupListeners) { - cleanupListener() - } router.serverSsr = undefined }, - ...serverSsrOverrides, + liftScriptBarrier: () => {}, + ...opts, }, } - function emitHydrationRecord(record: string) { - records.push({ - bytes: encoder.encode(record), - offset: 0, - }) - updateState() - } - return { router, cleanupCalls, - claimCalls, - emitHydrationRecord, - emitScriptBatch: (parts) => emitHydrationRecord(renderScriptBatch(parts)), - finishSerialization: () => { - producerDone = true - if (serializationTimeout !== undefined) { - clearTimeout(serializationTimeout) - serializationTimeout = undefined + injectHtml: (html: string) => { + buffered += html + for (const l of injectedListeners.slice()) { + try { + l() + } catch (err) { + console.error('SSR injected HTML listener error:', err) + } } - updateState() }, - failHydrationOutput: (error) => { - failure = error - updateState() + finishSerialization: () => { + for (const l of serializationListeners.slice()) { + try { + l() + } catch (err) { + console.error('Serialization listener error:', err) + } + } }, } } @@ -259,7 +114,6 @@ function makeManualUpstream(): { stream: ReadableStream push: (s: string) => void close: () => void - error: (reason: unknown) => void cancelled: { value: boolean; reason: unknown } } { let controllerRef: ReadableStreamDefaultController | undefined @@ -278,74 +132,30 @@ function makeManualUpstream(): { stream, push: (s) => controllerRef!.enqueue(encoder.encode(s)), close: () => controllerRef!.close(), - error: (reason) => controllerRef!.error(reason), cancelled, } } async function readAll(s: ReadableStream): Promise { const reader = s.getReader() - const decoder = new TextDecoder() let out = '' - for (;;) { + while (true) { const { done, value } = await reader.read() - if (done) { - break - } - out += decoder.decode(value, { stream: true }) + if (done) break + // Buffer.from accepts any ArrayBufferView regardless of realm (jsdom env). + out += Buffer.from( + value.buffer, + value.byteOffset, + value.byteLength, + ).toString('utf8') } - return out + decoder.decode() -} - -async function readAllBytes( - stream: ReadableStream, -): Promise { - const reader = stream.getReader() - const chunks: Array = [] - for (;;) { - const { done, value } = await reader.read() - if (done) { - break - } - chunks.push(Buffer.from(value)) - } - return Buffer.concat(chunks) -} - -async function readAllPipeableChunks(stream: Readable): Promise> { - const chunks: Array = [] - for await (const chunk of stream) { - chunks.push(Buffer.from(chunk)) - } - return chunks -} - -async function readAllPipeableBytes(stream: Readable): Promise { - return Buffer.concat(await readAllPipeableChunks(stream)) -} - -function makeLargeStringRecord(prefix: string, suffix: string) { - return ( - prefix + - 'x'.repeat( - MAX_HYDRATION_OUTPUT_CHUNK_BYTES - 1 - Buffer.byteLength(prefix), - ) + - '😀' + - '漢x'.repeat(20_000) + - suffix - ) + return out } // Yield to the microtask queue a few times so async stream operations can // drain. Avoids reliance on real timers. async function flush(n = 5) { - for (let i = 0; i < n; i++) { - await Promise.resolve() - } -} - -function createIssuePayload() { - return 'x'.repeat(17 * 1024 * 1024) + for (let i = 0; i < n; i++) await Promise.resolve() } function createDeferred() { @@ -373,24 +183,7 @@ function renderManagedScript(tag: RouterManagedTag) { const id = attrs.id ? ` id="${attrs.id}"` : '' const className = attrs.className ? ` class="${attrs.className}"` : '' const nonce = attrs.nonce ? ` nonce="${attrs.nonce}"` : '' - const streamPart = - 'data-tsr-stream-part' in attrs ? ' data-tsr-stream-part=""' : '' - return `${tag.children ?? ''}` -} - -function renderManagedScripts(tags: Array) { - return tags.map(renderManagedScript).join('') -} - -function renderInitialScripts(scripts: { - before: Array - boundary: RouterManagedTag -}) { - return renderManagedScripts([...scripts.before, scripts.boundary]) -} - -function renderScriptBatch(parts: ReadonlyArray) { - return `` + return `${tag.children ?? ''}` } function createRealSsrRouter(dehydratedData: Record) { @@ -409,37 +202,7 @@ function createRealSsrRouter(dehydratedData: Record) { }) } -describe('transformReadableStreamWithRouter — real SSR scripts', () => { - test('uses pass-through after Scripts takes all eager hydration scripts', async () => { - const router = createRealSsrRouter({ eager: 'loader-data' }) - attachRouterServerSsrUtils({ router, manifest: undefined }) - - await router.load() - await router.serverSsr!.dehydrate() - - // This is the server-side work performed by during rendering. - const initialScripts = router.serverSsr!.takeInitialHydrationScriptTags() - expect(initialScripts).toBeDefined() - - const serverSsr = router.serverSsr! - const setRenderFinished = vi.spyOn(serverSsr, 'setRenderFinished') - const upstream = makeManualUpstream() - const html = `
app
${renderInitialScripts( - initialScripts!, - )}` - - const output = transformReadableStreamWithRouter(router, upstream.stream) - - // Pass-through reservation must not require render completion in advance. - expect(setRenderFinished).not.toHaveBeenCalled() - upstream.push(html) - upstream.close() - - await expect(readAll(output)).resolves.toBe(html) - expect(setRenderFinished).toHaveBeenCalledOnce() - expect(router.serverSsr).toBeUndefined() - }) - +describe('transformStreamWithRouter — real SSR scripts', () => { test('flushes stream-end scripts before body close when serialization finishes before transform starts', async () => { const streamed = createDeferred() const router = createRealSsrRouter({ streamed: streamed.promise }) @@ -448,24 +211,28 @@ describe('transformReadableStreamWithRouter — real SSR scripts', () => { await router.load() await router.serverSsr!.dehydrate() - const initialScripts = router.serverSsr!.takeInitialHydrationScriptTags() - expect(initialScripts).toBeDefined() - const barrierScript = initialScripts!.boundary - expect(barrierScript.attrs).not.toHaveProperty('id') + const barrierScript = router.serverSsr!.takeBufferedScripts() expect(barrierScript).toBeDefined() - const initialHtml = renderInitialScripts(initialScripts!) - expect(initialHtml).toContain(`${GLOBAL_TSR}.router=`) - expect(initialHtml).not.toContain(`${GLOBAL_TSR}.e()`) + expect(barrierScript!.attrs?.id).toBe(TSR_SCRIPT_BARRIER_ID) + expect(barrierScript!.children).toContain(`${GLOBAL_TSR}.router=`) + expect(barrierScript!.children).not.toContain(`${GLOBAL_TSR}.e()`) + const serializationDone = new Promise((resolve) => { + router.serverSsr!.onSerializationFinished(resolve) + }) streamed.resolve('done') - await flush(20) + await serializationDone const upstream = makeManualUpstream() - const output = transformReadableStreamWithRouter( + const output = transformStreamWithRouter( router as any, upstream.stream as any, ) - upstream.push(`
app
${initialHtml}`) + upstream.push( + `
app
${renderManagedScript( + barrierScript!, + )}`, + ) upstream.close() const html = await readAll(output as any) @@ -485,22 +252,25 @@ describe('transformReadableStreamWithRouter — real SSR scripts', () => { await router.load() await router.serverSsr!.dehydrate() - const initialScripts = router.serverSsr!.takeInitialHydrationScriptTags() - expect(initialScripts).toBeDefined() + const barrierScript = router.serverSsr!.takeBufferedScripts() + expect(barrierScript).toBeDefined() const upstream = makeManualUpstream() - const output = transformReadableStreamWithRouter( + const output = transformStreamWithRouter( router as any, upstream.stream as any, ) upstream.push( - `
app
${renderInitialScripts( - initialScripts!, + `
app
${renderManagedScript( + barrierScript!, )}`, ) + const serializationDone = new Promise((resolve) => { + router.serverSsr!.onSerializationFinished(resolve) + }) streamed.controller.close() - await flush(20) + await serializationDone upstream.close() const html = await readAll(output as any) @@ -513,55 +283,7 @@ describe('transformReadableStreamWithRouter — real SSR scripts', () => { expect(endIndex).toBeLessThan(html.indexOf('')) }) - test.each([ - ['completes', false], - ['is cancelled before the payload finishes', true], - ] as const)( - 'loader controllers are aborted only when the response %s', - async (_name, cancelled) => { - let loaderSignal: AbortSignal | undefined - const deferred = createDeferred() - const rootRoute = new BaseRootRoute({}) - const indexRoute = new BaseRoute({ - getParentRoute: () => rootRoute, - path: '/', - component: () => null, - loader: ({ abortController }) => { - loaderSignal = abortController.signal - return { deferred: deferred.promise } - }, - }) - const router = createTestRouter({ - routeTree: rootRoute.addChildren([indexRoute]), - history: createMemoryHistory({ initialEntries: ['/'] }), - isServer: true, - }) - attachRouterServerSsrUtils({ router, manifest: undefined }) - await router.load() - await router.serverSsr!.dehydrate() - const initialScripts = router.serverSsr!.takeInitialHydrationScriptTags()! - - const upstream = makeManualUpstream() - const output = transformReadableStreamWithRouter(router, upstream.stream) - upstream.push( - `${renderInitialScripts(initialScripts)}`, - ) - upstream.close() - expect(loaderSignal?.aborted).toBe(false) - - if (cancelled) { - await output.cancel(new Error('client gone')) - } else { - deferred.resolve('late') - await readAll(output as any) - } - - expect(router.serverSsr).toBeUndefined() - expect(loaderSignal?.aborted).toBe(cancelled) - }, - ) - - test('emits router scripts after the document when no Scripts barrier was rendered', async () => { + test('flushes stream-end scripts even when no barrier marker was emitted', async () => { const streamed = createDeferred() const router = createRealSsrRouter({ streamed: streamed.promise }) attachRouterServerSsrUtils({ router, manifest: undefined }) @@ -569,11 +291,14 @@ describe('transformReadableStreamWithRouter — real SSR scripts', () => { await router.load() await router.serverSsr!.dehydrate() + const serializationDone = new Promise((resolve) => { + router.serverSsr!.onSerializationFinished(resolve) + }) streamed.resolve('done') - await flush(20) + await serializationDone const upstream = makeManualUpstream() - const output = transformReadableStreamWithRouter( + const output = transformStreamWithRouter( router as any, upstream.stream as any, ) @@ -581,37 +306,66 @@ describe('transformReadableStreamWithRouter — real SSR scripts', () => { upstream.close() const html = await readAll(output as any) - const documentEnd = html.indexOf('') + ''.length - expect(html.slice(0, documentEnd)).toBe( - '
app
', + + expect(html).toContain(`${GLOBAL_TSR}.router=`) + expect(html).toContain(`${GLOBAL_TSR}.e()`) + expect(html.indexOf(`${GLOBAL_TSR}.e()`)).toBeLessThan( + html.indexOf(''), + ) + }) + + test('keeps stream scripts before uppercase body close', async () => { + const streamed = createDeferred() + const router = createRealSsrRouter({ streamed: streamed.promise }) + attachRouterServerSsrUtils({ router, manifest: undefined }) + + await router.load() + await router.serverSsr!.dehydrate() + const barrierScript = router.serverSsr!.takeBufferedScripts()! + + const upstream = makeManualUpstream() + const output = transformStreamWithRouter( + router as any, + upstream.stream as any, + ) + upstream.push( + `${renderManagedScript(barrierScript)}
app
`, + ) + + const serializationDone = new Promise((resolve) => { + router.serverSsr!.onSerializationFinished(resolve) + }) + streamed.resolve('done') + await serializationDone + upstream.close() + + const html = await readAll(output as any) + expect(html).toContain(`${GLOBAL_TSR}.e()`) + expect(html.indexOf(`${GLOBAL_TSR}.e()`)).toBeLessThan( + html.indexOf(''), ) - const tail = html.slice(documentEnd) - expect(tail).toContain(`${GLOBAL_TSR}.router=`) - expect(tail).toContain(`${GLOBAL_TSR}.e()`) - expect(tail).toMatch(/<\/script>$/) - expect(router.serverSsr).toBeUndefined() }) test('detects a barrier marker split across chunks', async () => { let liftCalls = 0 const { router, finishSerialization } = makeRouter({ - liftBarrier: () => { + liftScriptBarrier: () => { liftCalls++ }, }) const upstream = makeManualUpstream() - const output = transformReadableStreamWithRouter( + const output = transformStreamWithRouter( router as any, upstream.stream as any, ) - const markerStart = SCRIPT_BARRIER_HTML.indexOf( - HYDRATION_SCRIPT_BOUNDARY_SUFFIX, - ) - const splitAt = - markerStart + Math.floor(HYDRATION_SCRIPT_BOUNDARY_SUFFIX.length / 2) + const splitAt = Math.floor(TSR_SCRIPT_BARRIER_ID.length / 2) - upstream.push(`${SCRIPT_BARRIER_HTML.slice(0, splitAt)}`) - upstream.push(`${SCRIPT_BARRIER_HTML.slice(splitAt)}
app
`) + upstream.push( + `
app
`, + ) upstream.push('') upstream.close() finishSerialization() @@ -621,239 +375,85 @@ describe('transformReadableStreamWithRouter — real SSR scripts', () => { }) test('does not inject stream scripts inside a split barrier script', async () => { - const { router, emitScriptBatch, finishSerialization } = makeRouter({ - liftBarrier: () => { - emitScriptBatch(['streamed()']) + const { router, injectHtml, finishSerialization } = makeRouter({ + liftScriptBarrier: () => { + injectHtml('') }, }) const upstream = makeManualUpstream() - const output = transformReadableStreamWithRouter( + const output = transformStreamWithRouter( router as any, upstream.stream as any, ) - const splitAt = - SCRIPT_BARRIER_HTML.indexOf(HYDRATION_SCRIPT_BOUNDARY_SUFFIX) + 4 upstream.push( - `
app
${SCRIPT_BARRIER_HTML.slice(0, splitAt)}`, - ) - upstream.push( - `${SCRIPT_BARRIER_HTML.slice(splitAt)}
after
`, + `
app
after
') finishSerialization() upstream.push('') upstream.close() const html = await readAll(output as any) - expect(html.indexOf(renderScriptBatch(['streamed()']))).toBeGreaterThan( - html.indexOf(SCRIPT_BARRIER_HTML), + expect(html.indexOf('')).toBeGreaterThan( + html.indexOf('
after
'), ) - expect(html.indexOf(renderScriptBatch(['streamed()']))).toBeLessThan( - html.indexOf('
after
'), - ) - expect(html.indexOf(renderScriptBatch(['streamed()']))).toBeLessThan( + expect(html.indexOf('')).toBeLessThan( html.indexOf(''), ) }) - test('uses a complete renderer record as an insertion boundary', async () => { - const { router, emitScriptBatch, finishSerialization } = makeRouter() - const upstream = makeManualUpstream() - const output = transformReadableStreamWithRouter( - router as any, - upstream.stream as any, - { - rendererSafePoint: 'record-end', + test('remembers a flushed barrier marker until a later closing-tag boundary', async () => { + let liftCalls = 0 + const { router, finishSerialization } = makeRouter({ + liftScriptBarrier: () => { + liftCalls++ }, - ) - const reader = output.getReader() - const decoder = new TextDecoder() - let html = '' - - const rendererRecord = 'content' - upstream.push(`${SCRIPT_BARRIER_HTML}${rendererRecord}`) - for (let index = 0; index < 2; index++) { - const { value } = await reader.read() - html += decoder.decode(value, { stream: true }) - } - - emitScriptBatch(['streamed()']) - upstream.push('
after
') - upstream.close() - finishSerialization() - - for (;;) { - const { done, value } = await reader.read() - if (done) { - break - } - html += decoder.decode(value, { stream: true }) - } - html += decoder.decode() - - expect(html).toBe( - `${SCRIPT_BARRIER_HTML}${rendererRecord}${renderScriptBatch([ - 'streamed()', - ])}
after
`, - ) - }) - - test('does not split a held document close at a record-end safe point', async () => { - const { router, emitScriptBatch, finishSerialization } = makeRouter() - const upstream = makeManualUpstream() - const output = transformReadableStreamWithRouter( - router as any, - upstream.stream as any, - { - rendererSafePoint: 'record-end', - }, - ) - const reader = output.getReader() - const splitAt = 5 - const prefix = `${SCRIPT_BARRIER_HTML}` - - upstream.push(prefix + DOCUMENT_CLOSE.slice(0, splitAt)) - expect(Buffer.from((await reader.read()).value!).toString()).toBe(prefix) - - const nextRead = reader.read() - await flush() - emitScriptBatch(['streamed()']) - upstream.push(DOCUMENT_CLOSE.slice(splitAt)) - finishSerialization() - upstream.close() - - const chunks = [(await nextRead).value!] - for (;;) { - const { done, value } = await reader.read() - if (done) { - break - } - chunks.push(value) - } - - expect( - Buffer.concat(chunks.map((chunk) => Buffer.from(chunk))).toString(), - ).toBe(renderScriptBatch(['streamed()']) + DOCUMENT_CLOSE) - }) - - test('conservative mode waits for EOF instead of using record ends', async () => { - const { router, emitScriptBatch, finishSerialization } = makeRouter() - const upstream = makeManualUpstream() - const output = transformReadableStreamWithRouter( - router as any, - upstream.stream as any, - ) - const reader = output.getReader() - - upstream.push(`${SCRIPT_BARRIER_HTML}
first
`) - expect(Buffer.from((await reader.read()).value!).toString()).toBe( - SCRIPT_BARRIER_HTML, - ) - expect(Buffer.from((await reader.read()).value!).toString()).toBe( - '
first
', - ) - - emitScriptBatch(['streamed()']) - upstream.push('
second
') - expect(Buffer.from((await reader.read()).value!).toString()).toBe( - '
second
', - ) - - let pendingReadSettled = false - const pendingRead = reader.read().then((result) => { - pendingReadSettled = true - return result }) - await flush() - expect(pendingReadSettled).toBe(false) - - finishSerialization() - upstream.close() - expect(Buffer.from((await pendingRead).value!).toString()).toBe( - renderScriptBatch(['streamed()']), + const upstream = makeManualUpstream() + const output = transformStreamWithRouter( + router as any, + upstream.stream as any, ) - expect((await reader.read()).done).toBe(true) + const filler = 'x'.repeat(MAX_LEFTOVER_CHARS + 32) + + upstream.push( + `
app
', - ) - const output = transformReadableStreamWithRouter( - router as any, - upstream.stream as any, - ) - - upstream.controller.enqueue(rendererBytes) - upstream.controller.close() - - await expect(readAllBytes(output)).resolves.toEqual( - Buffer.from(rendererBytes), - ) - expect(claimCalls.count).toBe(0) - expect(cleanupCalls.count).toBe(1) - }) - - test('dynamic pass-through preserves renderer bytes after document closes', async () => { - let allowFastPath = false - let reserveCalls = 0 - const { router, cleanupCalls, claimCalls, finishSerialization } = - makeRouter({ - reserveFastPath: () => { - reserveCalls++ - return allowFastPath - }, - }) - finishSerialization() - const upstream = createControlledStream() - const encoder = new TextEncoder() - const prefix = '
shell
' - const suffix = '' - const output = transformReadableStreamWithRouter( - router as any, - upstream.stream as any, - ) - const reader = output.getReader() - - expect(reserveCalls).toBe(1) - allowFastPath = true - upstream.controller.enqueue(encoder.encode(prefix)) - expect(Buffer.from((await reader.read()).value!).toString()).toBe(prefix) - - // Finishing serialization alone cannot bypass the rendered boundary. - expect(reserveCalls).toBe(1) - upstream.controller.enqueue(encoder.encode(SCRIPT_BARRIER_HTML + suffix)) - expect(Buffer.from((await reader.read()).value!).toString()).toBe( - SCRIPT_BARRIER_HTML, - ) - expect(reserveCalls).toBe(1) - - // The next pull enters the scanner-free post-boundary pass-through phase. - expect(Buffer.from((await reader.read()).value!).toString()).toBe(suffix) - expect(reserveCalls).toBe(2) - expect(claimCalls.count).toBe(1) - upstream.controller.close() - - expect((await reader.read()).done).toBe(true) - expect(cleanupCalls.count).toBe(1) - }) - - test('generic streams wait for the document close before a late batch', async () => { - const { router, emitScriptBatch, cleanupCalls, finishSerialization } = - makeRouter() - const upstream = makeManualUpstream() - const output = transformReadableStreamWithRouter( - router as any, - upstream.stream as any, - ) - const reader = output.getReader() - const firstAppChunk = '
first
' - - upstream.push(`${SCRIPT_BARRIER_HTML}${firstAppChunk}`) - const barrier = await reader.read() - const first = await reader.read() - expect(Buffer.from(barrier.value!).toString()).toBe(SCRIPT_BARRIER_HTML) - expect(Buffer.from(first.value!).toString()).toBe(firstAppChunk) - - const parts = ['lateBatch()'] - emitScriptBatch(parts) - upstream.push('next') - finishSerialization() - upstream.close() - - const remaining: Array = [] - for (;;) { - const { done, value } = await reader.read() - if (done) { - break - } - remaining.push(value) - } - - expect( - Buffer.concat([barrier.value!, first.value!, ...remaining]).toString(), - ).toBe( - `${SCRIPT_BARRIER_HTML}${firstAppChunk}next${renderScriptBatch( - parts, - )}`, - ) - expect(cleanupCalls.count).toBe(1) - }) - - test.each([ - ['record-end safe points', { rendererSafePoint: 'record-end' }], - ['conservative safe points', undefined], - ] as const)( - '%s preserve a non-canonical document close when a batch arrives later', - async (_, options) => { - const { router, emitScriptBatch, cleanupCalls, finishSerialization } = - makeRouter() - const upstream = makeManualUpstream() - const output = transformReadableStreamWithRouter( - router as any, - upstream.stream as any, - options, - ) - const reader = output.getReader() - const rendererHtml = - `
app
${SCRIPT_BARRIER_HTML}` + - '\n' - - upstream.push(rendererHtml) - let received = '' - while (received.length < rendererHtml.length) { - const result = await reader.read() - expect(result.done).toBe(false) - received += Buffer.from(result.value!).toString() - } - expect(received).toBe(rendererHtml) - - const parts = ['lateBatch()'] - emitScriptBatch(parts) - finishSerialization() - upstream.close() - - let remaining = '' - for (;;) { - const { done, value } = await reader.read() - if (done) { - break - } - remaining += Buffer.from(value).toString() - } - - expect(received + remaining).toBe(rendererHtml + renderScriptBatch(parts)) - expect(cleanupCalls.count).toBe(1) - }, - ) - - test('an aborted request stops eager string rendering', async () => { - const reason = new Error('request aborted') - const abortController = new AbortController() - abortController.abort(reason) - const onAbort = vi.fn() - const setRenderFinished = vi.fn() - const { router, cleanupCalls } = makeRouter({ - reserveFastPath: () => true, - setRenderFinished, - }) - - await expect( - transformHtmlStringWithRouter( - router as any, - 'ready', - { signal: abortController.signal, onAbort }, - ), - ).rejects.toBe(reason) - expect(setRenderFinished).not.toHaveBeenCalled() - expect(onAbort).toHaveBeenCalledOnce() - expect(onAbort).toHaveBeenCalledWith(reason) - expect(cleanupCalls.count).toBe(1) - }) - - test('a locked input stream fails synchronously and cleans SSR state', () => { - const { router, cleanupCalls } = makeRouter({ - reserveFastPath: () => true, - }) - const upstream = new ReadableStream() - const upstreamReader = upstream.getReader() - const onAbort = vi.fn() - - expect(() => - transformReadableStreamWithRouter(router as any, upstream as any, { - onAbort, - }), - ).toThrow() - expect(onAbort).toHaveBeenCalledOnce() - expect(cleanupCalls.count).toBe(1) - - upstreamReader.releaseLock() - }) - - test('a setup failure cancels an acquired input stream', async () => { - const { router, cleanupCalls } = makeRouter({ - reserveFastPath: () => { - throw new Error('setup failed') - }, - }) - const upstream = makeManualUpstream() - const onAbort = vi.fn() - - expect(() => - transformReadableStreamWithRouter(router as any, upstream.stream as any, { - onAbort, - }), - ).toThrow('setup failed') - await flush() - - expect(upstream.cancelled.value).toBe(true) - expect(onAbort).toHaveBeenCalledOnce() - expect(cleanupCalls.count).toBe(1) - }) - - test('a pre-aborted request fails setup before selecting a stream path', async () => { - const reserveFastPath = vi.fn(() => true) - const { router, cleanupCalls } = makeRouter({ reserveFastPath }) - const upstream = makeManualUpstream() - const requestAbort = new AbortController() - const reason = new Error('request already ended') - const onAbort = vi.fn() - requestAbort.abort(reason) - - expect(() => - transformReadableStreamWithRouter(router as any, upstream.stream as any, { - signal: requestAbort.signal, - onAbort, - }), - ).toThrow(reason) - await flush() - - expect(reserveFastPath).not.toHaveBeenCalled() - expect(upstream.cancelled).toEqual({ value: true, reason }) - expect(onAbort).toHaveBeenCalledOnce() - expect(cleanupCalls.count).toBe(1) - }) - - test('an already-failed hydration channel fails stream setup', async () => { - const state = makeRouter() - const upstream = makeManualUpstream() - const reason = new Error('hydration already failed') - const onAbort = vi.fn() - state.failHydrationOutput(reason) - - expect(() => - transformReadableStreamWithRouter( - state.router as any, - upstream.stream as any, - { - onAbort, - }, - ), - ).toThrow(reason) - await flush() - - expect(upstream.cancelled).toEqual({ value: true, reason }) - expect(onAbort).toHaveBeenCalledOnce() - expect(state.cleanupCalls.count).toBe(1) - }) - - test.each([ - ['fast', true], - ['merge', false], - ] as const)( - 'request abort immediately closes the %s path', - async (_, reserveFastPath) => { - const { router, cleanupCalls } = makeRouter({ - reserveFastPath: () => reserveFastPath, - }) - const upstream = makeManualUpstream() - const requestAbort = new AbortController() - const onAbort = vi.fn() - const output = transformReadableStreamWithRouter( - router as any, - upstream.stream as any, - { - signal: requestAbort.signal, - onAbort, - }, - ) - const reader = output.getReader() - const pendingRead = reader.read() - const reason = new Error('request ended') - - requestAbort.abort(reason) - - await expect(pendingRead).rejects.toBe(reason) - await flush() - expect(upstream.cancelled).toEqual({ value: true, reason }) - expect(onAbort).toHaveBeenCalledOnce() - expect(cleanupCalls.count).toBe(1) - }, - ) - test('downstream cancel propagates upstream and calls serverSsr.cleanup once', async () => { // Fast path: simpler, no scanner. Verifies cancel + cleanup contract. const { router, cleanupCalls } = makeRouter({ - reserveFastPath: () => true, + isSerializationFinished: () => true, + reserveStreamFastPath: () => true, + takeBufferedHtml: () => undefined, }) const upstream = makeManualUpstream() - const out = transformReadableStreamWithRouter( - router as any, - upstream.stream as any, - ) + const out = transformStreamWithRouter(router as any, upstream.stream as any) const reader = ( out as any ).getReader() as ReadableStreamDefaultReader @@ -1244,9 +491,11 @@ describe('transformReadableStreamWithRouter — cleanup side-effects', () => { expect(cleanupCalls.count).toBe(1) }) - test('downstream cancel releases the upstream reader while cancellation settles', async () => { + test('downstream cancel waits for upstream cancellation to settle', async () => { const { router, cleanupCalls } = makeRouter({ - reserveFastPath: () => true, + isSerializationFinished: () => true, + reserveStreamFastPath: () => true, + takeBufferedHtml: () => undefined, }) let resolveCancel!: () => void @@ -1261,10 +510,7 @@ describe('transformReadableStreamWithRouter — cleanup side-effects', () => { }, }) - const out = transformReadableStreamWithRouter( - router as any, - upstream as any, - ) + const out = transformStreamWithRouter(router as any, upstream as any) const reader = ( out as any ).getReader() as ReadableStreamDefaultReader @@ -1276,7 +522,6 @@ describe('transformReadableStreamWithRouter — cleanup side-effects', () => { await flush() expect(cancelSettled).toBe(false) - expect(upstream.locked).toBe(false) expect(cleanupCalls.count).toBe(1) resolveCancel() @@ -1284,16 +529,33 @@ describe('transformReadableStreamWithRouter — cleanup side-effects', () => { expect(cancelSettled).toBe(true) }) - test('stream response metadata defers cleanup until body drains', async () => { + test('natural close calls cleanup exactly once', async () => { const { router, cleanupCalls } = makeRouter({ - reserveFastPath: () => true, + isSerializationFinished: () => true, + reserveStreamFastPath: () => true, + takeBufferedHtml: () => undefined, }) const upstream = makeManualUpstream() - const out = transformReadableStreamWithRouter( - router as any, - upstream.stream as any, - ) + const out = transformStreamWithRouter(router as any, upstream.stream as any) + + upstream.push('done') + upstream.close() + + const text = await readAll(out as any) + expect(text).toContain('done') + expect(cleanupCalls.count).toBe(1) + }) + + test('stream response metadata defers cleanup until body drains', async () => { + const { router, cleanupCalls } = makeRouter({ + isSerializationFinished: () => true, + reserveStreamFastPath: () => true, + takeBufferedHtml: () => undefined, + }) + const upstream = makeManualUpstream() + + const out = transformStreamWithRouter(router as any, upstream.stream as any) const response = new Response(out as any) const result = createSsrStreamResponse(router as any, response) @@ -1309,19 +571,19 @@ describe('transformReadableStreamWithRouter — cleanup side-effects', () => { test('stream response dispose cancels body and cleans once', async () => { const { router, cleanupCalls } = makeRouter({ - reserveFastPath: () => true, + isSerializationFinished: () => true, + reserveStreamFastPath: () => true, + takeBufferedHtml: () => undefined, }) const upstream = makeManualUpstream() - const out = transformReadableStreamWithRouter( - router as any, - upstream.stream as any, - ) + const out = transformStreamWithRouter(router as any, upstream.stream as any) const result = createSsrStreamResponse( router as any, new Response(out as any), ) expect(result.serverSsrCleanup).toBe('stream') + if (result.serverSsrCleanup !== 'stream') return await result.dispose('dropped') await result.dispose('dropped-again') @@ -1330,281 +592,113 @@ describe('transformReadableStreamWithRouter — cleanup side-effects', () => { expect(cleanupCalls.count).toBe(1) }) - test('stream response replacement does not wait for cancellation', async () => { - const { router, cleanupCalls } = makeRouter({ - reserveFastPath: () => true, - }) - let cancelCalls = 0 - const stream = new ReadableStream({ - cancel() { - cancelCalls++ - return new Promise(() => {}) - }, - }) - const result = createSsrStreamResponse( - router as any, - new Response(stream as any), - ) - const replacement = new Response('replacement') - - const next = replaceSsrResponse(result, replacement, 'replaced') - - expect(next.response).toBe(replacement) - expect(cancelCalls).toBe(1) - expect(cleanupCalls.count).toBe(1) - }) - - test('external serverSsr cleanup releases a never-read merge transform immediately', async () => { - vi.useFakeTimers() - try { - const { router, cleanupCalls } = makeRouter() - const upstream = makeManualUpstream() - const aborts: Array = [] - - const out = transformReadableStreamWithRouter( - router as any, - upstream.stream as any, - { - onAbort: (reason) => aborts.push(reason), - }, - ) - expect(vi.getTimerCount()).toBe(1) - - // A discarded response is never read and never cancelled; external - // cleanup must not leave the transform pinned until the lifetime timer. - router.serverSsr!.cleanup() - - expect(cleanupCalls.count).toBe(1) - expect(aborts).toHaveLength(1) - expect((aborts[0] as Error).name).toBe('AbortError') - expect(upstream.cancelled.value).toBe(true) - expect(vi.getTimerCount()).toBe(0) - await expect(out.getReader().read()).rejects.toMatchObject({ - name: 'AbortError', - }) - } finally { - vi.useRealTimers() - } - }) - - test('external serverSsr cleanup releases a never-read fast-path transform immediately', async () => { - vi.useFakeTimers() - try { - const { router, cleanupCalls } = makeRouter({ - reserveFastPath: () => true, - }) - const upstream = makeManualUpstream() - const aborts: Array = [] - - const out = transformReadableStreamWithRouter( - router as any, - upstream.stream as any, - { - onAbort: (reason) => aborts.push(reason), - }, - ) - expect(vi.getTimerCount()).toBe(1) - - router.serverSsr!.cleanup() - - expect(cleanupCalls.count).toBe(1) - expect(aborts).toHaveLength(1) - expect(upstream.cancelled.value).toBe(true) - expect(vi.getTimerCount()).toBe(0) - await expect(out.getReader().read()).rejects.toMatchObject({ - name: 'AbortError', - }) - } finally { - vi.useRealTimers() - } - }) - - test('external serverSsr cleanup promptly fails a merge stream parked on hydration output', async () => { - const { router, cleanupCalls } = makeRouter() - const upstream = makeManualUpstream() - const aborts: Array = [] - - const out = transformReadableStreamWithRouter( - router as any, - upstream.stream as any, - { - onAbort: (reason) => aborts.push(reason), - }, - ) - const reader = out.getReader() - - upstream.push(`${SCRIPT_BARRIER_HTML}`) - const first = await reader.read() - expect(first.done).toBe(false) - - // Renderer EOF with hydration output still Waiting parks the pump. - upstream.close() - const parked = reader.read() - await new Promise((resolve) => setTimeout(resolve, 0)) - - router.serverSsr!.cleanup() - - await expect(parked).rejects.toMatchObject({ name: 'AbortError' }) - expect(cleanupCalls.count).toBe(1) - expect(aborts).toHaveLength(1) - }) - - test('SSR byte-0 pass-through is used when explicitly safe', async () => { + test('SSR fast path is used when explicitly safe', async () => { + let takeBufferedHtmlCalls = 0 let setRenderFinishedCalls = 0 const { router, cleanupCalls } = makeRouter({ - reserveFastPath: () => true, + isSerializationFinished: () => true, + reserveStreamFastPath: () => true, + takeBufferedHtml: () => { + takeBufferedHtmlCalls++ + return undefined + }, setRenderFinished: () => { setRenderFinishedCalls++ }, }) const upstream = makeManualUpstream() - const out = transformReadableStreamWithRouter( - router as any, - upstream.stream as any, - ) + const out = transformStreamWithRouter(router as any, upstream.stream as any) upstream.push('done') upstream.close() const text = await readAll(out as any) expect(text).toBe('done') + expect(takeBufferedHtmlCalls).toBe(0) expect(setRenderFinishedCalls).toBe(1) expect(cleanupCalls.count).toBe(1) }) - test('SSR pass-through is bypassed when not explicitly safe', async () => { - const { router, emitScriptBatch, finishSerialization } = makeRouter({ - reserveFastPath: () => false, + test('SSR fast path is bypassed when not explicitly safe', async () => { + let takeBufferedHtmlCalls = 0 + let pendingHtml: string | undefined = '' + const { router, injectHtml, finishSerialization } = makeRouter({ + isSerializationFinished: () => true, + reserveStreamFastPath: () => false, + takeBufferedHtml: () => { + takeBufferedHtmlCalls++ + const html = pendingHtml + pendingHtml = undefined + return html + }, }) const upstream = makeManualUpstream() - emitScriptBatch(['pending()']) - const out = transformReadableStreamWithRouter( - router as any, - upstream.stream as any, - ) - upstream.push(`done${SCRIPT_BARRIER_HTML}`) + const out = transformStreamWithRouter(router as any, upstream.stream as any) + upstream.push('done') upstream.close() finishSerialization() const text = await readAll(out as any) - expect(text).toContain(renderScriptBatch(['pending()'])) - expect(text.indexOf(renderScriptBatch(['pending()']))).toBeLessThan( + expect(text).toContain('') + expect(text.indexOf('')).toBeLessThan( text.indexOf(''), ) + expect(takeBufferedHtmlCalls).toBeGreaterThan(0) }) - const lifetimeTimeoutCases = [ - { - name: 'pass-through with an active reader', - reserveFastPath: true, - activeReader: true, - }, - { - name: 'pass-through without an active reader', - reserveFastPath: true, - activeReader: false, - }, - { - name: 'main path with an active reader', - reserveFastPath: false, - activeReader: true, - }, - { - name: 'main path without an active reader', - reserveFastPath: false, - activeReader: false, - }, - ] as const - - test.each(lifetimeTimeoutCases)( - 'lifetime timeout errors $name and cleans up', - async ({ reserveFastPath, activeReader }) => { - vi.useFakeTimers() - const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}) - try { - const { router, cleanupCalls } = makeRouter({ - reserveFastPath: () => reserveFastPath, - }) - const upstream = makeManualUpstream() - const out = transformReadableStreamWithRouter( - router as any, - upstream.stream as any, - { - lifetimeMs: 10, - }, - ) - - if (activeReader) { - const reader = out.getReader() - const pendingRead = reader.read() - const readError = expect(pendingRead).rejects.toThrow( - 'Stream lifetime exceeded', - ) - - await vi.advanceTimersByTimeAsync(15) - - await readError - reader.releaseLock() - } else { - await vi.advanceTimersByTimeAsync(15) - - const reader = out.getReader() - await expect(reader.read()).rejects.toThrow( - 'Stream lifetime exceeded', - ) - reader.releaseLock() - } - - expect(upstream.cancelled.value).toBe(true) - expect(upstream.cancelled.reason).toEqual( - new Error('Stream lifetime exceeded'), - ) - expect(cleanupCalls.count).toBe(1) - expect(warnSpy).toHaveBeenCalledOnce() - } finally { - warnSpy.mockRestore() - vi.useRealTimers() - } - }, - ) - - test('serialization timeout fails a completed render exactly once', async () => { - vi.useFakeTimers() + test('SSR fast path errors on unexpected late injection', async () => { const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) try { - const onAbort = vi.fn() - const { router, cleanupCalls } = makeRouter() + const { router, injectHtml, cleanupCalls } = makeRouter({ + isSerializationFinished: () => true, + reserveStreamFastPath: () => true, + }) const upstream = makeManualUpstream() - const output = transformReadableStreamWithRouter( + + const out = transformStreamWithRouter( router as any, upstream.stream as any, - { - timeoutMs: 10, - lifetimeMs: 1_000, - onAbort, - }, - ) - const outputPromise = readAll(output) - const outputError = expect(outputPromise).rejects.toThrow( - 'Serialization timeout after app render finished', ) + injectHtml('') - upstream.push(`${SCRIPT_BARRIER_HTML}${DOCUMENT_CLOSE}`) - upstream.close() - await flush(10) - await vi.advanceTimersByTimeAsync(15) - - await outputError - expect(onAbort).toHaveBeenCalledOnce() - expect(onAbort.mock.calls[0]![0]).toEqual( - new Error('Serialization timeout after app render finished'), + await expect(readAll(out as any)).rejects.toThrow( + 'SSR router HTML injected during fast path', ) expect(cleanupCalls.count).toBe(1) - expect(errorSpy).toHaveBeenCalledOnce() - expect(vi.getTimerCount()).toBe(0) } finally { errorSpy.mockRestore() + } + }) + + test('lifetime timeout cancels upstream and runs cleanup once', async () => { + vi.useFakeTimers() + try { + const { router, cleanupCalls } = makeRouter({ + isSerializationFinished: () => true, + takeBufferedHtml: () => undefined, + }) + const upstream = makeManualUpstream() + + const out = transformStreamWithRouter( + router as any, + upstream.stream as any, + { lifetimeMs: 10 }, + ) + + // Do NOT consume. Advance fake time past lifetimeMs deterministically. + await vi.advanceTimersByTimeAsync(15) + + expect(upstream.cancelled.value).toBe(true) + expect(cleanupCalls.count).toBe(1) + + // Drain (read errors silently) so vitest doesn't see an unhandled error. + const reader = ( + out as any + ).getReader() as ReadableStreamDefaultReader + reader.read().catch(() => {}) + reader.releaseLock() + } finally { vi.useRealTimers() } }) @@ -1618,7 +712,10 @@ describe('transformReadableStreamWithRouter — cleanup side-effects', () => { } process.on('unhandledRejection', onUnhandled) try { - const { router, cleanupCalls } = makeRouter() + const { router, cleanupCalls } = makeRouter({ + isSerializationFinished: () => true, + takeBufferedHtml: () => undefined, + }) const stream = new ReadableStream({ start() {}, @@ -1628,10 +725,7 @@ describe('transformReadableStreamWithRouter — cleanup side-effects', () => { }, }) - const out = transformReadableStreamWithRouter( - router as any, - stream as any, - ) + const out = transformStreamWithRouter(router as any, stream as any) const reader = ( out as any ).getReader() as ReadableStreamDefaultReader @@ -1652,628 +746,173 @@ describe('transformReadableStreamWithRouter — cleanup side-effects', () => { } }) - test('an output-channel failure terminates without another downstream pull', async () => { + test('server cleanup throwing does not prevent terminal stream cleanup', async () => { const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) try { - const { router, cleanupCalls, failHydrationOutput } = makeRouter() + const { router, finishSerialization } = makeRouter({ + cleanup: () => { + throw new Error('cleanup-boom') + }, + }) const upstream = makeManualUpstream() - const out = transformReadableStreamWithRouter( + + const out = transformStreamWithRouter( router as any, upstream.stream as any, ) - const reason = new Error('hydration-output-failed') + upstream.push('done') + upstream.close() + finishSerialization() - failHydrationOutput(reason) - await flush() + await expect(readAll(out as any)).resolves.toContain('done') + expect(errorSpy).toHaveBeenCalled() + } finally { + errorSpy.mockRestore() + } + }) - await expect(readAll(out as any)).rejects.toBe(reason) - expect(upstream.cancelled.value).toBe(true) + test('throwing injected listener does not skip transform drain', async () => { + const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) + try { + const { router, injectHtml, finishSerialization } = makeRouter() + router.serverSsr!.onInjectedHtml(() => { + throw new Error('external-listener-boom') + }) + const upstream = makeManualUpstream() + + const out = transformStreamWithRouter( + router as any, + upstream.stream as any, + ) + + upstream.push('
app
') + injectHtml('') + upstream.push('') + upstream.close() + finishSerialization() + + const text = await readAll(out as any) + expect(text).toContain('') + expect(text.indexOf('')).toBeLessThan( + text.indexOf(''), + ) + } finally { + errorSpy.mockRestore() + } + }) + + test('tail overflow errors and runs cleanup', async () => { + const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) + try { + const { router, cleanupCalls, finishSerialization } = makeRouter() + const upstream = makeManualUpstream() + + const out = transformStreamWithRouter( + router as any, + upstream.stream as any, + ) + upstream.push(`done${'x'.repeat(64 * 1024 + 1)}`) + upstream.close() + finishSerialization() + + await expect(readAll(out as any)).rejects.toThrow( + 'SSR stream tail exceeded maximum buffer', + ) expect(cleanupCalls.count).toBe(1) } finally { errorSpy.mockRestore() } }) - test('places a late router batch after a post-document script patch and before the relocated close', async () => { - const { router, emitScriptBatch, cleanupCalls, finishSerialization } = - makeRouter() + test('router HTML overflow errors and runs cleanup', async () => { + const { router, injectHtml, cleanupCalls } = makeRouter() const upstream = makeManualUpstream() - const output = transformReadableStreamWithRouter( - router as any, - upstream.stream as any, - { - rendererSafePoint: 'script-close', - }, - ) - const reader = output.getReader() - const shell = `

loading

${SCRIPT_BARRIER_HTML}` - // Minimal resolved segment and replacement call. The runtime helper can be - // installed by the shell. - const rendererPatch = - '' + - '' - const appHtml = `${shell}${rendererPatch}` - upstream.push(appHtml) + const out = transformStreamWithRouter(router as any, upstream.stream as any) + injectHtml('x'.repeat(MAX_ROUTER_HTML_CHARS + 1)) - const shellChunk = await reader.read() - expect(shellChunk.done).toBe(false) - expect(Buffer.from(shellChunk.value!).toString('utf8')).toBe(shell) - - const patchChunk = await reader.read() - expect(patchChunk.done).toBe(false) - expect(Buffer.from(patchChunk.value!).toString('utf8')).toBe(rendererPatch) - - // The original close suffix has now been scanned and held. This batch is - // deliberately emitted afterward to cover the late-arrival ordering. - const routerParts = ['routerPayload()'] - emitScriptBatch(routerParts) - finishSerialization() - - const routerChunk = await reader.read() - expect(routerChunk.done).toBe(false) - expect(Buffer.from(routerChunk.value!).toString('utf8')).toBe( - renderScriptBatch(routerParts), - ) - - upstream.close() - - const chunks = [shellChunk.value!, patchChunk.value!, routerChunk.value!] - for (;;) { - const { done, value } = await reader.read() - if (done) { - break - } - chunks.push(value) - } - - const actual = Buffer.concat(chunks.map((chunk) => Buffer.from(chunk))) - const routerScript = renderScriptBatch(routerParts) - const expected = Buffer.from( - `${shell}${rendererPatch}${routerScript}`, - ) - - expect(actual).toEqual(expected) - expect(actual.indexOf(Buffer.from(rendererPatch))).toBeLessThan( - actual.indexOf(Buffer.from(routerScript)), - ) - expect(actual.indexOf(Buffer.from(routerScript))).toBeLessThan( - actual.indexOf(Buffer.from('')), + await expect(readAll(out as any)).rejects.toThrow( + 'SSR router HTML exceeded maximum buffer', ) expect(cleanupCalls.count).toBe(1) }) - test.each(internalSplitOffsets(SCRIPT_CLOSE))( - 'waits for a script-close safe point split at byte %s before a router batch', - async (splitAt) => { - const { router, emitScriptBatch, finishSerialization } = makeRouter() - const upstream = makeManualUpstream() - const output = transformReadableStreamWithRouter( - router as any, - upstream.stream as any, - { - rendererSafePoint: 'script-close', - }, - ) - const reader = output.getReader() - const patchPrefix = - '' - - upstream.push(`${SCRIPT_BARRIER_HTML}${patchPrefix}`) - expect(Buffer.from((await reader.read()).value!).toString()).toBe( - SCRIPT_BARRIER_HTML, - ) - expect(Buffer.from((await reader.read()).value!).toString()).toBe( - patchPrefix.slice(0, -1), - ) - - const parts = ['streamed()'] - emitScriptBatch(parts) - upstream.push(`${patchSuffix}${DOCUMENT_CLOSE}`) - upstream.close() - finishSerialization() - - let remaining = '' - for (;;) { - const { done, value } = await reader.read() - if (done) { - break - } - remaining += Buffer.from(value).toString() - } - - expect(remaining).toBe( - `<${patchSuffix}${renderScriptBatch(parts)}${DOCUMENT_CLOSE}`, - ) - }) - - test('places a router batch after a script-terminated patch and before its final close', async () => { - const { router, emitScriptBatch, cleanupCalls, finishSerialization } = - makeRouter() - const upstream = makeManualUpstream() - const output = transformReadableStreamWithRouter( - router as any, - upstream.stream as any, - { - rendererSafePoint: 'script-close', - }, - ) - const reader = output.getReader() - const shell = - `` + - `

loading

${SCRIPT_BARRIER_HTML}` + - '' - const rendererPatch = - '' + - '' - - upstream.push(shell) - const shellChunks = [await reader.read(), await reader.read()] - expect( - Buffer.concat( - shellChunks.map((chunk) => Buffer.from(chunk.value!)), - ).toString(), - ).toBe(shell) - - upstream.push(rendererPatch) - const patchChunk = await reader.read() - expect(Buffer.from(patchChunk.value!).toString()).toBe(rendererPatch) - - const routerParts = ['routerPayload()'] - emitScriptBatch(routerParts) - finishSerialization() - const routerChunk = await reader.read() - expect(Buffer.from(routerChunk.value!).toString()).toBe( - renderScriptBatch(routerParts), - ) - - upstream.push(DOCUMENT_CLOSE) - upstream.close() - - const closeChunk = await reader.read() - expect(Buffer.from(closeChunk.value!).toString()).toBe(DOCUMENT_CLOSE) - expect((await reader.read()).done).toBe(true) - expect(cleanupCalls.count).toBe(1) - }) - - test.each(['one byte chunk', 'byte chunks', 'one string record'] as const)( - 'relocates the document close after script safe points in %s', - async (input) => { - const { router, finishSerialization, cleanupCalls } = makeRouter() - const upstream = createControlledStream() - const output = transformReadableStreamWithRouter( - router as any, - upstream.stream, - { rendererSafePoint: 'script-close' }, - ) - const reader = output.getReader() - const patch = '' - const prefix = SCRIPT_BARRIER_HTML + patch - const filler = 'x'.repeat( - MAX_HYDRATION_OUTPUT_CHUNK_BYTES - prefix.length, - ) - const afterClose = '' - const first = prefix + filler - const last = DOCUMENT_CLOSE + afterClose - const encoder = new TextEncoder() - - if (input === 'one string record') { - upstream.controller.enqueue(first + last) - } else if (input === 'byte chunks') { - upstream.controller.enqueue(encoder.encode(first)) - upstream.controller.enqueue(encoder.encode(last)) - } else { - upstream.controller.enqueue(encoder.encode(first + last)) - } - upstream.controller.close() - - expect(Buffer.from((await reader.read()).value!).toString()).toBe( - SCRIPT_BARRIER_HTML, - ) - // Keep hydration waiting until a script safe point has interrupted the - // document-close search. The byte/string variants then advance chunks. - expect(Buffer.from((await reader.read()).value!).toString()).toBe(patch) - finishSerialization() - reader.releaseLock() - - await expect(readAll(output)).resolves.toBe( - filler + afterClose + DOCUMENT_CLOSE, - ) - expect(cleanupCalls.count).toBe(1) - }, - ) - - test.each( - ['', ''].flatMap((prefix) => - internalSplitOffsets(prefix + DOCUMENT_CLOSE).map((splitAt) => ({ - prefix, - splitAt, - })), - ), - )( - 'relocates the structural document close after "$prefix" split at byte $splitAt', - async ({ prefix, splitAt }) => { - const { router, finishSerialization } = makeRouter() - const upstream = makeManualUpstream() - const output = transformReadableStreamWithRouter( - router as any, - upstream.stream as any, - { rendererSafePoint: 'script-close' }, - ) - const shell = `${SCRIPT_BARRIER_HTML}` - const patch = '' - const beforeClose = `${shell}${patch}
app
` - const afterClose = '' - const close = prefix + DOCUMENT_CLOSE - - upstream.push(beforeClose + close.slice(0, splitAt)) - upstream.push(close.slice(splitAt) + afterClose) - upstream.close() - const reader = output.getReader() - expect(Buffer.from((await reader.read()).value!).toString()).toBe(shell) - expect(Buffer.from((await reader.read()).value!).toString()).toBe(patch) - finishSerialization() - reader.releaseLock() - - await expect(readAll(output)).resolves.toBe( - '
app
' + prefix + afterClose + DOCUMENT_CLOSE, - ) - }, - ) - - test('reconstructs one emoji split across upstream UTF-8 byte chunks', async () => { - const { router, finishSerialization } = makeRouter() - const upstream = createControlledStream() - const out = transformReadableStreamWithRouter( - router as any, - upstream.stream as any, - ) - const encoder = new TextEncoder() - const emoji = encoder.encode('😀') - const html = `

😀

${SCRIPT_BARRIER_HTML}` - - upstream.controller.enqueue(encoder.encode('

')) - upstream.controller.enqueue(emoji.slice(0, 2)) - upstream.controller.enqueue(emoji.slice(2)) - upstream.controller.enqueue( - encoder.encode(`

${SCRIPT_BARRIER_HTML}`), - ) - upstream.controller.close() - finishSerialization() - - await expect(readAll(out)).resolves.toBe(html) - }) - - test('does not interleave application bytes while an opaque record is active', async () => { - const { router, emitHydrationRecord, finishSerialization } = makeRouter() - const upstream = makeManualUpstream() - const output = transformReadableStreamWithRouter( - router as any, - upstream.stream as any, - ) - const reader = output.getReader() - const record = 'R'.repeat(MAX_HYDRATION_OUTPUT_CHUNK_BYTES * 2 + 1) - const patch = '' - - upstream.push(`${SCRIPT_BARRIER_HTML}`) - expect(Buffer.from((await reader.read()).value!).toString()).toBe( - `${SCRIPT_BARRIER_HTML}`, - ) - - emitHydrationRecord(record) - upstream.push(patch + DOCUMENT_CLOSE) - upstream.close() - finishSerialization() - - let rest = '' - for (;;) { - const { done, value } = await reader.read() - if (done) { - break - } - rest += Buffer.from(value).toString() - } - - expect(rest).toBe(record + patch + DOCUMENT_CLOSE) - }) - - test('drains an active opaque record after prefetched renderer EOF', async () => { - const setRenderFinished = vi.fn() - const startSerializationTimeout = vi.fn() - const { router, emitHydrationRecord, finishSerialization } = makeRouter({ - setRenderFinished, - startSerializationTimeout, - }) - const upstream = makeManualUpstream() - const output = transformReadableStreamWithRouter( - router as any, - upstream.stream as any, - ) - const reader = output.getReader() - const record = 'R'.repeat(MAX_HYDRATION_OUTPUT_CHUNK_BYTES + 1) - - upstream.push(SCRIPT_BARRIER_HTML) - expect(Buffer.from((await reader.read()).value!).toString()).toBe( - SCRIPT_BARRIER_HTML, - ) - emitHydrationRecord(record) - finishSerialization() - upstream.close() - await flush() - - expect(startSerializationTimeout).toHaveBeenCalledOnce() - expect(startSerializationTimeout).toHaveBeenCalledWith(60_000) - expect(setRenderFinished).toHaveBeenCalledOnce() - - const first = await reader.read() - expect(first.done).toBe(false) - - let received = Buffer.from(first.value!).toString() - for (;;) { - const { done, value } = await reader.read() - if (done) { - break - } - received += Buffer.from(value).toString() - } - expect(received).toBe(record) - }) - - test('draining a large source does not read more app chunks per transport slice', async () => { - const { router, emitScriptBatch } = makeRouter() - const encoder = new TextEncoder() - let produced = 0 - const appStream = new ReadableStream({ - pull(controller) { - produced++ - controller.enqueue( - encoder.encode( - produced === 1 - ? `
app
${SCRIPT_BARRIER_HTML}` - : `

app-${produced}

`, - ), - ) - }, - }) - const out = transformReadableStreamWithRouter( - router as any, - appStream as any, - ) - emitScriptBatch([createIssuePayload()]) - const reader = out.getReader() - - const first = await reader.read() - expect(first.done).toBe(false) - await flush() - const producedBeforeRouterDrain = produced - - for (let index = 0; index < 8; index++) { - const next = await reader.read() - expect(next.done).toBe(false) - } - await flush() - - expect(produced).toBe(producedBeforeRouterDrain) - await reader.cancel() - }) - - test('a prefetched upstream error immediately stops an active large-source drain', async () => { + test('pending output overflow errors and runs cleanup', async () => { const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) try { - const { router, emitScriptBatch, cleanupCalls } = makeRouter() + const { router, cleanupCalls, finishSerialization } = makeRouter() const upstream = makeManualUpstream() - const onAbort = vi.fn() - const out = transformReadableStreamWithRouter( + + const out = transformStreamWithRouter( router as any, upstream.stream as any, - { onAbort }, ) - const reader = out.getReader() - const upstreamError = new Error('renderer-failed') - - emitScriptBatch([createIssuePayload()]) - upstream.push(`${SCRIPT_BARRIER_HTML}`) - expect((await reader.read()).done).toBe(false) - expect((await reader.read()).done).toBe(false) - - upstream.error(upstreamError) - await flush() + upstream.push(`${'x'.repeat(16 * 1024 * 1024 + 1)}
`) + upstream.close() + finishSerialization() + await expect(readAll(out as any)).rejects.toThrow( + 'SSR stream pending output exceeded maximum buffer', + ) expect(cleanupCalls.count).toBe(1) - expect(onAbort).toHaveBeenCalledOnce() - expect(onAbort).toHaveBeenCalledWith(upstreamError) - await expect(reader.read()).rejects.toBe(upstreamError) } finally { errorSpy.mockRestore() } }) - test('cancellation tears down an active large-source drain', async () => { - const { router, emitScriptBatch, cleanupCalls } = makeRouter() - const upstream = makeManualUpstream() - const out = transformReadableStreamWithRouter( - router as any, - upstream.stream as any, - ) - const reader = out.getReader() - - emitScriptBatch([createIssuePayload()]) - upstream.push(`
app
${SCRIPT_BARRIER_HTML}`) - - expect((await reader.read()).done).toBe(false) - expect((await reader.read()).done).toBe(false) - expect(cleanupCalls.count).toBe(0) - - await reader.cancel('consumer-gone') - - expect(upstream.cancelled.value).toBe(true) - expect(cleanupCalls.count).toBe(1) - }) - - test('lifetime timeout errors an active large-source drain', async () => { - const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}) - vi.useFakeTimers() - try { - const { router, emitScriptBatch, cleanupCalls } = makeRouter() - const upstream = makeManualUpstream() - const out = transformReadableStreamWithRouter( - router as any, - upstream.stream as any, - { - lifetimeMs: 10, - }, - ) - const reader = out.getReader() - - emitScriptBatch([createIssuePayload()]) - upstream.push(`
app
${SCRIPT_BARRIER_HTML}`) - - expect((await reader.read()).done).toBe(false) - expect((await reader.read()).done).toBe(false) - - await vi.advanceTimersByTimeAsync(15) - - await expect(reader.read()).rejects.toThrow('Stream lifetime exceeded') - expect(upstream.cancelled.value).toBe(true) - expect(upstream.cancelled.reason).toEqual( - new Error('Stream lifetime exceeded'), - ) - expect(cleanupCalls.count).toBe(1) - expect(warnSpy).toHaveBeenCalledOnce() - } finally { - vi.useRealTimers() - warnSpy.mockRestore() - } - }) - - test('forwards a large application byte chunk unchanged', async () => { + test('long text without closing tags partially flushes and keeps bounded leftover', async () => { const { router, finishSerialization } = makeRouter() const upstream = makeManualUpstream() - const out = transformReadableStreamWithRouter( - router as any, - upstream.stream as any, - ) + const out = transformStreamWithRouter(router as any, upstream.stream as any) const reader = (out as any).getReader() - const text = '😀a'.repeat(50_000) + const text = 'x'.repeat(MAX_LEFTOVER_CHARS + 32) upstream.push(text) const first = await reader.read() expect(first.done).toBe(false) const firstText = Buffer.from(first.value).toString('utf8') - expect(firstText).toBe(text) + expect(firstText).toBe('x'.repeat(32)) - upstream.push(SCRIPT_BARRIER_HTML) upstream.close() finishSerialization() let rest = '' for (;;) { const { done, value } = await reader.read() - if (done) { - break - } + if (done) break rest += Buffer.from(value).toString('utf8') } - expect(firstText + rest).toBe(text + SCRIPT_BARRIER_HTML) + expect(firstText + rest).toBe(text) }) - test('forwards an incomplete document close and drains pending router scripts', async () => { - const { router, emitScriptBatch, finishSerialization, cleanupCalls } = - makeRouter() + test('takeBufferedHtml throwing errors stream and runs cleanup once', async () => { + const { router, cleanupCalls } = makeRouter({ + takeBufferedHtml: () => { + throw new Error('take-buffered-html-boom') + }, + }) const upstream = makeManualUpstream() - const out = transformReadableStreamWithRouter( - router as any, - upstream.stream as any, - ) - const reader = out.getReader() - upstream.push(`${SCRIPT_BARRIER_HTML}${SCRIPT_BARRIER_HTML}`, - ) + const out = transformStreamWithRouter(router as any, upstream.stream as any) - const pendingRead = reader.read() - await flush() - emitScriptBatch(['pending()']) - finishSerialization() - upstream.close() - - expect(Buffer.from((await pendingRead).value!).toString()).toBe( - 'pending();document.currentScript.remove()', - ) + await expect(readAll(out as any)).rejects.toThrow('take-buffered-html-boom') expect(cleanupCalls.count).toBe(1) }) test('downstream backpressure delays close; no chunks are lost', async () => { - // Consumer reads slowly: all router scripts and relocated closing tags - // must arrive before the stream ends. - const { router, emitScriptBatch, finishSerialization } = makeRouter() + // Consumer reads slowly: we verify all router-injected scripts AND the + // tail closing tags arrive before the stream ends, even though + // tryFinish() requests close while writes are still queued. + const { router, injectHtml, finishSerialization } = makeRouter() const upstream = makeManualUpstream() - const out = transformReadableStreamWithRouter( - router as any, - upstream.stream as any, - ) + const out = transformStreamWithRouter(router as any, upstream.stream as any) - upstream.push(`
a
${SCRIPT_BARRIER_HTML}`) - // Queue many script batches while app is still rendering. - for (let i = 0; i < 50; i++) { - emitScriptBatch([`S${i}`]) - } + upstream.push('
a
') + // Queue many injected chunks while app is still rendering. + for (let i = 0; i < 50; i++) injectHtml(``) upstream.push('') upstream.close() finishSerialization() @@ -2283,137 +922,32 @@ describe('transformReadableStreamWithRouter — cleanup side-effects', () => { expect(full).toContain('
a
') expect(full).toContain('') for (let i = 0; i < 50; i++) { - expect(full).toContain(renderScriptBatch([`S${i}`])) + expect(full).toContain(``) } // All scripts must appear before . - expect(full.indexOf(renderScriptBatch(['S49']))).toBeLessThan( + expect(full.indexOf('')).toBeLessThan( full.indexOf(''), ) }) }) -describe('transformReadableStreamWithRouter — hydration output ordering', () => { - test('does not scan or lift the barrier before the initial script take', async () => { - let taken = false - const { router, emitScriptBatch, finishSerialization } = makeRouter({ - isInitialTaken: () => taken, - }) - const upstream = makeManualUpstream() - const out = transformReadableStreamWithRouter( - router as any, - upstream.stream as any, - ) - const reader = out.getReader() - const injected = 'late()' - const rendered = renderScriptBatch([injected]) - const decoder = new TextDecoder() - - // A Ready record plus barrier-lookalike bytes rendered before - // ran (initial take pending) must pass through without lifting. - emitScriptBatch([injected]) - upstream.push(`${SCRIPT_BARRIER_HTML}`) - const first = await reader.read() - expect(first.done).toBe(false) - expect(decoder.decode(first.value)).toBe( - `${SCRIPT_BARRIER_HTML}`, - ) - - // After the take, the real boundary lifts the barrier and the queued - // record is injected after it. - taken = true - upstream.push(`
x
${SCRIPT_BARRIER_HTML}${DOCUMENT_CLOSE}`) - upstream.close() - finishSerialization() - - let rest = '' - for (;;) { - const result = await reader.read() - if (result.done) { - break - } - rest += decoder.decode(result.value, { stream: true }) - } - const barrierEnd = - rest.indexOf(SCRIPT_BARRIER_HTML) + SCRIPT_BARRIER_HTML.length - expect(rest.indexOf(SCRIPT_BARRIER_HTML)).toBeGreaterThanOrEqual(0) - expect(rest.indexOf(rendered)).toBeGreaterThanOrEqual(barrierEnd) - expect(rest.endsWith(DOCUMENT_CLOSE)).toBe(true) - }) - - test('does not interpret close-looking bytes before the router boundary', async () => { - const { router, emitScriptBatch, finishSerialization } = makeRouter() - const upstream = makeManualUpstream() - const out = transformReadableStreamWithRouter( - router as any, - upstream.stream as any, - ) - const injected = 'pending()' - const rendered = renderScriptBatch([injected]) - const inlineScript = '' - - emitScriptBatch([injected]) - upstream.push( - `${inlineScript}
x
${SCRIPT_BARRIER_HTML}`, - ) - upstream.close() - finishSerialization() - - const full = await readAll(out as any) - expect(full).toContain(inlineScript) - expect(full.indexOf(rendered)).toBeGreaterThan(full.indexOf('')) - expect(full.indexOf(rendered)).toBeLessThan(full.lastIndexOf('')) - }) - - test('keeps queued script batches ordered when lifting the barrier emits synchronously', async () => { - const beforeLift = 'beforeLift()' - const duringLift = 'duringLift()' - const duringLiftEmitter: { - current?: (html: string) => void - } = {} - const { router, emitScriptBatch, finishSerialization } = makeRouter({ - liftBarrier: () => { - duringLiftEmitter.current!(duringLift) - }, - }) - duringLiftEmitter.current = (script) => emitScriptBatch([script]) - const upstream = makeManualUpstream() - const out = transformReadableStreamWithRouter( - router as any, - upstream.stream as any, - ) - - emitScriptBatch([beforeLift]) - upstream.push(`${SCRIPT_BARRIER_HTML}`) - upstream.close() - finishSerialization() - - const full = await readAll(out as any) - expect(full.indexOf(renderScriptBatch([beforeLift]))).toBeGreaterThan( - full.indexOf(SCRIPT_BARRIER_HTML), - ) - expect(full.indexOf(renderScriptBatch([beforeLift]))).toBeLessThan( - full.indexOf(renderScriptBatch([duringLift])), - ) - expect(full.indexOf(renderScriptBatch([duringLift]))).toBeLessThan( - full.indexOf(''), - ) - }) - - test('drains queued batches after the exact boundary and before the close', async () => { - const { router, emitScriptBatch, finishSerialization } = makeRouter() +describe('transformStreamWithRouter — injected HTML ordering', () => { + test('router-injected HTML interleaves at scanner safe points, not mid-tag', async () => { + const { router, injectHtml, finishSerialization } = makeRouter() const upstream = makeManualUpstream() - const out = transformReadableStreamWithRouter( - router as any, - upstream.stream as any, - ) + const out = transformStreamWithRouter(router as any, upstream.stream as any) - upstream.push(`
app
${SCRIPT_BARRIER_HTML}`) - // Router parts must not move ahead of pending application bytes. - emitScriptBatch(['X']) - emitScriptBatch(['Y']) + // App emits a chunk ending in a complete closing tag so the scanner + // can release content + flush pending router HTML at a safe boundary. + upstream.push('
app
') + // Injected during render — must be buffered, not enqueued ahead of + // pending app content, and not split across closing tags. + injectHtml('') + injectHtml('') - // The structural close is held until all router scripts finish. + // Tail chunk: end of body. Triggers pendingClosingTags capture and + // flushPendingRouterHtml before the tail is emitted on tryFinish. upstream.push('') upstream.close() finishSerialization() @@ -2422,12 +956,12 @@ describe('transformReadableStreamWithRouter — hydration output ordering', () = // Order: app div → scripts → body close. expect(full).toContain('
app
') - expect(full).toContain(renderScriptBatch(['X'])) - expect(full).toContain(renderScriptBatch(['Y'])) + expect(full).toContain('') + expect(full).toContain('') expect(full.indexOf('
app
')).toBeLessThan( - full.indexOf(renderScriptBatch(['X'])), + full.indexOf(''), ) - expect(full.indexOf(renderScriptBatch(['Y']))).toBeLessThan( + expect(full.indexOf('')).toBeLessThan( full.indexOf(''), ) }) @@ -2448,9 +982,7 @@ describe('transformReadableStreamWithRouter — hydration output ordering', () = const out = transformReadableStreamWithRouter( router as any, upstream as any, - { - onAbort: () => aborts++, - }, + { onAbort: () => aborts++ }, ) const reader = (out as any).getReader() @@ -2465,9 +997,7 @@ describe('transformReadableStreamWithRouter — hydration output ordering', () = }) test('onAbort: NOT called on natural successful completion', async () => { - const { router, finishSerialization } = makeRouter({ - reserveFastPath: () => true, - }) + const { router, finishSerialization } = makeRouter() const upstream = new ReadableStream({ start(controller) { @@ -2480,249 +1010,23 @@ describe('transformReadableStreamWithRouter — hydration output ordering', () = const out = transformReadableStreamWithRouter( router as any, upstream as any, - { - onAbort: () => aborts++, - }, + { onAbort: () => aborts++ }, ) + // tryFinish gates on serialization-finished; signal it AFTER transform + // has subscribed to the event. finishSerialization() // Drain to completion. const reader = (out as any).getReader() - for (;;) { + while (true) { const { done } = await reader.read() - if (done) { - break - } + if (done) break } expect(aborts).toBe(0) }) - test('readable wrapper accepts string chunks', async () => { - const { router } = makeRouter({ reserveFastPath: () => true }) - const source = 'string record' - const upstream = new ReadableStream({ - start(controller) { - controller.enqueue(source) - controller.close() - }, - }) - - const out = transformReadableStreamWithRouter(router as any, upstream) - - await expect(readAll(out)).resolves.toBe(source) - }) - - test('pipeable byte-0 pass-through encodes string records independently', async () => { - const { router } = makeRouter({ - reserveFastPath: () => true, - }) - const highSurrogate = String.fromCharCode(0xd83d) - const lowSurrogate = String.fromCharCode(0xde00) - const records = [ - '', - highSurrogate, - lowSurrogate, - '', - ] - const upstream = Readable.from(records) - const out = transformPipeableStreamWithRouter(router as any, upstream) - const actual = await readAllPipeableBytes(out) - const expected = Buffer.concat(records.map((record) => Buffer.from(record))) - - expect(actual).toEqual(expected) - expect(actual.includes(Buffer.from('😀'))).toBe(false) - }) - - test('pipeable byte-0 pass-through bounds one large string record', async () => { - const { router, cleanupCalls } = makeRouter({ - reserveFastPath: () => true, - }) - const source = makeLargeStringRecord('', '') - const upstream = Readable.from([source]) - const out = transformPipeableStreamWithRouter(router as any, upstream) - const chunks = await readAllPipeableChunks(out) - const actual = Buffer.concat(chunks) - - expect(source.indexOf('😀')).toBe(MAX_HYDRATION_OUTPUT_CHUNK_BYTES - 1) - expect(actual).toEqual(Buffer.from(source)) - expect( - Math.max(...chunks.map((chunk) => chunk.byteLength)), - ).toBeLessThanOrEqual(MAX_HYDRATION_OUTPUT_CHUNK_BYTES) - expect(cleanupCalls.count).toBe(1) - }) - - test('pipeable pass-through handles an encoding set during the first read', async () => { - const { router } = makeRouter({ - reserveFastPath: () => true, - }) - const source = 'français' - const upstream = new Readable({ - read() { - this.setEncoding('utf8') - this.push(Buffer.from(source)) - this.push(null) - }, - }) - - const out = transformPipeableStreamWithRouter(router as any, upstream) - const actual = await readAllPipeableBytes(out) - - expect(actual).toEqual(Buffer.from(source)) - }) - - test('pipeable merge path encodes string records independently', async () => { - const { router, emitScriptBatch, finishSerialization } = makeRouter() - const highSurrogate = String.fromCharCode(0xd83d) - const lowSurrogate = String.fromCharCode(0xde00) - const prefix = `${SCRIPT_BARRIER_HTML}` - const records = [prefix, highSurrogate, lowSurrogate, DOCUMENT_CLOSE] - const upstream = Readable.from(records) - const out = transformPipeableStreamWithRouter(router as any, upstream) - const parts = ['streamed()'] - - emitScriptBatch(parts) - finishSerialization() - - const actual = await readAllPipeableBytes(out) - const expected = Buffer.concat( - [ - prefix, - renderScriptBatch(parts), - highSurrogate, - lowSurrogate, - DOCUMENT_CLOSE, - ].map((record) => Buffer.from(record)), - ) - - expect(actual).toEqual(expected) - expect(actual.includes(Buffer.from('😀'))).toBe(false) - }) - - test('pipeable merge path bounds one large string record', async () => { - const { router, cleanupCalls, emitScriptBatch, finishSerialization } = - makeRouter() - const source = makeLargeStringRecord( - '
', - `
${SCRIPT_BARRIER_HTML}${DOCUMENT_CLOSE}`, - ) - const parts = ['streamed()'] - const routerScript = renderScriptBatch(parts) - const expected = - source.slice(0, -DOCUMENT_CLOSE.length) + routerScript + DOCUMENT_CLOSE - const upstream = Readable.from([source]) - const out = transformPipeableStreamWithRouter(router as any, upstream) - - emitScriptBatch(parts) - finishSerialization() - - const chunks = await readAllPipeableChunks(out) - const actual = Buffer.concat(chunks) - - expect(source.indexOf('😀')).toBe(MAX_HYDRATION_OUTPUT_CHUNK_BYTES - 1) - expect(actual).toEqual(Buffer.from(expected)) - expect(actual.indexOf(Buffer.from(routerScript))).toBeGreaterThan( - actual.indexOf(Buffer.from(SCRIPT_BARRIER_HTML)), - ) - expect(actual.indexOf(Buffer.from(routerScript))).toBeLessThan( - actual.lastIndexOf(Buffer.from(DOCUMENT_CLOSE)), - ) - expect( - Math.max(...chunks.map((chunk) => chunk.byteLength)), - ).toBeLessThanOrEqual(MAX_HYDRATION_OUTPUT_CHUNK_BYTES) - expect(cleanupCalls.count).toBe(1) - }) - - test('record-end does not split one large Node string record', async () => { - const { router, emitScriptBatch, finishSerialization, cleanupCalls } = - makeRouter() - const prefix = `${SCRIPT_BARRIER_HTML}` - const largeRecord = 'x'.repeat(MAX_HYDRATION_OUTPUT_CHUNK_BYTES * 2) - const parts = ['streamed()'] - const routerScript = renderScriptBatch(parts) - const upstream = Readable.from([prefix, largeRecord, DOCUMENT_CLOSE]) - const out = transformPipeableStreamWithRouter(router as any, upstream, { - rendererSafePoint: 'record-end', - }) - const iterator = out[Symbol.asyncIterator]() - const chunks = [Buffer.from((await iterator.next()).value)] - - chunks.push(Buffer.from((await iterator.next()).value)) - expect(chunks[0]).toEqual(Buffer.from(prefix)) - expect(chunks[1]).toEqual( - Buffer.alloc(MAX_HYDRATION_OUTPUT_CHUNK_BYTES, 'x'), - ) - - emitScriptBatch(parts) - finishSerialization() - - for (;;) { - const { done, value } = await iterator.next() - if (done) { - break - } - chunks.push(Buffer.from(value)) - } - - const actual = Buffer.concat(chunks) - const expected = Buffer.from( - prefix + largeRecord + routerScript + DOCUMENT_CLOSE, - ) - - expect(actual).toEqual(expected) - expect(actual.indexOf(Buffer.from(routerScript))).toBe( - Buffer.byteLength(prefix + largeRecord), - ) - expect(cleanupCalls.count).toBe(1) - }) - - test('cancelling a large Node string drain tears down once', async () => { - const { router, cleanupCalls } = makeRouter({ - reserveFastPath: () => true, - }) - const source = makeLargeStringRecord('', '') - let upstreamCancellations = 0 - let pushed = false - const upstream = new Readable({ - objectMode: true, - read() { - if (!pushed) { - pushed = true - this.push(source) - } - }, - destroy(_error, callback) { - upstreamCancellations++ - callback() - }, - }) - const upstreamClosed = new Promise((resolve) => { - upstream.once('close', resolve) - }) - const onAbort = vi.fn() - const out = transformReadableStreamWithRouter( - router as any, - Readable.toWeb(upstream) as any, - { - onAbort, - }, - ) - const reader = out.getReader() - const first = await reader.read() - - expect(first.value!.byteLength).toBe(MAX_HYDRATION_OUTPUT_CHUNK_BYTES - 1) - - const reason = new Error('consumer stopped') - await reader.cancel(reason) - await upstreamClosed - await flush() - - expect(upstreamCancellations).toBe(1) - expect(onAbort).toHaveBeenCalledOnce() - expect(cleanupCalls.count).toBe(1) - }) - test('onAbort: fires when pipeable wrapper consumer destroys', async () => { const { router, finishSerialization } = makeRouter() finishSerialization() @@ -2749,13 +1053,12 @@ describe('transformReadableStreamWithRouter — hydration output ordering', () = expect(aborts).toBe(1) // Cleanup: destroy upstream so we don't leak. - if (!pass.destroyed) { - pass.destroy() - } + if (!pass.destroyed) pass.destroy() }) test('onAbort: lifetime timeout triggers abort exactly once', async () => { vi.useFakeTimers() + const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}) try { const { router, finishSerialization } = makeRouter() @@ -2773,24 +1076,19 @@ describe('transformReadableStreamWithRouter — hydration output ordering', () = const out = transformReadableStreamWithRouter( router as any, upstream as any, - { - onAbort: () => aborts++, - lifetimeMs: 1000, - }, + { onAbort: () => aborts++, lifetimeMs: 1000 }, ) - // Start reading before the lifetime watchdog errors the stream. + // Start reading (which may reject when stream is errored) const reader = (out as any).getReader() - const readP = reader.read() - const readError = expect(readP).rejects.toThrow( - 'Stream lifetime exceeded', - ) + const readP = reader.read().catch(() => undefined) await vi.advanceTimersByTimeAsync(1500) - await readError + await readP expect(aborts).toBe(1) } finally { + errorSpy.mockRestore() warnSpy.mockRestore() vi.useRealTimers() } @@ -2813,23 +1111,17 @@ describe('transformReadableStreamWithRouter — hydration output ordering', () = const out = transformReadableStreamWithRouter( router as any, upstream as any, - { - onAbort: () => aborts++, - timeoutMs: 10, - }, + { onAbort: () => aborts++, timeoutMs: 10 }, ) const reader = (out as any).getReader() - const readP = reader.read() - const readError = expect(readP).rejects.toThrow( - 'Stream lifetime exceeded', - ) + const readP = reader.read().catch(() => undefined) await vi.advanceTimersByTimeAsync(15) expect(aborts).toBe(0) await vi.advanceTimersByTimeAsync(6) - await readError + await readP expect(aborts).toBe(1) } finally { errorSpy.mockRestore() @@ -2842,10 +1134,10 @@ describe('transformReadableStreamWithRouter — hydration output ordering', () = const { router, finishSerialization } = makeRouter() finishSerialization() - // Simulate a synchronous producer setup failure: a TransformStream is + // Simulate the Vue sync-setup-throw recovery path: a TransformStream is // handed to the router transform, and the producer never writes before - // aborting the writable side. The router transform's readable must resolve - // (with done or an error) rather than wait for lifetimeMs. + // aborting the writable side. The router transform's readable must + // resolve (with done or an error) rather than wait for lifetimeMs. const ts = new TransformStream() const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) try { @@ -2853,9 +1145,7 @@ describe('transformReadableStreamWithRouter — hydration output ordering', () = const out = transformReadableStreamWithRouter( router as any, ts.readable as any, - { - onAbort: () => aborts++, - }, + { onAbort: () => aborts++ }, ) void ts.writable.abort(new Error('setup-throw')).catch(() => {}) diff --git a/packages/router-core/tests/utils.test.ts b/packages/router-core/tests/utils.test.ts index baeb751e8f..3a5bfa7030 100644 --- a/packages/router-core/tests/utils.test.ts +++ b/packages/router-core/tests/utils.test.ts @@ -4,235 +4,11 @@ import { deepEqual, encodePathLikeUrl, escapeHtml, - hasOwn, isPlainArray, - isPlainObject, - nullReplaceEqualDeep, replaceEqualDeep, } from '../src/utils' -import { decode } from '../src/qss' describe('replaceEqualDeep', () => { - it('reuses the next object when its children need no replacements', () => { - const shared = Object.freeze({ id: 1 }) - const prev = Object.freeze({ shared, page: 1 }) - const next = Object.freeze({ shared, page: 2 }) - - expect(replaceEqualDeep(prev, next)).toBe(next) - }) - - it('reuses a changed null-prototype search record', () => { - const prev = decode('page=1&sort=newest') - const next = decode('page=2&sort=newest') - - expect(nullReplaceEqualDeep(prev, next)).toBe(next) - }) - - it('reuses a changed ordinary object in null-prototype mode', () => { - const prev = decode('page=1&sort=newest') - const next = { page: '2', sort: 'newest' } - const result = nullReplaceEqualDeep(prev, next) - - expect(result).toBe(next) - expect(Object.getPrototypeOf(result)).toBe(Object.prototype) - }) - - it('returns the previous signed zero when strict equality matches', () => { - expect(replaceEqualDeep(-0, 0)).toBe(-0) - expect(replaceEqualDeep(0, -0)).toBe(0) - }) - - it.each([false, true])( - 'uses the same signed-zero sharing rule for every child (nullProto=%s)', - (nullProto) => { - const prev = { first: -0, changed: 1, last: -0 } - const next = { first: 0, changed: 2, last: 0 } - const result = replaceEqualDeep(prev, next, nullProto) - expect(result).not.toBe(next) - expect(Object.getPrototypeOf(result)).toBe( - nullProto ? null : Object.prototype, - ) - expect(result.first).toBe(-0) - expect(result.changed).toBe(2) - expect(result.last).toBe(-0) - expect(replaceEqualDeep([-0, 1, -0], [0, 2, 0], nullProto)).toStrictEqual( - [-0, 2, -0], - ) - }, - ) - - // Known unsupported edge case for ordinary object copies. - it.skip('copies an own __proto__ property as data in the incoming key order', () => { - const prev = JSON.parse('{"first":1,"__proto__":{"shared":1},"last":1}') - const next = JSON.parse('{"first":2,"__proto__":{"shared":1},"last":1}') - const result = replaceEqualDeep(prev, next) - expect(Object.getPrototypeOf(result)).toBe(Object.prototype) - expect(hasOwn.call(result, '__proto__')).toBe(true) - expect(result.__proto__).toBe(prev.__proto__) - expect(Object.keys(result)).toEqual(Object.keys(next)) - expect(result).toStrictEqual(next) - }) - - it.skip.each([undefined, { shared: 1 }])( - 'preserves a newly added own __proto__ property with value %j', - (value) => { - const prev = { first: 1, last: 1 } - const next = { first: 1, ['__proto__']: value, last: 1 } - const result = replaceEqualDeep(prev, next) - expect(Object.getPrototypeOf(result)).toBe(Object.prototype) - expect(hasOwn.call(result, '__proto__')).toBe(true) - expect(result.__proto__).toBe(value) - expect(Object.keys(result)).toEqual(Object.keys(next)) - expect(result).toStrictEqual(next) - }, - ) - - it('shares children without changing recursively frozen inputs', () => { - const prev = Object.freeze({ - items: Object.freeze([ - Object.freeze({ id: 1 }), - Object.freeze({ id: 2 }), - ]), - page: 1, - }) - const next = Object.freeze({ - items: Object.freeze([ - Object.freeze({ id: 1 }), - Object.freeze({ id: 3 }), - ]), - page: 2, - }) - const result = replaceEqualDeep(prev, next) - expect(result).toStrictEqual(next) - expect(result.items[0]).toBe(prev.items[0]) - expect(next.items[0]).not.toBe(prev.items[0]) - expect(prev.items[1]?.id).toBe(2) - expect(next.items[1]?.id).toBe(3) - }) - - it('preserves special numbers and explicit undefined in changed frozen arrays', () => { - const prev = Object.freeze([-0, NaN, Infinity, 2 ** 40, 1.5, undefined, 1]) - const next = Object.freeze([0, NaN, Infinity, 2 ** 40, 1.5, undefined, 2]) - const result = replaceEqualDeep(prev, next) - expect(result).toStrictEqual([ - -0, - NaN, - Infinity, - 2 ** 40, - 1.5, - undefined, - 2, - ]) - expect(hasOwn.call(result, 5)).toBe(true) - expect(next[0]).toBe(0) - expect(prev[6]).toBe(1) - }) - - it('ignores auxiliary array metadata without using its constructor or iterator', () => { - const fail = () => { - throw new Error('array metadata must not be invoked') - } - const decorate = (values: Array) => - Object.freeze( - Object.defineProperties(values, { - metadata: { value: 'ignored' }, - constructor: { value: { [Symbol.species]: fail } }, - [Symbol.iterator]: { value: fail }, - }), - ) - const child = Object.freeze({ id: 1 }) - const prev = decorate([child, 1]) - const equal = decorate([{ id: 1 }, 1]) - const next = decorate([{ id: 1 }, 2]) - - expect(replaceEqualDeep(prev, equal)).toBe(prev) - const result = replaceEqualDeep(prev, next) - expect(result).toStrictEqual([child, 2]) - expect(result[0]).toBe(child) - expect(Object.keys(result)).toEqual(['0', '1']) - expect(Object.getOwnPropertySymbols(result)).toEqual([]) - expect(prev[1]).toBe(1) - expect(next[0]).not.toBe(child) - }) - - it.each(['prev', 'next'])( - 'preserves incoming values with a non-enumerable array index on %s', - (side) => { - const prev = [{ id: 1 }, 1] - const next = [{ id: 1 }, 2] - Object.defineProperty(side === 'prev' ? prev : next, '1', { - enumerable: false, - }) - const result = replaceEqualDeep(prev, next) - expect(result).toStrictEqual(next) - expect(Object.getOwnPropertyDescriptor(result, '1')?.enumerable).toBe( - Object.getOwnPropertyDescriptor(next, '1')?.enumerable, - ) - }, - ) - - it('does not consider separate NaN children strictly equal', () => { - const prev = { value: NaN } - const next = { value: NaN } - const result = replaceEqualDeep(prev, next) - expect(result).not.toBe(prev) - expect(result).toStrictEqual(next) - }) - - it.each([0, 1, 8, 16])( - 'resolves deeply equal children after %i identical array entries', - (length) => { - const prefix = Array.from({ length }, (_, index) => index) - const shared = { child: { value: 1 } } - const prev = [...prefix, shared, { version: 1 }] - const equal = [...prefix, { child: { value: 1 } }, { version: 1 }] - expect(replaceEqualDeep(prev, equal)).toBe(prev) - - const next = [...prefix, { child: { value: 1 } }, { version: 2 }] - const result = replaceEqualDeep(prev, next) - expect(result).toStrictEqual(next) - expect(result).not.toBe(prev) - expect(result).not.toBe(next) - expect(result[length]).toBe(shared) - }, - ) - - it('bounds recursion for cyclic records', () => { - const prev: any = { value: 1 } - const next: any = { value: 2 } - prev.self = prev - next.self = next - const result = replaceEqualDeep(prev, next) - expect(result.value).toBe(2) - expect(result.self).toBe(next) - }) - - it.each([0, 1])( - 'bounds recursion for cyclic arrays with %s preceding values', - (index) => { - const prev: Array = index ? [1] : [] - const next: Array = index ? [2] : [] - prev.push(prev) - next.push(next) - const result = replaceEqualDeep(prev, next) - let tail = result - for (let i = 0; i < 1000 && tail !== next; i++) { - tail = tail[index] - } - expect(tail).toBe(next) - if (index) { - expect(result[0]).toBe(2) - } - expect(prev[index]).toBe(prev) - expect(next[index]).toBe(next) - }, - ) - - it('preserves identity even when the recursion budget is exhausted', () => { - const value = [{ id: 1 }] - expect(replaceEqualDeep(value, value, false, 10_000)).toBe(value) - }) - it('should return the same object if the input objects are equal', () => { const obj = { a: 1, b: 2 } const result = replaceEqualDeep(obj, obj) @@ -261,20 +37,20 @@ describe('replaceEqualDeep', () => { }) describe('symbol properties', () => { - it('passes objects with differing symbol values through untouched', () => { + it('should look at symbol properties in the object comparison', () => { const propertyKey = Symbol('property') const obj1 = { a: 1, [propertyKey]: 2 } const obj2 = { a: 1, [propertyKey]: 3 } const result = replaceEqualDeep(obj1, obj2) - expect(result).toBe(obj2) + expect(result).toStrictEqual(obj2) }) - it('never copies an object with symbol properties partially', () => { + it('should copy over symbol properties when creating a new object', () => { const propertyKey = Symbol('property') const obj1 = { a: 1, [propertyKey]: 2 } const obj2 = { a: 3, [propertyKey]: 2 } const result = replaceEqualDeep(obj1, obj2) - expect(result).toBe(obj2) + expect(result).toStrictEqual(obj2) }) }) @@ -358,6 +134,7 @@ describe('replaceEqualDeep', () => { const result = replaceEqualDeep(prev, next) expect(result).toEqual(next) expect(result).not.toBe(prev) + expect(result).not.toBe(next) }) it('should return a copy when the previous value is a different array superset', () => { @@ -366,6 +143,7 @@ describe('replaceEqualDeep', () => { const result = replaceEqualDeep(prev, next) expect(result).toEqual(next) expect(result).not.toBe(prev) + expect(result).not.toBe(next) }) it('should return the previous value when the next value is an equal empty array', () => { @@ -406,6 +184,7 @@ describe('replaceEqualDeep', () => { expect(result).not.toBe(next) expect(result[0]).toBe(prev[0]) expect(result[1]).toBe(prev[1]) + expect(result[2]).not.toBe(next[2]) expect(result[2].b.b).toBe(next[2].b.b) expect(result[3]).toBe(prev[3]) }) @@ -473,35 +252,6 @@ describe('replaceEqualDeep', () => { expect(result).toBe(next) }) - // A hole and an extra key cancel out in `Object.keys(array).length`, so the - // key count alone would admit such an array and the copy would drop the key - // and fill the hole. - describe('non-dense arrays', () => { - it('passes a sparse array with an extra key through untouched', () => { - const next = Object.assign([1, ,], { extra: 'x' }) as Array - expect(Object.keys(next)).toHaveLength(next.length) - expect(replaceEqualDeep([1, 3], next)).toBe(next) - expect(replaceEqualDeep([1, undefined], next)).toBe(next) - }) - - it('does not reuse a sparse previous array with a compensating extra key', () => { - const prev = Object.assign([1, ,], { extra: 'old' }) - const next = [1, undefined] - expect(Object.keys(prev)).toHaveLength(prev.length) - expect(replaceEqualDeep(prev, next)).toBe(next) - }) - - it('still shares dense arrays', () => { - const prev = [1, 2, undefined] - expect(replaceEqualDeep(prev, [1, 2, undefined])).toBe(prev) - expect(replaceEqualDeep(prev, [1, 3, undefined])).toStrictEqual([ - 1, - 3, - undefined, - ]) - }) - }) - it('should replace all parent objects if some nested value changes', () => { const prev = { todo: { id: '1', meta: { createdAt: 0 }, state: { done: false } }, @@ -519,6 +269,7 @@ describe('replaceEqualDeep', () => { expect(result.todo).not.toBe(next.todo) expect(result.todo.id).toBe(next.todo.id) expect(result.todo.meta).toBe(prev.todo.meta) + expect(result.todo.state).not.toBe(next.todo.state) expect(result.todo.state.done).toBe(next.todo.state.done) expect(result.otherTodo).toBe(prev.otherTodo) }) @@ -546,6 +297,7 @@ describe('replaceEqualDeep', () => { expect(result.todos[0]).not.toBe(next.todos[0]) expect(result.todos[0]?.id).toBe(next.todos[0]?.id) expect(result.todos[0]?.meta).toBe(prev.todos[0]?.meta) + expect(result.todos[0]?.state).not.toBe(next.todos[0]?.state) expect(result.todos[0]?.state.done).toBe(next.todos[0]?.state.done) expect(result.todos[1]).toBe(prev.todos[1]) }) @@ -593,447 +345,6 @@ describe('replaceEqualDeep', () => { next.foo = 'baz' expect(replaceEqualDeep(current, next)).toEqual(next) }) - - describe('sharing children in changed containers', () => { - it('keeps earlier equal entries, including explicit undefined, when a later key differs', () => { - const prev = { a: { x: 1 }, b: undefined, c: 1 } - const next = { a: { x: 1 }, b: undefined, c: 2 } - const result = replaceEqualDeep(prev, next) - expect(result).toStrictEqual(next) - expect(result).not.toBe(prev) - expect(result).not.toBe(next) - expect(result.a).toBe(prev.a) - expect('b' in result).toBe(true) - }) - - it('includes keys that only exist in next before the first difference', () => { - const prev: Record = { a: 1 } - const next = { b: undefined, a: 2 } - const result = replaceEqualDeep(prev, next) - expect(result).toStrictEqual(next) - expect('b' in result).toBe(true) - }) - - it('keeps the key order of next', () => { - const prev = { a: 1, b: 2, c: 3 } - expect(Object.keys(replaceEqualDeep(prev, { c: 3, b: 2, a: 9 }))).toEqual( - ['c', 'b', 'a'], - ) - expect(Object.keys(replaceEqualDeep(prev, { b: 9, a: 1, c: 3 }))).toEqual( - ['b', 'a', 'c'], - ) - }) - - it('copies when only the key sets differ', () => { - const prev = { a: 1, b: 2 } - const next = { a: 1 } - const result = replaceEqualDeep(prev, next) - expect(result).toStrictEqual(next) - expect(result).not.toBe(prev) - }) - - it('returns a longer array when next appends an explicit undefined', () => { - const prev = [1] - const next = [1, undefined] - const result = replaceEqualDeep(prev, next) - expect(result).toStrictEqual(next) - expect(result).toHaveLength(2) - expect(result).not.toBe(prev) - }) - - it('shares equal array entries before and after the first difference', () => { - const prev = [{ a: 1 }, { b: 1 }, { c: 1 }] - const next = [{ a: 1 }, { b: 2 }, { c: 1 }] - const result = replaceEqualDeep(prev, next) - expect(result).toStrictEqual(next) - expect(result[0]).toBe(prev[0]) - expect(result[1]).not.toBe(prev[1]) - expect(result[2]).toBe(prev[2]) - }) - }) - - describe('changed keys and recursive sharing', () => { - it('copies an empty array after a nonempty array', () => { - const prev = [1] - const result = replaceEqualDeep(prev, []) - expect(result).toStrictEqual([]) - expect(result).not.toBe(prev) - }) - - it('appends multiple explicit undefined array entries', () => { - const result = replaceEqualDeep([1], [1, undefined, undefined]) - expect(result).toStrictEqual([1, undefined, undefined]) - expect(hasOwn.call(result, 1)).toBe(true) - expect(hasOwn.call(result, 2)).toBe(true) - }) - it('returns prev for equal objects whose keys are ordered differently', () => { - const prev = { a: 1, b: { x: 1 }, c: 3 } - const next = { c: 3, a: 1, b: { x: 1 } } - expect(replaceEqualDeep(prev, next)).toBe(prev) - }) - - it('copies when a reordered next has a key that prev lacks', () => { - const prev: Record = { a: 1, b: 2 } - const next = { b: 2, c: undefined } - const result = replaceEqualDeep(prev, next) - expect(result).toStrictEqual(next) - expect(result).not.toBe(prev) - expect('c' in result).toBe(true) - expect('a' in result).toBe(false) - }) - - it('includes keys that only exist in next after the first difference', () => { - const prev: Record = { a: 1, b: 2, d: 4 } - const next = { a: 9, b: 2, c: undefined } - const result = replaceEqualDeep(prev, next) - expect(result).toStrictEqual(next) - expect('c' in result).toBe(true) - expect('d' in result).toBe(false) - }) - - it('shares equal children that come after the first difference', () => { - const prev = { a: 1, b: { x: 1 }, c: [1, 2], d: 'same' } - const next = { a: 2, b: { x: 1 }, c: [1, 2], d: 'same' } - const result = replaceEqualDeep(prev, next) - expect(result).toStrictEqual(next) - expect(result.b).toBe(prev.b) - expect(result.c).toBe(prev.c) - }) - - it('recurses into changed children that come after the first difference', () => { - const prev = { a: 1, b: { x: 1, y: { z: 1 } } } - const next = { a: 2, b: { x: 2, y: { z: 1 } } } - const result = replaceEqualDeep(prev, next) - expect(result).toStrictEqual(next) - expect(result.b).not.toBe(prev.b) - expect(result.b).not.toBe(next.b) - expect(result.b.y).toBe(prev.b.y) - }) - - it('takes the next value when an entry changes between object and primitive', () => { - const prev = { a: { x: 1 }, b: null, c: 's', d: [1], e: 0 } - const next = { a: null, b: { x: 1 }, c: {}, d: 's', e: [1] } - const result = replaceEqualDeep(prev, next) - expect(result).toStrictEqual(next) - expect(result.b).toBe(next.b) - expect(result.c).toBe(next.c) - expect(result.e).toBe(next.e) - }) - - it('takes the next value when a later entry changes between object and primitive', () => { - const prev = { k: 0, a: { x: 1 }, b: undefined, c: [1] } - const next = { k: 1, a: undefined, b: { x: 1 }, c: 's' } - const result = replaceEqualDeep(prev, next) - expect(result).toStrictEqual(next) - expect(result.b).toBe(next.b) - }) - - it('copies a shorter next array, sharing its equal prefix', () => { - const prev = [{ a: 1 }, { b: 1 }, { c: 1 }] - const next = [{ a: 1 }, { b: 1 }] - const result = replaceEqualDeep(prev, next) - expect(result).toStrictEqual(next) - expect(result).not.toBe(prev) - expect(result).not.toBe(next) - expect(result[0]).toBe(prev[0]) - expect(result[1]).toBe(prev[1]) - }) - - it('copies a longer next array, sharing the equal prefix', () => { - const prev = [{ a: 1 }] - const next = [{ a: 1 }, { b: 1 }] - const result = replaceEqualDeep(prev, next) - expect(result).toStrictEqual(next) - expect(result[0]).toBe(prev[0]) - expect(result[1]).toBe(next[1]) - }) - - it('copies a next object whose entries all match a larger prev', () => { - const prev = { a: { x: 1 }, b: 2 } - const next = { a: { x: 1 } } - const result = replaceEqualDeep(prev, next) - expect(result).toStrictEqual(next) - expect(result).not.toBe(prev) - expect(result).not.toBe(next) - expect(result.a).toBe(prev.a) - }) - - it('handles a change in the last entry of a long array', () => { - const prev = Array.from({ length: 1024 }, (_, index) => ({ index })) - const next = prev.map((item, index) => - index === 1023 ? { index: -1 } : item, - ) - const result = replaceEqualDeep(prev, next) - expect(result).toStrictEqual(next) - expect(result).not.toBe(prev) - expect(result[0]).toBe(prev[0]) - expect(result[1022]).toBe(prev[1022]) - expect(result[1023]).not.toBe(prev[1023]) - expect(result[1023]).toStrictEqual(next[1023]) - }) - - it('stops sharing beyond the depth limit', () => { - const nest = (depth: number) => { - let value: any = { leaf: true } - for (let i = 0; i < depth; i++) { - value = { child: value } - } - return value - } - const prev = nest(510) - const next = nest(510) - const result = replaceEqualDeep(prev, next) - expect(result).not.toBe(prev) - expect(result).toStrictEqual(next) - }) - }) -}) - -describe('nullReplaceEqualDeep', () => { - it('keeps a shared array prefix and reuses unchanged child results', () => { - const shared = { id: 1 } - const prev = [shared, { id: 2 }] - const next = [shared, { id: 3 }] - const result = nullReplaceEqualDeep(prev, next) - expect(Array.isArray(result)).toBe(true) - expect(result[0]).toBe(shared) - expect(Object.getPrototypeOf(result[0])).toBe(Object.prototype) - expect(result[1]).toBe(next[1]) - expect(Object.getPrototypeOf(result[1])).toBe(Object.prototype) - }) - - it('creates null-prototype copies on the first difference', () => { - const prev = { a: { x: 1 }, b: 2 } - const result = nullReplaceEqualDeep(prev, { a: { x: 1 }, b: 3 }) - expect(Object.getPrototypeOf(result)).toBeNull() - expect(result.a).toBe(prev.a) - expect(result.b).toBe(3) - }) - - it('creates null-prototype copies when only the key sets differ', () => { - const prev = { a: { x: 1 } } - const result = nullReplaceEqualDeep(prev, { a: { x: 1 }, b: undefined }) - expect(Object.getPrototypeOf(result)).toBeNull() - expect(result.a).toBe(prev.a) - expect('b' in result).toBe(true) - }) - - it('reuses a changed child when only the root needs a null-prototype copy', () => { - const prev = { shared: { x: 1 }, changed: { y: 1 } } - const next = { shared: { x: 1 }, changed: { y: 2 } } - const result = nullReplaceEqualDeep(prev, next) - expect(Object.getPrototypeOf(result)).toBeNull() - expect(result.changed).toBe(next.changed) - expect(result.shared).toBe(prev.shared) - }) - - it('creates null-prototype copies at every level that needs replacements', () => { - const prev = { outer: { shared: { id: 1 }, page: 1 } } - const next = { outer: { shared: { id: 1 }, page: 2 } } - const result = nullReplaceEqualDeep(prev, next) - expect(Object.getPrototypeOf(result)).toBeNull() - expect(Object.getPrototypeOf(result.outer)).toBeNull() - expect(result.outer.shared).toBe(prev.outer.shared) - expect(result.outer.page).toBe(2) - expect(prev).toStrictEqual({ outer: { shared: { id: 1 }, page: 1 } }) - expect(next).toStrictEqual({ outer: { shared: { id: 1 }, page: 2 } }) - }) - - it('stores an own __proto__ key instead of changing the prototype', () => { - const prev = { name: 'Bob', shared: { id: 1 } } - const next = JSON.parse( - '{"__proto__":{"isAdmin":true},"name":"Alice","shared":{"id":1}}', - ) - const result = nullReplaceEqualDeep(prev, next) - expect(result.shared).toBe(prev.shared) - expect(Object.getPrototypeOf(result)).toBeNull() - expect(hasOwn.call(result, '__proto__')).toBe(true) - expect(result['__proto__']).toEqual({ isAdmin: true }) - expect(result.name).toBe('Alice') - expect(({} as any).isAdmin).toBeUndefined() - }) - - it('returns prev when a plain next equals a null-prototype prev', () => { - const prev = Object.assign(Object.create(null), { a: 1, b: { c: 2 } }) - expect(nullReplaceEqualDeep(prev, { a: 1, b: { c: 2 } })).toBe(prev) - }) -}) - -describe('isPlainObject', () => { - it.each([ - [ - 'null-prototype record', - Object.assign(Object.create(null), { inherited: 1 }), - ], - ['null constructor', { constructor: null }], - ['undefined constructor', { constructor: undefined }], - ])('shares records inheriting from a %s', (_name, proto) => { - const prev = Object.assign(Object.create(proto), { - child: { id: 1 }, - page: 1, - }) - const equal = Object.assign(Object.create(proto), { - child: { id: 1 }, - page: 1, - }) - const next = Object.assign(Object.create(proto), { - child: { id: 1 }, - page: 2, - }) - - expect(isPlainObject(prev)).toBe(true) - expect(deepEqual(prev, equal)).toBe(true) - expect(replaceEqualDeep(prev, equal)).toBe(prev) - const result = replaceEqualDeep(prev, next) - expect(result.child).toBe(prev.child) - expect(result.page).toBe(2) - expect(Object.keys(result)).toEqual(['child', 'page']) - }) - - it.each([ - ['object literal', {}], - ['object literal with keys', { a: 1 }], - ['Object.create(null)', Object.create(null)], - ['object inheriting from a literal', Object.create({ inherited: 1 })], - ['JSON.parse result', JSON.parse('{"a":1}')], - ['frozen literal', Object.freeze({ a: 1 })], - ['new Object()', new Object()], - ['literal with an own constructor key', { constructor: 'foo' }], - [ - 'null-prototype object with an own constructor key', - Object.assign(Object.create(null), { constructor: 'foo' }), - ], - ['decoded search with a constructor key', decode('constructor=foo&page=1')], - ])('returns true for %s', (_name, value) => { - expect(isPlainObject(value)).toBe(true) - }) - - class Foo { - a = 1 - } - - it.each([ - ['null', null], - ['undefined', undefined], - ['number', 1], - ['string', 'a'], - ['boolean', true], - ['symbol', Symbol('s')], - ['function', () => {}], - ['empty array', []], - ['array', [1]], - ['Map', new Map()], - ['Set', new Set()], - ['Date', new Date()], - ['RegExp', /x/], - ['Promise', Promise.resolve()], - ['class instance', new Foo()], - ['Object.create(class prototype)', Object.create(Foo.prototype)], - [ - 'class instance with an own constructor key', - Object.assign(new Foo(), { constructor: 'foo' }), - ], - ])('returns false for %s', (_name, value) => { - expect(isPlainObject(value)).toBe(false) - }) - - it.each([ - ['string', 'foo'], - ['number', 1], - ['boolean', false], - ['null', null], - ['undefined', undefined], - ['array', ['a', 'b']], - ['object', { nested: 1 }], - ])('stays plain with a %s-valued constructor key', (_name, value) => { - expect(isPlainObject({ constructor: value })).toBe(true) - expect( - isPlainObject(Object.assign(Object.create(null), { constructor: value })), - ).toBe(true) - }) - - it.each([ - ['literal', Object.prototype], - ['null-prototype', null], - ])( - 'treats a constructor key as data in %s search records', - (_name, proto) => { - const makeSearch = (constructor: string) => - Object.assign(Object.create(proto), { - constructor, - filters: { status: 'open' }, - }) - const share = proto === null ? nullReplaceEqualDeep : replaceEqualDeep - - const prev = makeSearch('foo') - const equal = makeSearch('foo') - const changed = makeSearch('bar') - - expect(isPlainObject(prev)).toBe(true) - expect(deepEqual(prev, equal)).toBe(true) - expect(share(prev, equal)).toBe(prev) - - expect(deepEqual(prev, changed)).toBe(false) - const result = share(prev, changed) - expect(result).not.toBe(prev) - expect(result.constructor).toBe('bar') - expect(result.filters).toBe(prev.filters) - expect(Object.getPrototypeOf(result)).toBe(proto) - }, - ) - - it('shares decoded search records that carry a constructor key', () => { - const prev = decode('constructor=foo&page=1') - expect(prev.constructor).toBe('foo') - - expect(nullReplaceEqualDeep(prev, decode('constructor=foo&page=1'))).toBe( - prev, - ) - expect(deepEqual(prev, decode('page=1&constructor=foo'))).toBe(true) - - const changed = nullReplaceEqualDeep(prev, decode('constructor=bar&page=1')) - expect(changed).not.toBe(prev) - expect(changed.constructor).toBe('bar') - expect(changed.page).toBe(1) - - const repeated = decode('constructor=a&constructor=b') - expect(repeated.constructor).toStrictEqual(['a', 'b']) - expect(deepEqual(repeated, decode('constructor=a&constructor=b'))).toBe( - true, - ) - }) - - it('keeps class instances opaque for structural sharing and equality', () => { - const prev = new Foo() - const next = new Foo() - expect(replaceEqualDeep(prev, next)).toBe(next) - expect(deepEqual(prev, next)).toBe(false) - expect(deepEqual({ foo: prev }, { foo: prev })).toBe(true) - }) - - it.each([null, undefined])( - 'keeps built-ins opaque with an own constructor valued %s', - (constructor) => { - for (const [prev, next] of [ - [new Date(0), new Date(1)], - [new Map([['value', 0]]), new Map([['value', 1]])], - [/before/, /after/], - ]) { - Object.assign(prev!, { constructor }) - Object.assign(next!, { constructor }) - expect(isPlainObject(prev)).toBe(false) - expect(deepEqual(prev, next)).toBe(false) - expect(replaceEqualDeep(prev, next)).toBe(next) - } - }, - ) - - it('treats null-prototype and literal objects alike', () => { - const nullProto = Object.assign(Object.create(null), { a: 1 }) - expect(deepEqual(nullProto, { a: 1 })).toBe(true) - expect(deepEqual({ a: 1 }, nullProto)).toBe(true) - expect(replaceEqualDeep(nullProto, { a: 1 })).toBe(nullProto) - }) }) describe('isPlainArray', () => { @@ -1051,43 +362,43 @@ describe('deepEqual', () => { it('should return `true` for equal objects', () => { const a = { a: { b: 'b' }, c: 'c', d: [{ d: 'd ' }] } const b = { a: { b: 'b' }, c: 'c', d: [{ d: 'd ' }] } - expect(deepEqual(a, b, partial)).toEqual(true) - expect(deepEqual(b, a, partial)).toEqual(true) + expect(deepEqual(a, b, { partial })).toEqual(true) + expect(deepEqual(b, a, { partial })).toEqual(true) }) it('should return `false` for non equal objects', () => { const a = { a: { b: 'b' }, c: 'c' } const b = { a: { b: 'c' }, c: 'c' } - expect(deepEqual(a, b, partial)).toEqual(false) - expect(deepEqual(b, a, partial)).toEqual(false) + expect(deepEqual(a, b, { partial })).toEqual(false) + expect(deepEqual(b, a, { partial })).toEqual(false) }) it('should return `true` for equal objects and ignore `undefined` properties', () => { const a = { a: 'a', b: undefined, c: 'c' } const b = { a: 'a', c: 'c' } - expect(deepEqual(a, b, partial)).toEqual(true) - expect(deepEqual(b, a, partial)).toEqual(true) + expect(deepEqual(a, b, { partial })).toEqual(true) + expect(deepEqual(b, a, { partial })).toEqual(true) }) it('should return `true` for equal objects and ignore `undefined` nested properties', () => { const a = { a: { b: 'b', x: undefined }, c: 'c' } const b = { a: { b: 'b' }, c: 'c', d: undefined } - expect(deepEqual(a, b, partial)).toEqual(true) - expect(deepEqual(b, a, partial)).toEqual(true) + expect(deepEqual(a, b, { partial })).toEqual(true) + expect(deepEqual(b, a, { partial })).toEqual(true) }) it('should return `true` for equal arrays and ignore `undefined` object properties', () => { const a = { a: { b: 'b' }, c: undefined } const b = { a: { b: 'b' } } - expect(deepEqual([a], [b], partial)).toEqual(true) - expect(deepEqual([b], [a], partial)).toEqual(true) + expect(deepEqual([a], [b], { partial })).toEqual(true) + expect(deepEqual([b], [a], { partial })).toEqual(true) }) it('should return `true` for equal arrays and ignore nested `undefined` object properties', () => { const a = { a: { b: 'b', x: undefined }, c: 'c' } const b = { a: { b: 'b' }, c: 'c' } - expect(deepEqual([a], [b], partial)).toEqual(true) - expect(deepEqual([b], [a], partial)).toEqual(true) + expect(deepEqual([a], [b], { partial })).toEqual(true) + expect(deepEqual([b], [a], { partial })).toEqual(true) }) }) @@ -1098,15 +409,15 @@ describe('deepEqual', () => { it('should return `false` for objects', () => { const a = { a: { b: 'b', x: undefined }, c: 'c' } const b = { a: { b: 'b' }, c: 'c', d: undefined } - expect(deepEqual(a, b, partial, !ignoreUndefined)).toEqual(false) - expect(deepEqual(b, a, partial, !ignoreUndefined)).toEqual(false) + expect(deepEqual(a, b, { partial, ignoreUndefined })).toEqual(false) + expect(deepEqual(b, a, { partial, ignoreUndefined })).toEqual(false) }) it('should return `false` for arrays', () => { const a = { a: { b: 'b', x: undefined }, c: 'c' } const b = { a: { b: 'b' }, c: 'c' } - expect(deepEqual([a], [b], partial, !ignoreUndefined)).toEqual(false) - expect(deepEqual([b], [a], partial, !ignoreUndefined)).toEqual(false) + expect(deepEqual([a], [b], { partial, ignoreUndefined })).toEqual(false) + expect(deepEqual([b], [a], { partial, ignoreUndefined })).toEqual(false) }) }) describe('partial = true', () => { @@ -1114,15 +425,15 @@ describe('deepEqual', () => { it('should return `true` for objects', () => { const a = { a: { b: 'b' }, c: 'c' } const b = { a: { b: 'b' }, c: 'c', d: undefined } - expect(deepEqual(a, b, partial, !ignoreUndefined)).toEqual(true) - expect(deepEqual(b, a, partial, !ignoreUndefined)).toEqual(true) + expect(deepEqual(a, b, { partial, ignoreUndefined })).toEqual(true) + expect(deepEqual(b, a, { partial, ignoreUndefined })).toEqual(true) }) it('should return `true` for arrays', () => { const a = { a: { b: 'b', x: undefined }, c: 'c' } const b = { a: { b: 'b' }, c: 'c' } - expect(deepEqual([a], [b], partial, !ignoreUndefined)).toEqual(true) - expect(deepEqual([b], [a], partial, !ignoreUndefined)).toEqual(true) + expect(deepEqual([a], [b], { partial, ignoreUndefined })).toEqual(true) + expect(deepEqual([b], [a], { partial, ignoreUndefined })).toEqual(true) }) }) }) @@ -1131,15 +442,15 @@ describe('deepEqual', () => { it('correctly compares partially equal objects', () => { const a = { a: { b: 'b' }, c: 'c', d: [{ d: 'd ' }] } const b = { a: { b: 'b' }, c: 'c' } - expect(deepEqual(a, b, true)).toEqual(true) - expect(deepEqual(b, a, true)).toEqual(false) + expect(deepEqual(a, b, { partial: true })).toEqual(true) + expect(deepEqual(b, a, { partial: true })).toEqual(false) }) it('correctly compares partially equal objects and ignores `undefined` object properties', () => { const a = { a: { b: 'b' }, c: 'c', d: [{ d: 'd ' }], e: undefined } const b = { a: { b: 'b' }, c: 'c', d: undefined } - expect(deepEqual(a, b, true)).toEqual(true) - expect(deepEqual(b, a, true)).toEqual(false) + expect(deepEqual(a, b, { partial: true })).toEqual(true) + expect(deepEqual(b, a, { partial: true })).toEqual(false) }) }) @@ -1176,7 +487,7 @@ describe('deepEqual', () => { Object.prototype.x = 'x' const a = { a: 1 } const b = { a: 1 } - expect(deepEqual(a, b, false, true)).toEqual(true) + expect(deepEqual(a, b, { ignoreUndefined: false })).toEqual(true) }, ) @@ -1303,14 +614,15 @@ describe('decodePath', () => { }) /** - * Tests for the key handling of replaceEqualDeep. + * Tests for getEnumerableOwnKeys behavior (internal function). + * Tested indirectly through replaceEqualDeep since getEnumerableOwnKeys is not exported. * - * Plain objects are compared and copied by their enumerable own string keys. - * Objects with symbol keys (checked on `next`) or non-enumerable keys are opaque: - * `next` passes through untouched, so no data is dropped and no stale object is - * reused (Apollo's preloadQuery refs carry symbol keys, see #4237). + * getEnumerableOwnKeys should: + * 1. Return array of all enumerable own keys (strings + symbols) + * 2. Return false if any property is non-enumerable + * 3. Handle objects with no symbols efficiently (optimization target) */ -describe('key handling (via replaceEqualDeep)', () => { +describe('getEnumerableOwnKeys behavior (via replaceEqualDeep)', () => { describe('plain objects with string keys only', () => { it('should handle empty objects', () => { const prev = {} @@ -1381,24 +693,24 @@ describe('key handling (via replaceEqualDeep)', () => { }) }) - describe('objects with symbol keys pass through untouched', () => { - it('returns next for a single symbol key', () => { + describe('objects with symbol keys', () => { + it('should handle objects with single symbol key', () => { const sym = Symbol('test') const prev = { [sym]: 1 } const next = { [sym]: 1 } - expect(replaceEqualDeep(prev, next)).toBe(next) + expect(replaceEqualDeep(prev, next)).toBe(prev) }) - it('returns next for multiple symbol keys', () => { + it('should handle objects with multiple symbol keys', () => { const sym1 = Symbol('a') const sym2 = Symbol('b') const sym3 = Symbol('c') const prev = { [sym1]: 1, [sym2]: 2, [sym3]: 3 } const next = { [sym1]: 1, [sym2]: 2, [sym3]: 3 } - expect(replaceEqualDeep(prev, next)).toBe(next) + expect(replaceEqualDeep(prev, next)).toBe(prev) }) - it('keeps differing symbol values', () => { + it('should detect differences in symbol values', () => { const sym = Symbol('test') const prev = { [sym]: 1 } const next = { [sym]: 2 } @@ -1407,100 +719,23 @@ describe('key handling (via replaceEqualDeep)', () => { expect(result[sym]).toBe(2) }) - it('returns next for global symbols', () => { + it('should handle global symbols', () => { const sym = Symbol.for('global.test.key') const prev = { [sym]: 'value' } const next = { [sym]: 'value' } - expect(replaceEqualDeep(prev, next)).toBe(next) - }) - - it('does not share a symbol-keyed prev when next has no symbols', () => { - const sym = Symbol('test') - const prev = { a: 1, [sym]: 1 } - const next = { a: 1 } - expect(replaceEqualDeep(prev, next)).toBe(next) - }) - - it('removes a previous non-enumerable symbol', () => { - const sym = Symbol('hidden') - const prev = Object.defineProperty({ a: 1 }, sym, { value: 'old' }) - const next = { a: 1 } - expect(replaceEqualDeep(prev, next)).toBe(next) - }) - - it.each(['first', 'last'])( - 'removes nested symbols in the %s entry', - (position) => { - const sym = Symbol('metadata') - const removed = { a: 1, [sym]: 'old' } - const shared = { b: 2 } - const prev = - position === 'first' - ? { removed, shared, changed: 0 } - : { changed: 0, shared, removed } - const next = - position === 'first' - ? { removed: { a: 1 }, shared: { b: 2 }, changed: 1 } - : { changed: 1, shared: { b: 2 }, removed: { a: 1 } } - const result = replaceEqualDeep(prev, next) - expect(result).toStrictEqual(next) - expect(result.removed).toBe(next.removed) - expect(result.shared).toBe(shared) - }, - ) - - it('removes symbols by reusing a null-prototype next object', () => { - const sym = Symbol('metadata') - const prev = Object.assign(Object.create(null), { a: 1, [sym]: 'old' }) - const next = Object.assign(Object.create(null), { a: 1 }) - expect(nullReplaceEqualDeep(prev, next)).toBe(next) - }) - - it('preserves incoming values when previous symbols exist in null-prototype mode', () => { - const sym = Symbol('metadata') - const prev = { child: { a: 1 }, page: 1, [sym]: 'old' } - const next = { child: { a: 1 }, page: 2 } - const result = nullReplaceEqualDeep(prev, next) - expect({ ...result }).toStrictEqual(next) - expect(Object.getOwnPropertySymbols(result)).toEqual([]) - expect(result.page).toBe(2) - }) - - it('keeps an opaque next object unchanged in null-prototype mode', () => { - const next = { child: { a: 1 }, [Symbol('metadata')]: 'kept' } - const result = nullReplaceEqualDeep({ child: { a: 1 } }, next) - expect(result).toBe(next) - expect(Object.getPrototypeOf(result)).toBe(Object.prototype) - }) - - it('preserves incoming values when previous symbols accompany changed string keys', () => { - const sym = Symbol('metadata') - const prev = { changed: 0, child: { a: 1 }, [sym]: 'old' } - const next = { changed: 1, child: { a: 1 } } - const result = replaceEqualDeep(prev, next) - expect(result).toStrictEqual(next) - expect(prev[sym]).toBe('old') - }) - - it('preserves incoming values when previous symbols accompany removed string keys', () => { - const sym = Symbol('metadata') - const prev = { removed: 0, child: { a: 1 }, [sym]: 'old' } - const next = { child: { a: 1 } } - const result = replaceEqualDeep(prev, next) - expect(result).toStrictEqual(next) - expect(prev[sym]).toBe('old') + expect(replaceEqualDeep(prev, next)).toBe(prev) }) }) describe('objects with mixed string and symbol keys', () => { - it('returns next when both string and symbol keys are present', () => { + it('should handle objects with both string and symbol keys', () => { const sym = Symbol('test') const prev = { a: 1, b: 2, [sym]: 3 } const next = { a: 1, b: 2, [sym]: 3 } - expect(replaceEqualDeep(prev, next)).toBe(next) + expect(replaceEqualDeep(prev, next)).toBe(prev) }) - it('keeps string differences when symbols present', () => { + it('should detect differences in string keys when symbols present', () => { const sym = Symbol('test') const prev = { a: 1, b: 2, [sym]: 3 } const next = { a: 1, b: 99, [sym]: 3 } @@ -1510,7 +745,7 @@ describe('key handling (via replaceEqualDeep)', () => { expect(result[sym]).toBe(3) }) - it('keeps symbol differences when strings present', () => { + it('should detect differences in symbol keys when strings present', () => { const sym = Symbol('test') const prev = { a: 1, b: 2, [sym]: 3 } const next = { a: 1, b: 2, [sym]: 99 } @@ -1520,20 +755,11 @@ describe('key handling (via replaceEqualDeep)', () => { expect(result[sym]).toBe(99) }) - it('shares plain siblings around a nested symbol-keyed object', () => { + it('should handle complex nested objects with symbols', () => { const sym = Symbol('nested') - const prev = { - outer: { inner: 1, [sym]: { deep: 'value' } }, - plain: { x: 1 }, - } - const next = { - outer: { inner: 1, [sym]: { deep: 'value' } }, - plain: { x: 1 }, - } - const result = replaceEqualDeep(prev, next) - expect(result).not.toBe(prev) - expect(result.outer).toBe(next.outer) - expect(result.plain).toBe(prev.plain) + const prev = { outer: { inner: 1, [sym]: { deep: 'value' } } } + const next = { outer: { inner: 1, [sym]: { deep: 'value' } } } + expect(replaceEqualDeep(prev, next)).toBe(prev) }) }) diff --git a/packages/router-core/tsconfig.json b/packages/router-core/tsconfig.json index 34cb3c4dc9..faf64b9382 100644 --- a/packages/router-core/tsconfig.json +++ b/packages/router-core/tsconfig.json @@ -6,11 +6,5 @@ "@tanstack/router-core/isServer": ["./src/isServer/development.ts"] } }, - "include": [ - "src", - "vite.config.ts", - "tests", - "vite-minify-plugin.ts", - "benchmarks/ssr-streaming/worker.ts" - ] + "include": ["src", "vite.config.ts", "tests", "vite-minify-plugin.ts"] } diff --git a/packages/router-devtools-core/CHANGELOG.md b/packages/router-devtools-core/CHANGELOG.md index 63eb2961dd..be1a138356 100644 --- a/packages/router-devtools-core/CHANGELOG.md +++ b/packages/router-devtools-core/CHANGELOG.md @@ -1,24 +1,5 @@ # @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 - -- [#8321](https://github.com/TanStack/router/pull/8321) [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6) - Consolidate internal path interpolation into `interpolatePath`, returning a pathname directly and collecting metadata only when requested. Update router and devtools callers without changing route parsing or interpolation caching. - -- [#8327](https://github.com/TanStack/router/pull/8327) [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef) - Reuse parsed route segments when generating paths for navigation, Links, and Devtools. Preserve interpolation metadata and refresh segments when the route tree is rebuilt, without reparsing templates for new parameter values. - -- [#8327](https://github.com/TanStack/router/pull/8327) [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef) - Share compact parsed route segments between matching and interpolation, preserve original parameter names, and avoid reparsing templates while building paths. Simplify route-tree traversal, reuse existing path helpers, and keep Devtools-only navigation validation out of the production formatter. Preserve dynamic match identity for standalone legacy fallback routes. - -- Updated dependencies [[`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5), [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef)]: - - @tanstack/router-core@1.171.30 - ## 1.168.1 ### Patch Changes diff --git a/packages/router-devtools-core/package.json b/packages/router-devtools-core/package.json index 24db637cc7..d09debc2df 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.3", + "version": "1.168.1", "description": "Modern and scalable routing for Web applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-devtools-core/src/BaseTanStackRouterDevtoolsPanel.tsx b/packages/router-devtools-core/src/BaseTanStackRouterDevtoolsPanel.tsx index 7efcaffca2..966eb32bc5 100644 --- a/packages/router-devtools-core/src/BaseTanStackRouterDevtoolsPanel.tsx +++ b/packages/router-devtools-core/src/BaseTanStackRouterDevtoolsPanel.tsx @@ -1,8 +1,6 @@ import { clsx as cx } from 'clsx' import { - getRouteSegments, hasKeys, - hasMissingPathParams, interpolatePath, rootRouteId, trimPath, @@ -181,19 +179,19 @@ function RouteComp({ // flatten all params in the router state, into a single object const allParams = Object.assign({}, ...matches().map((m) => m.params)) - const segments = getRouteSegments(route) - const pathname = segments - ? interpolatePath( - route.fullPath, - segments, - allParams, - router().pathParamsDecoder, - ) - : route.fullPath + // interpolatePath is used by router-core to generate the `to` + // path for the navigate function in the router + const interpolated = interpolatePath({ + path: route.fullPath, + params: allParams, + decoder: router().pathParamsDecoder, + }) - return segments && hasMissingPathParams(segments, allParams) - ? undefined - : pathname + // only if `interpolated` is not missing params, return the path since this + // means that all the params are present for a successful navigation + return !interpolated.isMissingParams + ? interpolated.interpolatedPath + : undefined }) return ( diff --git a/packages/router-devtools-core/src/tokens.ts b/packages/router-devtools-core/src/tokens.ts index 97ed9e4cd9..9d247cf184 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, 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)', + '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)', }, lineHeight: { - '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)', + '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)', }, weight: { thin: '100', @@ -220,55 +220,55 @@ export const tokens = { border: { radius: { none: '0px', - 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)', + 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)', full: '9999px', }, }, size: { 0: '0px', - 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)', + 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)', }, shadow: { xs: (_: string = 'rgb(0 0 0 / 0.1)') => diff --git a/packages/router-devtools-core/tests/interpolation-navigation.test.ts b/packages/router-devtools-core/tests/interpolation-navigation.test.ts deleted file mode 100644 index d756d1d5a2..0000000000 --- a/packages/router-devtools-core/tests/interpolation-navigation.test.ts +++ /dev/null @@ -1,90 +0,0 @@ -import { beforeAll, expect, test, vi } from 'vitest' -import { - BaseRootRoute, - BaseRoute, - RouterCore, - createNonReactiveMutableStore, - createNonReactiveReadonlyStore, -} from '@tanstack/router-core' -import { TanStackRouterDevtoolsPanelCore } from '../src/TanStackRouterDevtoolsPanelCore' - -beforeAll(async () => { - await import('../src/BaseTanStackRouterDevtoolsPanel') -}, 30_000) - -test('offers navigation only when required and splat params are available', async () => { - const root = new BaseRootRoute({}) - const routeTree = root.addChildren( - ['/users/$id', '/posts/{-$category}', '/files/$'].map( - (path) => new BaseRoute({ getParentRoute: () => root, path }), - ), - ) - const router = new RouterCore({ routeTree, isServer: false }, () => ({ - createMutableStore: createNonReactiveMutableStore, - createReadonlyStore: createNonReactiveReadonlyStore, - batch: (fn) => fn(), - })) - const navigate = vi.spyOn(router, 'navigate').mockResolvedValue() - const initialState = router.state - const panel = new TanStackRouterDevtoolsPanelCore({ - router, - routerState: initialState, - }) - const container = document.createElement('div') - document.body.append(container) - panel.mount(container) - - try { - await vi.waitFor(() => { - expect( - container.querySelector('[title="Navigate to /posts"]'), - ).not.toBeNull() - }) - expect(container.querySelector('[title^="Navigate to /users/"]')).toBeNull() - expect(container.querySelector('[title^="Navigate to /files"]')).toBeNull() - - panel.setRouterState({ - ...initialState, - matches: router.matchRoutes('/users/item%20one', {}), - }) - await vi.waitFor(() => { - expect( - container.querySelector('[title="Navigate to /users/item%20one"]'), - ).not.toBeNull() - }) - container - .querySelector( - '[title="Navigate to /users/item%20one"]', - )! - .click() - expect(navigate).toHaveBeenCalledWith({ - to: '/users/item%20one', - params: undefined, - search: undefined, - }) - - panel.setRouterState({ - ...initialState, - matches: router.matchRoutes('/files/docs/guide', {}), - }) - await vi.waitFor(() => { - expect( - container.querySelector('[title="Navigate to /files/docs/guide"]'), - ).not.toBeNull() - }) - expect(container.querySelector('[title^="Navigate to /users/"]')).toBeNull() - - panel.setRouterState(initialState) - await vi.waitFor(() => { - expect( - container.querySelector('[title^="Navigate to /files"]'), - ).toBeNull() - }) - } finally { - panel.unmount() - router.history.destroy() - navigate.mockRestore() - container.remove() - window.localStorage.clear() - } -}, 30_000) diff --git a/packages/router-devtools/CHANGELOG.md b/packages/router-devtools/CHANGELOG.md index 201d972d6c..445e7578dc 100644 --- a/packages/router-devtools/CHANGELOG.md +++ b/packages/router-devtools/CHANGELOG.md @@ -1,20 +1,5 @@ # @tanstack/router-devtools -## 1.167.3 - -### Patch Changes - -- Updated dependencies []: - - @tanstack/react-router-devtools@1.167.3 - -## 1.167.2 - -### Patch Changes - -- Updated dependencies [[`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6387d58`](https://github.com/TanStack/router/commit/6387d581eabc6e6a3acc87a0bc924e5a38d9c8b2), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`6387d58`](https://github.com/TanStack/router/commit/6387d581eabc6e6a3acc87a0bc924e5a38d9c8b2), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5)]: - - @tanstack/react-router@1.170.36 - - @tanstack/react-router-devtools@1.167.2 - ## 1.167.1 ### Patch Changes diff --git a/packages/router-devtools/package.json b/packages/router-devtools/package.json index 4158b280d7..65bbae13aa 100644 --- a/packages/router-devtools/package.json +++ b/packages/router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-devtools", - "version": "1.167.3", + "version": "1.167.1", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-generator/AGENTS.md b/packages/router-generator/AGENTS.md deleted file mode 100644 index 1cc70bf370..0000000000 --- a/packages/router-generator/AGENTS.md +++ /dev/null @@ -1,6 +0,0 @@ -# Route generator - -- Preserve the existing `safeFileWrite` path: temporary-file rename, modification-time conflict retry, and post-rename stat. Keep unchanged-write suppression and main/shadow cache rotation; these protect concurrent edits, avoid watcher loops, and discard deleted routes. -- Run the complete `test:unit` target after generator changes. Its runtime phase generates fixture route trees before typechecking their consumers; `test:types` excludes the generator fixtures. -- Add generation cases under `tests/generator//`. Read [`tests/generator.test.ts`](tests/generator.test.ts) for per-case configuration and preprocessing. Change route inputs/configuration or templates, then regenerate route trees and expected snapshots through the test harness. -- `preprocess()` recreates selected route files for `file-modification*` and `custom-scaffolding`. Edit their templates/configuration/preprocessing when changing those inputs; edits to recreated files are overwritten. diff --git a/packages/router-generator/CHANGELOG.md b/packages/router-generator/CHANGELOG.md index a37550d255..90735092da 100644 --- a/packages/router-generator/CHANGELOG.md +++ b/packages/router-generator/CHANGELOG.md @@ -1,107 +1,5 @@ # @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 - -- Updated dependencies [[`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f), [`0c1b5e3`](https://github.com/TanStack/router/commit/0c1b5e38de71b7e81bbf1fd81c73ee0cd68ffe47), [`3cdd1af`](https://github.com/TanStack/router/commit/3cdd1af04b3e2d6f777797ee7bddf285318dd9d2)]: - - @tanstack/router-core@1.171.33 - -## 1.167.38 - -### Patch Changes - -- Updated dependencies [[`cecae54`](https://github.com/TanStack/router/commit/cecae5440b8edaea77c5448fe3d74bbd20fe10a4), [`0103578`](https://github.com/TanStack/router/commit/01035782e53af9b929c784b94ddd64b95efb89c7), [`ce10dcd`](https://github.com/TanStack/router/commit/ce10dcd4d9d3d23738744e453205aad5c6dbd716), [`84936cc`](https://github.com/TanStack/router/commit/84936cc04530bba11059c57b293a794922bbc5aa), [`bbd2336`](https://github.com/TanStack/router/commit/bbd2336b8446de3f7dd85070895e7cf43980183e)]: - - @tanstack/router-core@1.171.32 - -## 1.167.37 - -### Patch Changes - -- Updated dependencies [[`bc80866`](https://github.com/TanStack/router/commit/bc80866f6d6eb3e6f152ee3682eb783c96403e83), [`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a0b2ad9`](https://github.com/TanStack/router/commit/a0b2ad99aee64af08d16b0e4ff26b3ba42a99f0a), [`1ca361b`](https://github.com/TanStack/router/commit/1ca361ba52a627d2f76ab33323bd83d1d0aa65a3)]: - - @tanstack/router-core@1.171.31 - -## 1.167.36 - -### Patch Changes - -- Updated dependencies [[`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5), [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef)]: - - @tanstack/router-core@1.171.30 - -## 1.167.35 - -### Patch Changes - -- [#8300](https://github.com/TanStack/router/pull/8300) [`49bcd4d`](https://github.com/TanStack/router/commit/49bcd4db743dba4a783d5533a42a0f97a5721292) - Refresh compatible build and runtime dependencies. - -- Updated dependencies [[`f9836f1`](https://github.com/TanStack/router/commit/f9836f16f0e25b0a8495f5e01e3f303b1cbc8725), [`49bcd4d`](https://github.com/TanStack/router/commit/49bcd4db743dba4a783d5533a42a0f97a5721292), [`9c1871c`](https://github.com/TanStack/router/commit/9c1871ccc88bc1157186b8b460941a304ec740b8), [`9871c06`](https://github.com/TanStack/router/commit/9871c0625806001d6bf373524821a00303438a91), [`0654c0a`](https://github.com/TanStack/router/commit/0654c0a1a427db24d9af13c1d6ad1217a588c0c9)]: - - @tanstack/router-core@1.171.29 - - @tanstack/router-utils@1.162.3 - ## 1.167.34 ### Patch Changes diff --git a/packages/router-generator/package.json b/packages/router-generator/package.json index e62e105068..6cba4cd15a 100644 --- a/packages/router-generator/package.json +++ b/packages/router-generator/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-generator", - "version": "1.168.0", + "version": "1.167.34", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", @@ -62,7 +62,7 @@ "src" ], "engines": { - "node": "^20.19.0 || >=22.12.0" + "node": ">=20.19" }, "dependencies": { "@babel/types": "catalog:", @@ -85,16 +85,5 @@ "@arethetypeswrong/cli": "catalog:", "publint": "catalog:", "rimraf": "catalog:" - }, - "nx": { - "targets": { - "test:unit": { - "outputs": [ - "...", - "{projectRoot}/tests/generator/*/routeTree.gen.{ts,js}", - "{projectRoot}/tests/generator/file-modification/routes/*/*.tsx" - ] - } - } } } diff --git a/packages/router-generator/src/generator.ts b/packages/router-generator/src/generator.ts index 91f87dadda..e8cd170e40 100644 --- a/packages/router-generator/src/generator.ts +++ b/packages/router-generator/src/generator.ts @@ -1146,7 +1146,6 @@ ${acc.routeTree.map((child) => `${child.variableName}Route: typeof ${getResolved strategy: { type: 'mtime', expectedMtimeMs: updatedCacheEntry.mtimeMs, - expectedContent: existingRouteFile.fileContent, }, }) updatedCacheEntry.mtimeMs = stats.mtimeMs @@ -1207,9 +1206,6 @@ ${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' @@ -1219,8 +1215,13 @@ ${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) @@ -1246,25 +1247,6 @@ ${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({ @@ -1388,7 +1370,6 @@ ${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 a3bb4b746c..747980aa7b 100644 --- a/packages/router-generator/src/utils.ts +++ b/packages/router-generator/src/utils.ts @@ -924,10 +924,9 @@ const inferPath = (routeNode: RouteNode): string => { } /** - * The full path with groups and pathless segments removed. A route group's - * layout (e.g. `/(group)/_layout`) strips down to `''`. + * Infers the full path for use by TS */ -const stripFullPath = (routeNode: RouteNode): string => { +export const inferFullPath = (routeNode: RouteNode): string => { const fullPath = removeGroups( removeLayoutSegmentsAndUnderscoresWithEscape( routeNode.routePath, @@ -950,13 +949,6 @@ const stripFullPath = (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, @@ -1120,12 +1112,8 @@ 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 = stripFullPath(d) + const inferredFullPath = inferFullPath(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 deleted file mode 100644 index caef9449bf..0000000000 --- a/packages/router-generator/tests/childless-pathless-layout.test.ts +++ /dev/null @@ -1,107 +0,0 @@ -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 deleted file mode 100644 index 6550ad562d..0000000000 --- a/packages/router-generator/tests/concurrent-write.test.ts +++ /dev/null @@ -1,148 +0,0 @@ -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 bda946f97b..8f2741b206 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 d3ffbba9e2..e76c675d2c 100644 --- a/packages/router-generator/tests/generator/route-groups/routeTree.snapshot.ts +++ b/packages/router-generator/tests/generator/route-groups/routeTree.snapshot.ts @@ -76,7 +76,6 @@ const fooAsdfbarLayoutXyzLazyRoute = fooAsdfbarLayoutXyzLazyRouteImport ) export interface FileRoutesByFullPath { - '/': typeof barBarRouteWithChildren '/hello': typeof barBarHelloRoute '/asdf': typeof fooAsdfanotherGroupLayoutRouteWithChildren '/asdf/$id': typeof fooAsdfbarIdRoute @@ -86,7 +85,6 @@ export interface FileRoutesByFullPath { '/asdf/xyz': typeof fooAsdfbarLayoutXyzLazyRoute } export interface FileRoutesByTo { - '/': typeof barBarRouteWithChildren '/hello': typeof barBarHelloRoute '/asdf': typeof fooAsdfanotherGroupLayoutRouteWithChildren '/asdf/$id': typeof fooAsdfbarIdRoute @@ -110,7 +108,6 @@ export interface FileRoutesById { export interface FileRouteTypes { fileRoutesByFullPath: FileRoutesByFullPath fullPaths: - | '/' | '/hello' | '/asdf' | '/asdf/$id' @@ -120,7 +117,6 @@ export interface FileRouteTypes { | '/asdf/xyz' fileRoutesByTo: FileRoutesByTo to: - | '/' | '/hello' | '/asdf' | '/asdf/$id' @@ -155,7 +151,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 2267599c15..8a53f3278e 100644 --- a/packages/router-generator/tests/transform.test.ts +++ b/packages/router-generator/tests/transform.test.ts @@ -13,48 +13,7 @@ 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: - "import { createFileRoute } from '@tanstack/react-router'; export const Route = ((createFileRoute('/old'))({}));", - ctx: { target: 'react', routeId: '/new', lazy: false }, - node: makeNode(), - }) - expect(result.result).toBe('modified') - if (result.result === 'modified') { - expect(result.output).toContain("((createFileRoute('/new'))({}))") - } - }) - it('does not treat root route exports as missing Route exports', async () => { const result = await transform({ source: [ @@ -563,95 +522,4 @@ 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/AGENTS.md b/packages/router-plugin/AGENTS.md deleted file mode 100644 index e954110819..0000000000 --- a/packages/router-plugin/AGENTS.md +++ /dev/null @@ -1,7 +0,0 @@ -# Router bundler plugin - -- Preserve one initialization of shared module state across reference and split chunks. Shared extraction includes transitive dependencies and whole destructured declarations; never extract `Route` or bindings that depend on it. The invariant suite in `tests/code-splitter.test.ts` covers these contracts. -- `handleRouteUpdate` is stringified and injected into app modules. Keep runtime dependencies inside the function or explicitly emit them; extracting a helper to plugin module scope breaks the generated function. `tests/handle-route-update.test.ts` executes that emitted code. -- Route HMR rebuilds indexes, clears `resolvePathCache`, replaces lazy-chunk ownership, and refreshes active routes while preserving Fast Refresh component identities. Keep these steps coordinated when adding derived state. -- For code-splitting changes, add inputs under `tests/code-splitter/test-files//`. Regenerate and review reference, virtual, and shared snapshots for every grouping in [`tests/code-splitter.test.ts`](tests/code-splitter.test.ts). -- Check [`tests/constants.ts`](tests/constants.ts) for framework coverage: the snapshot matrix currently covers React and Solid only. Validate affected Vue behavior in Vue router e2e apps. diff --git a/packages/router-plugin/CHANGELOG.md b/packages/router-plugin/CHANGELOG.md index 5b18ae7e6a..a024b28cf8 100644 --- a/packages/router-plugin/CHANGELOG.md +++ b/packages/router-plugin/CHANGELOG.md @@ -1,147 +1,5 @@ # @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 - -- Updated dependencies [[`f5ffd38`](https://github.com/TanStack/router/commit/f5ffd3884ba26778a2a8ce53b379a5bded231676), [`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f), [`0c1b5e3`](https://github.com/TanStack/router/commit/0c1b5e38de71b7e81bbf1fd81c73ee0cd68ffe47), [`3cdd1af`](https://github.com/TanStack/router/commit/3cdd1af04b3e2d6f777797ee7bddf285318dd9d2)]: - - @tanstack/react-router@1.170.40 - - @tanstack/router-core@1.171.33 - - @tanstack/router-generator@1.167.39 - -## 1.168.40 - -### Patch Changes - -- Updated dependencies [[`cecae54`](https://github.com/TanStack/router/commit/cecae5440b8edaea77c5448fe3d74bbd20fe10a4), [`0103578`](https://github.com/TanStack/router/commit/01035782e53af9b929c784b94ddd64b95efb89c7), [`ce10dcd`](https://github.com/TanStack/router/commit/ce10dcd4d9d3d23738744e453205aad5c6dbd716), [`84936cc`](https://github.com/TanStack/router/commit/84936cc04530bba11059c57b293a794922bbc5aa), [`bbd2336`](https://github.com/TanStack/router/commit/bbd2336b8446de3f7dd85070895e7cf43980183e)]: - - @tanstack/router-core@1.171.32 - - @tanstack/react-router@1.170.38 - - @tanstack/router-generator@1.167.38 - -## 1.168.39 - -### Patch Changes - -- Updated dependencies [[`bc80866`](https://github.com/TanStack/router/commit/bc80866f6d6eb3e6f152ee3682eb783c96403e83), [`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a0b2ad9`](https://github.com/TanStack/router/commit/a0b2ad99aee64af08d16b0e4ff26b3ba42a99f0a), [`8e164d2`](https://github.com/TanStack/router/commit/8e164d28f9e9eb1a7301109230d7ece9817492a8), [`1ca361b`](https://github.com/TanStack/router/commit/1ca361ba52a627d2f76ab33323bd83d1d0aa65a3)]: - - @tanstack/router-core@1.171.31 - - @tanstack/react-router@1.170.37 - - @tanstack/router-generator@1.167.37 - -## 1.168.38 - -### Patch Changes - -- Updated dependencies [[`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`6387d58`](https://github.com/TanStack/router/commit/6387d581eabc6e6a3acc87a0bc924e5a38d9c8b2), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5), [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58), [`6387d58`](https://github.com/TanStack/router/commit/6387d581eabc6e6a3acc87a0bc924e5a38d9c8b2), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef)]: - - @tanstack/router-core@1.171.30 - - @tanstack/react-router@1.170.36 - - @tanstack/router-generator@1.167.36 - -## 1.168.37 - -### Patch Changes - -- [#8300](https://github.com/TanStack/router/pull/8300) [`49bcd4d`](https://github.com/TanStack/router/commit/49bcd4db743dba4a783d5533a42a0f97a5721292) - Refresh compatible build and runtime dependencies. - -- Updated dependencies [[`f9836f1`](https://github.com/TanStack/router/commit/f9836f16f0e25b0a8495f5e01e3f303b1cbc8725), [`aee42c6`](https://github.com/TanStack/router/commit/aee42c6b641d8e919bfed9e0f04bb1b72092f3a6), [`49bcd4d`](https://github.com/TanStack/router/commit/49bcd4db743dba4a783d5533a42a0f97a5721292), [`9c1871c`](https://github.com/TanStack/router/commit/9c1871ccc88bc1157186b8b460941a304ec740b8), [`9aec5a7`](https://github.com/TanStack/router/commit/9aec5a7012c47e83ec23bb4763494b72a5e68bfc), [`9871c06`](https://github.com/TanStack/router/commit/9871c0625806001d6bf373524821a00303438a91), [`0654c0a`](https://github.com/TanStack/router/commit/0654c0a1a427db24d9af13c1d6ad1217a588c0c9)]: - - @tanstack/router-core@1.171.29 - - @tanstack/react-router@1.170.34 - - @tanstack/router-generator@1.167.35 - - @tanstack/router-utils@1.162.3 - ## 1.168.36 ### Patch Changes diff --git a/packages/router-plugin/package.json b/packages/router-plugin/package.json index b681bb61a2..815365b847 100644 --- a/packages/router-plugin/package.json +++ b/packages/router-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-plugin", - "version": "1.169.0", + "version": "1.168.36", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", @@ -114,7 +114,7 @@ "!skills/_artifacts" ], "engines": { - "node": "^20.19.0 || >=22.12.0" + "node": ">=20.19" }, "dependencies": { "@babel/core": "catalog:", @@ -124,7 +124,7 @@ "@tanstack/router-generator": "workspace:*", "@tanstack/router-utils": "workspace:*", "chokidar": "catalog:", - "unplugin": "^3.5.0", + "unplugin": "^3.3.0", "zod": "catalog:" }, "devDependencies": { @@ -139,7 +139,6 @@ "react-dom": "catalog:", "@types/react": "catalog:", "@types/react-dom": "catalog:", - "prettier": "^3.9.6", "@arethetypeswrong/cli": "catalog:", "publint": "catalog:", "rimraf": "catalog:", @@ -148,7 +147,7 @@ "peerDependencies": { "@rsbuild/core": ">=1.0.2 || ^2.0.0", "@tanstack/react-router": "workspace:^", - "vite": ">=6.0.0", + "vite": ">=5.0.0 || >=6.0.0 || >=7.0.0 || >=8.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 5353b7e8c0..972584dc96 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 | +| 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 | ### File Convention Options @@ -246,5 +246,5 @@ Changes to `routeTree.gen.ts` are overwritten and can leave source routes, gener ## Cross-References -- `@tanstack/router-core#router-core/code-splitting` — manual code splitting concepts -- `@tanstack/virtual-file-routes#virtual-file-routes` — programmatic route trees +- [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 diff --git a/packages/router-plugin/src/core/code-splitter/compilers.ts b/packages/router-plugin/src/core/code-splitter/compilers.ts index 0cd783a58a..89cdae41ad 100644 --- a/packages/router-plugin/src/core/code-splitter/compilers.ts +++ b/packages/router-plugin/src/core/code-splitter/compilers.ts @@ -364,7 +364,6 @@ function removeSharedDeclarations(ast: t.File, sharedBindings: Set) { export function compileCodeSplitReferenceRoute( opts: ParseAstOptions & CompileCodeSplitReferenceRouteOptions & { - isProduction?: boolean compilerPlugins?: Array }, ): GeneratorResult | null { @@ -848,9 +847,8 @@ export function compileCodeSplitReferenceRoute( ) console.warn(warningMessage) - // 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) { + // append this warning to the file using a template + if (process.env.NODE_ENV !== 'production') { const warningTemplate = template.statement( `console.warn(${JSON.stringify(warningMessage)})`, )() @@ -1287,8 +1285,7 @@ export function compileCodeSplitVirtualRoute( const result = generateFromAst(ast, { sourceMaps: true, - // Name the route file, not this module's `?tsr-*` id. - sourceFileName: removeSplitSearchParamFromFilename(opts.filename), + sourceFileName: opts.filename, filename: opts.filename, }) @@ -1379,8 +1376,7 @@ export function compileCodeSplitSharedRoute( const result = generateFromAst(ast, { sourceMaps: true, - // Name the route file, not this module's `?tsr-*` id. - sourceFileName: removeSplitSearchParamFromFilename(opts.filename), + sourceFileName: 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 94444c1aec..1e8ada32b5 100644 --- a/packages/router-plugin/src/core/code-splitter/plugins.ts +++ b/packages/router-plugin/src/core/code-splitter/plugins.ts @@ -1,7 +1,6 @@ import type babel from '@babel/core' import type * as t from '@babel/types' -import type { Config, DeletableNodes } from '../config' -import type { HmrStyle } from '../hmr' +import type { Config, DeletableNodes, HmrStyle } from '../config' 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 cf4b150807..a0351ad210 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,8 +2,7 @@ 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 } from '../../config' -import type { HmrStyle } from '../../hmr' +import type { Config, HmrStyle } from '../../config' 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 f951d863b3..cc2be62034 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,8 +5,9 @@ import type { ReferenceRouteCompilerPlugin } from '../plugins' const buildReactRefreshIgnoredRouteExportsStatements = template.statements( ` -if (import.meta.hot && typeof window !== 'undefined') { - import.meta.hot.data ??= {} +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 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 f67a189f40..99448f452a 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 '../../hmr' +import type { HmrStyle } from '../../config' 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 6c11241a01..17c0dd08da 100644 --- a/packages/router-plugin/src/core/config.ts +++ b/packages/router-plugin/src/core/config.ts @@ -9,6 +9,7 @@ import type { RouteIds, } from '@tanstack/router-core' import type { CodeSplitGroupings } from './constants' +import type { CodeSplitCompilerPlugin } from './code-splitter/plugins' export const splitGroupingsSchema = z .array( @@ -70,6 +71,25 @@ 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({ @@ -89,6 +109,7 @@ 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) @@ -96,6 +117,11 @@ 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 b3c8545851..4e60f015a1 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, HmrStyle } from './select-adapter' +export type { CreateRouteHmrStatementOpts } 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 5ad2646970..60395a1534 100644 --- a/packages/router-plugin/src/core/hmr/select-adapter.ts +++ b/packages/router-plugin/src/core/hmr/select-adapter.ts @@ -1,16 +1,8 @@ import { createViteHmrStatement } from './vite-adapter' import { createWebpackHmrStatement } from './webpack-adapter' -import type { Config } from '../config' +import type { Config, HmrStyle } 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'] @@ -18,9 +10,9 @@ export type CreateRouteHmrStatementOpts = { } /** - * 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. + * 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. */ 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 5357c45acf..ba8d42a80a 100644 --- a/packages/router-plugin/src/core/hmr/vite-adapter.ts +++ b/packages/router-plugin/src/core/hmr/vite-adapter.ts @@ -4,9 +4,7 @@ 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. 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. + * with a callback that receives the freshly re-imported module. * * `targetFramework` is currently unused — Vite's framework-specific fast-refresh * plugins handle component body patching via their own accept boundaries — but @@ -28,7 +26,8 @@ export function createViteHmrStatement( template.statement( ` if (import.meta.hot) { - const hotData = import.meta.hot.data ??= {} + const hot = import.meta.hot + const hotData = hot.data ??= {} const handleRouteUpdate = ${handleRouteUpdateCode} const initialRouteId = ${routeIdFallback} ?? hotData['tsr-route-id'] if (initialRouteId) { @@ -42,7 +41,7 @@ if (import.meta.hot) { handleRouteUpdate(initialRouteId, Route) hotData['tsr-route-update-handled'] = Route } - import.meta.hot.accept((newModule) => { + 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 ecc7607d59..f1f75d4f3c 100644 --- a/packages/router-plugin/src/core/router-code-splitter-plugin.ts +++ b/packages/router-plugin/src/core/router-code-splitter-plugin.ts @@ -17,6 +17,7 @@ import { getFrameworkHmrCompilerPlugins } from './code-splitter/plugins/framewor import { defaultCodeSplitGroupings, splitRouteIdentNodes, + tsrShared, tsrSplit, } from './constants' import { debug, normalizePath, routeFactoryCallCodeFilter } from './utils' @@ -24,8 +25,7 @@ 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 } from './config' -import type { HmrStyle } from './hmr' +import type { Config, HmrStyle } from './config' 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,12 +99,16 @@ export function createRouterCodeSplitterPlugin( } addHmr = (userConfig.codeSplittingOptions?.addHmr ?? true) && !isProduction - compilerPlugins = addHmr - ? (getFrameworkHmrCompilerPlugins({ - targetFramework: userConfig.target, - hmrStyle, - }) ?? []) - : [] + hmrStyle = userConfig.plugin?.hmr?.style ?? 'vite' + compilerPlugins = [ + ...(addHmr + ? (getFrameworkHmrCompilerPlugins({ + targetFramework: userConfig.target, + hmrStyle, + }) ?? []) + : []), + ...(userConfig.codeSplittingOptions?.compilerPlugins ?? []), + ] virtualRouteCompilerPlugins = compilerPlugins.filter( (plugin) => plugin.onVirtualRouteSplitNode, ) @@ -182,7 +186,6 @@ export function createRouterCodeSplitterPlugin( targetFramework: userConfig.target, filename: id, id, - isProduction, deleteNodes: userConfig.codeSplittingOptions?.deleteNodes ? new Set(userConfig.codeSplittingOptions.deleteNodes) : undefined, @@ -258,6 +261,7 @@ 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?$/, }, @@ -328,13 +332,13 @@ export function createRouterCodeSplitterPlugin( }, rspack(compiler) { - isProduction = (compiler.options.mode ?? 'production') === 'production' + isProduction = compiler.options.mode === 'production' ROOT = process.cwd() initUserConfig() }, webpack(compiler) { - isProduction = (compiler.options.mode ?? 'production') === 'production' + isProduction = compiler.options.mode === '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 5bcaaf8da9..c778e4e8d4 100644 --- a/packages/router-plugin/src/core/router-composed-plugin.ts +++ b/packages/router-plugin/src/core/router-composed-plugin.ts @@ -4,7 +4,6 @@ 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, @@ -31,18 +30,13 @@ 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)) { @@ -55,7 +49,7 @@ export const unpluginRouterComposedFactory: UnpluginFactory< createRouterGeneratorPlugin(options, routerPluginContext), ) const routerCodeSplitter = getPlugin( - createRouterCodeSplitterPlugin(options, routerPluginContext, hmrStyle), + createRouterCodeSplitterPlugin(options, routerPluginContext), ) const result = [ @@ -95,7 +89,7 @@ export const unpluginRouterComposedFactory: UnpluginFactory< if (!isProduction && !userConfig.autoCodeSplitting) { const routerHmr = getPlugin( - createRouterHmrPlugin(options, routerPluginContext, hmrStyle), + createRouterHmrPlugin(options, routerPluginContext), ) 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 50dde9f55c..46dda8c581 100644 --- a/packages/router-plugin/src/core/router-generator-plugin.ts +++ b/packages/router-plugin/src/core/router-generator-plugin.ts @@ -19,6 +19,8 @@ export function createRouterGeneratorPlugin( let userConfig: Config let generator: Generator + const routeGenerationDisabled = () => + userConfig.enableRouteGeneration === false const getRoutesDirectoryPath = () => { return isAbsolute(userConfig.routesDirectory) ? userConfig.routesDirectory @@ -44,6 +46,9 @@ 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 3f14a38be5..e1dc01a43b 100644 --- a/packages/router-plugin/src/core/router-hmr-plugin.ts +++ b/packages/router-plugin/src/core/router-hmr-plugin.ts @@ -7,7 +7,6 @@ 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' /** @@ -19,7 +18,6 @@ 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() @@ -49,6 +47,8 @@ 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 e2c184bb3d..650082964d 100644 --- a/packages/router-plugin/src/esbuild.ts +++ b/packages/router-plugin/src/esbuild.ts @@ -1,6 +1,7 @@ import { createEsbuildPlugin } from 'unplugin' -import { configSchema, getConfig } from './core/config' +import { configSchema } from './core/config' +import { createRouterCodeSplitterPlugin } from './core/router-code-splitter-plugin' import { createRouterGeneratorPlugin } from './core/router-generator-plugin' import { unpluginRouterComposedFactory } from './core/router-composed-plugin' import { createRouterPluginContext } from './core/router-plugin-context' @@ -12,20 +13,6 @@ 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 @@ -46,14 +33,22 @@ const TanStackRouterGeneratorEsbuild = ( } /** - * Route code splitting is not available with esbuild: this entry refuses - * clearly. + * @example + * ```ts + * export default { + * plugins: [TanStackRouterCodeSplitterEsbuild()], + * // ... + * } + * ``` */ const TanStackRouterCodeSplitterEsbuild = ( - _options?: RouterPluginOptions, - _routerPluginContext?: RouterPluginContext, -): never => { - throw new Error(ESBUILD_SPLITTING_ERROR) + options?: RouterPluginOptions, + routerPluginContext?: RouterPluginContext, +) => { + const pluginContext = routerPluginContext ?? defaultRouterPluginContext + return createEsbuildPlugin((pluginOptions: RouterPluginOptions) => + createRouterCodeSplitterPlugin(pluginOptions, pluginContext), + )(options) } /** @@ -65,10 +60,7 @@ const TanStackRouterCodeSplitterEsbuild = ( * } * ``` */ -const TanStackRouterEsbuild = (options: RouterPluginOptions = {}) => { - refuseSplitting(options) - return createEsbuildPlugin(unpluginRouterComposedFactory)(options) -} +const TanStackRouterEsbuild = createEsbuildPlugin(unpluginRouterComposedFactory) const tanstackRouter = TanStackRouterEsbuild export default TanStackRouterEsbuild diff --git a/packages/router-plugin/src/index.ts b/packages/router-plugin/src/index.ts index c892c32671..6a6ad158bb 100644 --- a/packages/router-plugin/src/index.ts +++ b/packages/router-plugin/src/index.ts @@ -1,4 +1,5 @@ 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 { @@ -7,8 +8,16 @@ 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 6020179cce..a31bde74af 100644 --- a/packages/router-plugin/src/rspack.ts +++ b/packages/router-plugin/src/rspack.ts @@ -12,6 +12,35 @@ 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 @@ -39,9 +68,6 @@ const TanStackRouterGeneratorRspack = ( } /** - * Rspack uses webpack-compatible `import.meta.webpackHot` HMR, which the - * code splitter emits for it. - * * @example * ```ts * export default defineConfig({ @@ -61,9 +87,10 @@ const TanStackRouterCodeSplitterRspack = ( const pluginContext = routerPluginContext ?? defaultRouterPluginContext return createRspackPlugin((pluginOptions) => createRouterCodeSplitterPlugin( - pluginOptions as Partial Config)> | undefined, + withWebpackHmrStyle( + pluginOptions as RspackRouterPluginOptions | undefined, + ) as Partial Config)>, pluginContext, - 'webpack', ), )(options) } @@ -82,7 +109,13 @@ const TanStackRouterCodeSplitterRspack = ( * ``` */ const TanStackRouterRspack = /* #__PURE__ */ createRspackPlugin( - unpluginRouterComposedFactory, + (options, meta) => + unpluginRouterComposedFactory( + withWebpackHmrStyle( + options as RspackRouterPluginOptions | undefined, + ) as Partial Config)>, + meta, + ), ) const tanstackRouter = TanStackRouterRspack export default TanStackRouterRspack diff --git a/packages/router-plugin/src/webpack.ts b/packages/router-plugin/src/webpack.ts index 9a0063fd6f..712372565e 100644 --- a/packages/router-plugin/src/webpack.ts +++ b/packages/router-plugin/src/webpack.ts @@ -10,6 +10,26 @@ 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 @@ -30,8 +50,6 @@ const TanStackRouterGeneratorWebpack = ( } /** - * Route HMR in development goes through `import.meta.webpackHot`. - * * @example * ```ts * export default { @@ -46,7 +64,10 @@ const TanStackRouterCodeSplitterWebpack = ( ) => { const pluginContext = routerPluginContext ?? defaultRouterPluginContext return createWebpackPlugin((pluginOptions: Partial | undefined) => - createRouterCodeSplitterPlugin(pluginOptions, pluginContext, 'webpack'), + createRouterCodeSplitterPlugin( + withWebpackHmrStyle(pluginOptions), + pluginContext, + ), )(options) } @@ -60,7 +81,11 @@ const TanStackRouterCodeSplitterWebpack = ( * ``` */ const TanStackRouterWebpack = /* #__PURE__ */ createWebpackPlugin( - unpluginRouterComposedFactory, + (options, meta) => + unpluginRouterComposedFactory( + withWebpackHmrStyle(options as Partial | undefined), + meta, + ), ) const tanstackRouter = TanStackRouterWebpack diff --git a/packages/router-plugin/tests/add-hmr.test.ts b/packages/router-plugin/tests/add-hmr.test.ts index 0d89832f3b..98b3e61a5f 100644 --- a/packages/router-plugin/tests/add-hmr.test.ts +++ b/packages/router-plugin/tests/add-hmr.test.ts @@ -1,13 +1,5 @@ -import { - mkdir, - mkdtemp, - readFile, - readdir, - rm, - writeFile, -} from 'node:fs/promises' +import { readFile, readdir } 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' @@ -15,7 +7,6 @@ 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}`) @@ -46,9 +37,7 @@ describe('add-hmr works', () => { }), }) - await expect( - await formatSnapshot(compileResult?.code || code, filename), - ).toMatchFileSnapshot( + await expect(compileResult?.code || code).toMatchFileSnapshot( path.join(dirs.snapshots, filename.replace('.tsx', '@true.tsx')), ) }, @@ -69,9 +58,7 @@ describe('add-hmr works', () => { targetFramework: framework, }) - await expect( - await formatSnapshot(compileResult?.code || code, filename), - ).toMatchFileSnapshot( + await expect(compileResult?.code || code).toMatchFileSnapshot( path.join(dirs.snapshots, filename.replace('.tsx', '@false.tsx')), ) }, @@ -100,9 +87,7 @@ describe('add-hmr works', () => { }), }) - await expect( - await formatSnapshot(compileResult?.code || code, filename), - ).toMatchFileSnapshot( + await expect(compileResult?.code || code).toMatchFileSnapshot( path.join( getFrameworkDir(framework).snapshots, filename.replace('.tsx', '@webpack-hot.tsx'), @@ -204,174 +189,3 @@ 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 994c89e7b2..48e3768224 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,10 +1,9 @@ -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'), -}) + component: lazyRouteComponent($$splitComponentImporter, 'component') +}); \ No newline at end of file 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 e45f8b634a..4f32369e8f 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,115 +1,109 @@ -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, -}) -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']) + 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']); } export function TSRFastRefreshAnchor() { - return null + return null; } if (import.meta.hot) { - const hotData = (import.meta.hot.data ??= {}) + const hot = import.meta.hot; + const hotData = 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; } - import.meta.hot.accept((newModule) => { + 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 eb655d0287..12e47f429e 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,107 +1,87 @@ -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() -} + }); + hot.accept(); +} \ No newline at end of file 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 e0b52f6ad6..a2983e31bd 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,17 +1,12 @@ -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
-} + return
Pending
; +} \ No newline at end of file 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 441852d762..70c428363e 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,134 +1,120 @@ -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
; } -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'], - ) +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']); } export function TSRFastRefreshAnchor() { - return null + return null; } if (import.meta.hot) { - const hotData = (import.meta.hot.data ??= {}) + const hot = import.meta.hot; + const hotData = 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; } - import.meta.hot.accept((newModule) => { + 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 7e3ad124ae..5daf018617 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,3 +1,6 @@ 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 f45186bdd9..e5a473dc14 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,100 +1,98 @@ -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'], - ) +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']); } export function TSRFastRefreshAnchor() { - return null + return null; } if (import.meta.hot) { - const hotData = (import.meta.hot.data ??= {}) + const hot = import.meta.hot; + const hotData = 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; } - import.meta.hot.accept((newModule) => { + 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 6fac4df1f1..20c9a07798 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,20 +1,25 @@ 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 f9a6875fe7..cb5014cd35 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
; } -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'], - ) +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']); } export function TSRFastRefreshAnchor() { - return null + return null; } if (import.meta.hot) { - const hotData = (import.meta.hot.data ??= {}) + const hot = import.meta.hot; + const hotData = 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; } - import.meta.hot.accept((newModule) => { + 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 5c779d9876..e967791f8d 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,6 +1,10 @@ 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 3bde5adf5c..7ba271c212 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,99 +1,100 @@ -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
; } -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']) +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']); } export function TSRFastRefreshAnchor() { - return null + return null; } if (import.meta.hot) { - const hotData = (import.meta.hot.data ??= {}) + const hot = import.meta.hot; + const hotData = 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; } - import.meta.hot.accept((newModule) => { + 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 43f27087a6..0feadacab5 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,11 +1,14 @@ 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 c96d6f01a5..b66449aebf 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,107 +1,103 @@ -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
; } -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'], - ) +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']); } export function TSRFastRefreshAnchor() { - return null + return null; } if (import.meta.hot) { - const hotData = (import.meta.hot.data ??= {}) + const hot = import.meta.hot; + const hotData = 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; } - import.meta.hot.accept((newModule) => { + 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 112fded569..d80f17484f 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,9 +1,11 @@ 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 112fded569..d80f17484f 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,9 +1,11 @@ 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 8109a89624..4fdd9d1c68 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,3 +1,6 @@ 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 99674604fa..fee0b2f2e6 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,98 +1,97 @@ -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', - ]) +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']); } export function TSRFastRefreshAnchor() { - return null + return null; } if (import.meta.hot) { - const hotData = (import.meta.hot.data ??= {}) + const hot = import.meta.hot; + const hotData = 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; } - import.meta.hot.accept((newModule) => { + 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 e2b672f7b8..5d7e2181f5 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,10 +1,9 @@ -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'), -}) + component: lazyRouteComponent($$splitComponentImporter, 'component') +}); \ No newline at end of file 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 614c38c954..4a925828e2 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,115 +1,109 @@ -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, -}) -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']) + 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']); } export function TSRFastRefreshAnchor() { - return null + return null; } if (import.meta.hot) { - const hotData = (import.meta.hot.data ??= {}) + const hot = import.meta.hot; + const hotData = 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; } - import.meta.hot.accept((newModule) => { + 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 456134aadc..653c0c21f5 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,16 +1,11 @@ -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', - ), -}) + errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') +}); \ No newline at end of file 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 871bf352e0..ca2a7ab2e2 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,130 +1,119 @@ -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, -}) -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']) + 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']); } export function TSRFastRefreshAnchor() { - return null + return null; } if (import.meta.hot) { - const hotData = (import.meta.hot.data ??= {}) + const hot = import.meta.hot; + const hotData = 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; } - import.meta.hot.accept((newModule) => { + 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 cfb23b03d2..4fc3129e14 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,16 +1,11 @@ -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', - ), -}) + 'component': lazyRouteComponent($$splitComponentImporter, 'component'), + 'errorComponent': lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') +}); \ No newline at end of file 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 6d5b2a1fd3..b6f67e67b1 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,130 +1,119 @@ -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, -}) -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']) + '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']); } export function TSRFastRefreshAnchor() { - return null + return null; } if (import.meta.hot) { - const hotData = (import.meta.hot.data ??= {}) + const hot = import.meta.hot; + const hotData = 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; } - import.meta.hot.accept((newModule) => { + 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 10bedc87f0..b09548da57 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,9 +1,8 @@ -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') +}); \ No newline at end of file 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 bc531f9000..754da5c902 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,79 +1,80 @@ -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 hotData = (import.meta.hot.data ??= {}) + const hot = import.meta.hot; + const hotData = 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; } - import.meta.hot.accept((newModule) => { + 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 deleted file mode 100644 index 038f323caf..0000000000 --- a/packages/router-plugin/tests/code-splitter-dead-code.test.ts +++ /dev/null @@ -1,462 +0,0 @@ -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 deleted file mode 100644 index e7c7a504d3..0000000000 --- a/packages/router-plugin/tests/code-splitter-imports-exports.test.ts +++ /dev/null @@ -1,359 +0,0 @@ -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 deleted file mode 100644 index da355b74c2..0000000000 --- a/packages/start-plugin-core/tests/vite/dev-styles.test.ts +++ /dev/null @@ -1,644 +0,0 @@ -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 0b33045be3..39b3e69a9d 100644 --- a/packages/start-plugin-core/vite.config.ts +++ b/packages/start-plugin-core/vite.config.ts @@ -1,40 +1,13 @@ -import { configDefaults, defineConfig, mergeConfig } from 'vitest/config' +import { 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, - 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] } }, - }, - }, - ], + typecheck: { enabled: true }, }, }) diff --git a/packages/start-server-core/AGENTS.md b/packages/start-server-core/AGENTS.md deleted file mode 100644 index af5046c332..0000000000 --- a/packages/start-server-core/AGENTS.md +++ /dev/null @@ -1,6 +0,0 @@ -# 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: 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 fe54531e58..af695d1654 100644 --- a/packages/start-server-core/CHANGELOG.md +++ b/packages/start-server-core/CHANGELOG.md @@ -1,185 +1,5 @@ # @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 - -- [#8297](https://github.com/TanStack/router/pull/8297) [`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f) - Update `seroval` and `seroval-plugins` from 1.6.2 to 1.6.7. This picks up the typed array length guard, the `maxBase64Length` and `compactArrayBufferViews` options, and the `isStream` export. - -- [#8434](https://github.com/TanStack/router/pull/8434) [`e81845f`](https://github.com/TanStack/router/commit/e81845ff1e4fc66d4e4a87f086be65906f7adb94) - Apply route path parameter parsers, including parent-route parsers, before invoking server route handlers so runtime parameters agree with their inferred types. - -- Updated dependencies [[`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f), [`0c1b5e3`](https://github.com/TanStack/router/commit/0c1b5e38de71b7e81bbf1fd81c73ee0cd68ffe47), [`3cdd1af`](https://github.com/TanStack/router/commit/3cdd1af04b3e2d6f777797ee7bddf285318dd9d2), [`76a7c0b`](https://github.com/TanStack/router/commit/76a7c0bfadb42d5f7fe7b9e1748acc7333178c91)]: - - @tanstack/router-core@1.171.33 - - @tanstack/start-client-core@1.170.33 - - @tanstack/start-storage-context@1.167.35 - -## 1.169.37 - -### Patch Changes - -- Updated dependencies [[`cecae54`](https://github.com/TanStack/router/commit/cecae5440b8edaea77c5448fe3d74bbd20fe10a4), [`0103578`](https://github.com/TanStack/router/commit/01035782e53af9b929c784b94ddd64b95efb89c7), [`ce10dcd`](https://github.com/TanStack/router/commit/ce10dcd4d9d3d23738744e453205aad5c6dbd716), [`84936cc`](https://github.com/TanStack/router/commit/84936cc04530bba11059c57b293a794922bbc5aa), [`bbd2336`](https://github.com/TanStack/router/commit/bbd2336b8446de3f7dd85070895e7cf43980183e)]: - - @tanstack/router-core@1.171.32 - - @tanstack/start-client-core@1.170.32 - - @tanstack/start-storage-context@1.167.34 - -## 1.169.36 - -### Patch Changes - -- [#8204](https://github.com/TanStack/router/pull/8204) [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26) - Stream large deferred SSR hydration payloads through a backpressure-aware router transport, fail known setup errors before response creation, and close cancelled or expired transforms safely. - - Start now cancels discarded middleware and HEAD response bodies, including plain streams and derived branches. - - Server-function raw streams share one ordered response. Arbitrary or sequential consumption can require potentially unbounded buffering of unread data on the client. Cancelling one raw stream discards it locally, while aborting the whole call cancels the response and server work. Consume streams concurrently, cancel unused streams promptly, or use separate calls when independent backpressure is required. A raw stream that exceeds its unread-byte limit now fails alone; sibling streams and the JSON result keep flowing. - - The JSON wire shape of a `RawStream` server-function argument changed. Clients and servers must run matching versions for requests that pass a `RawStream`. - - The frame-protocol constants (`FRAME_TYPE_*`, `MAX_FRAME_PAYLOAD_SIZE`, `MAX_FRAMED_STREAMS`) moved from the `@tanstack/start-client-core` root to the `@tanstack/start-client-core/client-rpc` subpath. - - Router requests whose `Accept` header allows neither `text/html` nor `*/*` now receive `406 Not Acceptable` instead of `500`. - - Framework adapters share the body `` composition (`getSsrBodyScriptParts`, `composeSsrBodyScripts`) and the eager HTML response wrapper (`renderSsrHtmlResponse`) from `@tanstack/router-core`. - - Solid SSR now emits one document type and renders late lazy errors through route boundaries. A Solid `` without a `fallback` no longer holds the streamed shell; it renders inside the nearest `` boundary like React and Vue, and now renders falsy resolved values. - - Static server functions decode cached `RawStream` values with the client deserializer plugins. - - SSR Query integrations now keep request cleanup and stream ownership aligned with the router lifecycle. - -- Updated dependencies [[`bc80866`](https://github.com/TanStack/router/commit/bc80866f6d6eb3e6f152ee3682eb783c96403e83), [`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a0b2ad9`](https://github.com/TanStack/router/commit/a0b2ad99aee64af08d16b0e4ff26b3ba42a99f0a), [`1ca361b`](https://github.com/TanStack/router/commit/1ca361ba52a627d2f76ab33323bd83d1d0aa65a3)]: - - @tanstack/router-core@1.171.31 - - @tanstack/start-client-core@1.170.31 - - @tanstack/start-storage-context@1.167.33 - -## 1.169.35 - -### Patch Changes - -- [#8354](https://github.com/TanStack/router/pull/8354) [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244) - Use lightweight request history for SSR and make server navigation a no-op. Use redirect() to issue HTTP redirects. Server hrefs use the same normalization as browser history to handle protocol-relative URLs and control characters. - -- Updated dependencies [[`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`8fff7fa`](https://github.com/TanStack/router/commit/8fff7fa1f2e6f061916b0bf5e0ec486b2e732f94), [`f021f6d`](https://github.com/TanStack/router/commit/f021f6d1c6dce6c9b54d70766f1d636d8fd9e184), [`ae68535`](https://github.com/TanStack/router/commit/ae68535929043607d4ee9438f8ae401f3a064862), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5), [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef)]: - - @tanstack/router-core@1.171.30 - - @tanstack/history@1.162.4 - - @tanstack/start-client-core@1.170.30 - - @tanstack/start-storage-context@1.167.32 - -## 1.169.34 - -### Patch Changes - -- [#8340](https://github.com/TanStack/router/pull/8340) [`d914b08`](https://github.com/TanStack/router/commit/d914b085bb4bf29ec18a531201e377c10681b661) - Fix `setResponseHeaders` to iterate `Headers` entries, replace existing values, and preserve separate `Set-Cookie` values. - -## 1.169.33 - -### Patch Changes - -- [#8308](https://github.com/TanStack/router/pull/8308) [`9c1871c`](https://github.com/TanStack/router/commit/9c1871ccc88bc1157186b8b460941a304ec740b8) - Validate navigation and redirect destinations, keep ambiguous relative URLs on the current origin, and constrain prerender requests and output paths. Prevent redirect headers from appearing in serialized server function response bodies. - - Preserve native form HTTP redirects, route error handling and masks for document redirects, and per-navigation destinations for shared loader redirects. Avoid redundant origin parsing and reduce link styling and server-rendering work. Configured origins must already be normalized. - - Keep blocked-link inactive props consistent during React hydration, honor explicit redirect Location headers before checking route options, and refresh Vue link state when destinations become internal. Reuse the protocol-relative URL check while parsing redirect schemes once. - - Reduce React link bundle size by sharing pathname comparisons, state-prop selection, and element creation. - - Share normalized pathname comparisons in Solid and Vue links to reduce bundle size. - -- Updated dependencies [[`f9836f1`](https://github.com/TanStack/router/commit/f9836f16f0e25b0a8495f5e01e3f303b1cbc8725), [`9c1871c`](https://github.com/TanStack/router/commit/9c1871ccc88bc1157186b8b460941a304ec740b8), [`9871c06`](https://github.com/TanStack/router/commit/9871c0625806001d6bf373524821a00303438a91), [`0654c0a`](https://github.com/TanStack/router/commit/0654c0a1a427db24d9af13c1d6ad1217a588c0c9)]: - - @tanstack/router-core@1.171.29 - - @tanstack/history@1.162.3 - - @tanstack/start-client-core@1.170.29 - - @tanstack/start-storage-context@1.167.31 - ## 1.169.32 ### Patch Changes diff --git a/packages/start-server-core/INTERNALS.md b/packages/start-server-core/INTERNALS.md deleted file mode 100644 index b2ac36ce80..0000000000 --- a/packages/start-server-core/INTERNALS.md +++ /dev/null @@ -1,77 +0,0 @@ -# Start server response ownership - -This document describes how Start tracks response bodies while server middleware runs. - -## Two ownership layers - -Response body ownership tells Start which body belongs to the current middleware result. - -Router SSR ownership tells Router when it can release request data, serialization state, readers, timers, and renderer work. - -An internal `SsrResponse` value carries Router SSR cleanup data beside a `Response`. Start stores that data while middleware sees the ordinary `Response`. - -Each request must use a separate router instance. Sharing one router between requests is unsupported. - -## Middleware transfers - -Start keeps one ownership record for the current response body. A response without a body does not need an ownership record. - -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. 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`. - -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. - -Only the same body object keeps the transport headers that Start protects for serialized server-function replies. A different body can carry different bytes. - -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 - -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 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. - -Body cancellation is best effort. Start does not await it, and a cancellation failure does not block Router cleanup. - -Cleanup paths can request disposal more than once. Router SSR cleanup and native stream cancellation have idempotent effects. - -Every internal `SsrResponse` disposer must also have idempotent effects. - -A result that settles after request cancellation is no longer usable. Start disposes that late result when it arrives. - -## Locks, clones, and branches - -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`. 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. - -Middleware owns every clone or `tee()` branch that it does not return. Middleware must consume or cancel each unused branch. - -## Final handoff - -Redirect conversion and `HEAD` handling dispose any body that they replace or remove. - -Before returning a Router SSR stream, Start checks request cancellation. Start disposes the stream immediately if the request is already aborted. - -Start binds later request cancellation to the disposer. While Router SSR state is live, SSR cleanup removes that listener. Otherwise the one-time listener ends with the request signal. - -The Router stream transform releases Router SSR state after natural completion, stream errors, or consumer cancellation. - -After handoff, the HTTP runtime owns consumption or cancellation of the returned body. - -If Start does not hand off Router SSR ownership, the request cleanup block releases any remaining Router SSR state. - -An abort can race with final handoff. Cleanup is idempotent. Either path can safely request cleanup. diff --git a/packages/start-server-core/docs/RECONCILIATION.md b/packages/start-server-core/docs/RECONCILIATION.md deleted file mode 100644 index 3f3b49f88e..0000000000 --- a/packages/start-server-core/docs/RECONCILIATION.md +++ /dev/null @@ -1,200 +0,0 @@ -# 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 020747da69..88199041b5 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.45", + "version": "1.169.32", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", @@ -27,7 +27,6 @@ "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", @@ -39,16 +38,6 @@ "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": { @@ -114,12 +103,13 @@ "@tanstack/router-core": "workspace:*", "@tanstack/start-client-core": "workspace:*", "@tanstack/start-storage-context": "workspace:*", - "cookie-es": "^3.0.0", - "fetchdts": "^0.2.0", - "seroval": "^1.6.7" + "fetchdts": "^0.1.6", + "h3-v2": "npm:h3@2.0.1-rc.20", + "seroval": "^1.6.2" }, "devDependencies": { "@standard-schema/spec": "^1.0.0", + "cookie-es": "^3.0.0", "vite": "*", "@types/node": ">=20", "@tanstack/vite-config": "catalog:", @@ -127,7 +117,6 @@ "jsdom": "catalog:", "@arethetypeswrong/cli": "catalog:", "publint": "catalog:", - "rimraf": "catalog:", - "iron-session": "9.0.1" + "rimraf": "catalog:" } } 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 2e37e7b7ff..95fb028cea 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, appendResponseHeader), three-phase request handling, + setCookie, getCookie, useSession), 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 integration primitives for external session libraries. 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 session management. 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,7 +92,6 @@ import { getResponseHeaders, getResponseHeader, getResponseStatus, - appendResponseHeader, removeResponseHeader, clearResponseHeaders, } from '@tanstack/react-start/server' @@ -106,14 +105,6 @@ 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 @@ -142,62 +133,152 @@ const serverFn = createServerFn({ method: 'POST' }).handler(async () => { }) ``` -## External Session Libraries +## Session Management -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: +Encrypted sessions stored in cookies. Requires a password for encryption. ```ts -import { getIronSession } from 'iron-session' -import { getCookie, setCookie } from '@tanstack/react-start/server' +// 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' -// This is an application helper, not a Start export. -export function getAppSession() { +type SessionData = { + userId?: string +} + +function getSessionConfig() { const password = process.env.SESSION_SECRET if (!password || password.length < 32) { throw new Error('SESSION_SECRET must be at least 32 characters') } - 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: '/', - }, + 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: '/', }, - ) + } } -// After validating credentials in a server function: -const session = await getAppSession() -session.userId = user.id -await session.save() +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 +} -// In a logout handler: -const logoutSession = await getAppSession() -logoutSession.destroy() +// 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 } +}) ``` -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. +### Session Config -iron-session checks `ttl` when unsealing, and each save renews that lifetime. Choose and test expiration, rotation, and storage behavior explicitly. +| 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 | -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. +### 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 +``` ### Production Session Rules -- 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. +- 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. ## How Request Handling Works @@ -233,9 +314,9 @@ const getAuth = createServerFn({ method: 'GET' }).handler(async () => { }) ``` -### 2. HIGH: Forgetting to persist an external session +### 2. HIGH: Forgetting session password for most session operations -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. +`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. ### 3. MEDIUM: Using session without HTTPS in production @@ -247,6 +328,6 @@ Do not create session config from `process.env` at module load or cache `getRequ ## Cross-References -- `@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 +- [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 diff --git a/packages/start-server-core/src/createStartHandler.ts b/packages/start-server-core/src/createStartHandler.ts index f1be8fe0d9..a25dd7ac55 100644 --- a/packages/start-server-core/src/createStartHandler.ts +++ b/packages/start-server-core/src/createStartHandler.ts @@ -1,7 +1,5 @@ -import { createServerHistory } from '@tanstack/history' +import { createMemoryHistory } from '@tanstack/history' import { - X_TSS_RAW_RESPONSE, - X_TSS_SERIALIZED, createCsrfMiddleware, createNullProtoObject, csrfSymbol, @@ -11,17 +9,19 @@ import { } from '@tanstack/start-client-core' import { _getRenderedMatches, + executeRewriteInput, isDangerousProtocol, - isPromise, isRedirect, } from '@tanstack/router-core' import { attachRouterServerSsrUtils, bindSsrResponseToRequest, - disposeSsrResponse, + disposeSsrResponseDetached, getNormalizedURL, + getOrigin, isSsrResponse, normalizeSsrResponse, + replaceSsrResponse, stripSsrResponseBody, waitForRequest, } from '@tanstack/router-core/ssr/server' @@ -29,22 +29,9 @@ import { getStartContext, runWithStartContext, } from '@tanstack/start-storage-context' -import { - createFinalizedResponse, - finalizeResponse, - reconcileResponse, - restoreResponseProtocol, - transferResponseMetadata, - transferResponseProtocol, - withStartRequest, -} from './internal-request-response' +import { requestHandler } from './request-response' import { getStartManifest } from './router-manifest' -import { - DeferredResponse, - createServerFnErrorResponse, - handleServerAction, - toThrownServerFnResponse, -} from './server-functions-handler' +import { handleServerAction } from './server-functions-handler' import { createEarlyHintsCollector } from './early-hints' import { createCachedBaseManifestLoader, @@ -62,8 +49,7 @@ import type { RouterEntry, StartEntry, } from '@tanstack/start-client-core' -import type { RequestHandler, RequestOptions } from './request-handler' -import type { StartEvent } from './internal-request-response' +import type { RequestHandler } from './request-handler' import type { AnyRoute, AnyRouter, @@ -87,13 +73,16 @@ export interface CreateStartHandlerOptions extends FinalManifestOptions { handler: HandlerCallback } -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 +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 } interface PluginAdaptersEntry { @@ -107,8 +96,9 @@ interface Entries { pluginAdapters: PluginAdaptersEntry } -// Share initialization, then reuse the loaded entries without a promise wait. -let cachedEntries: Entries | Promise | undefined +// Cached entries - promises stored immediately to prevent concurrent imports +// that can cause race conditions during module initialization +let entriesPromise: Promise | undefined let hasWarnedMissingCsrfMiddleware = false const defaultCsrfMiddleware = createCsrfMiddleware({ filter: (ctx) => ctx.handlerType === 'serverFn', @@ -142,13 +132,10 @@ async function loadEntries(): Promise { } function getEntries() { - if (!cachedEntries) { - cachedEntries = loadEntries().then((entries) => { - cachedEntries = entries - return entries - }) + if (!entriesPromise) { + entriesPromise = loadEntries() } - return cachedEntries + return entriesPromise } function hasCsrfMiddleware( @@ -208,382 +195,238 @@ function throwIfMayNotDefer(): never { throw new Error(ERR_NO_DEFER) } -function getResponseFromResult(result: TODO): TODO { - return isSsrResponse(result) || result instanceof Response - ? result - : result?.response -} - -type StreamSsrResponse = Extract - -type ResponseBody = NonNullable -type ResponseWithBody = Response & { readonly body: ResponseBody } - -/** The context object threaded through one middleware pipeline. */ -interface PipelineContext { - request: Request - pathname: string - handlerType: 'serverFn' | 'router' - context: Record - params?: Record - response?: Response - // Middleware may add arbitrary own properties through `next(ctx)`. - [key: string]: unknown -} - -interface MiddlewareResponseOwnership { - response: ResponseWithBody - sourceBody: ResponseBody - streamResponse?: StreamSsrResponse -} - -function disposeResponseResult(result: TODO, reason: unknown): void { - const response = getResponseFromResult(result) - if (isSsrResponse(response) || response instanceof Response) { - disposeSsrResponse(response, reason) - } -} - /** - * 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. + * Check if a value is a special response (Response or Redirect) */ -function inheritsResponseOwnership( - ownership: MiddlewareResponseOwnership, - body: ResponseBody, -): boolean { - const ownedBody = ownership.response.body - return body === ownedBody || ownedBody.locked -} - -function disposeResponseOwnership( - ownership: MiddlewareResponseOwnership, - reason: unknown, -): void { - const { response, sourceBody, streamResponse } = ownership - streamResponse?.dispose(reason) - if (!streamResponse || response.body !== sourceBody) { - void response.body.cancel(reason).catch(() => {}) - } -} - -function getOwnedResponse( - ownership: MiddlewareResponseOwnership, -): HandlerCallbackResult { - const { response, sourceBody, streamResponse } = ownership - if (!streamResponse) { - return response - } - if (streamResponse.response === response && response.body === sourceBody) { - return streamResponse - } - if (response.body === sourceBody) { - return { ...streamResponse, response } - } - return { - ...streamResponse, - response, - dispose(reason): undefined { - disposeResponseOwnership(ownership, reason) - }, - } -} - -function createLateResponseDisposer(signal: AbortSignal) { - return (result: TODO) => disposeResponseResult(result, signal.reason) +function isSpecialResponse(value: unknown): value is Response { + return value instanceof Response || isRedirect(value) } /** - * Compose middleware around a terminal response handler. With no middleware - * the terminal runs directly. + * Normalize middleware result to context shape + */ +function handleCtxResult(result: TODO) { + if (isSsrResponse(result) || isSpecialResponse(result)) { + return { response: result } + } + return result +} + +function disposeLateResponse(result: TODO, signal: AbortSignal): void { + const response = handleCtxResult(result)?.response + if (isSsrResponse(response) || isSpecialResponse(response)) { + disposeSsrResponseDetached(response, signal.reason) + } +} + +function isSignalAborted(signal: AbortSignal): boolean { + return signal.aborted +} + +/** + * Execute a middleware chain */ async function executeMiddleware( middlewares: Array, - terminal: TODO, - ctx: PipelineContext, + ctx: TODO, signal: AbortSignal, - event: StartEvent, - terminalNext?: TODO, -): Promise { +): Promise<{ ctx: TODO; response: HandlerCallbackResult }> { let index = -1 - let responseOwnership: MiddlewareResponseOwnership | undefined - // 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) + let streamResponse: + | Extract + | undefined + let retiredStreamIdentities: WeakSet | 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 isResponseAlias = (candidate: unknown, response: Response) => + candidate === response || + (candidate instanceof Response && + response.body !== null && + candidate.body === response.body) - 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 - - if (returnedDepth <= caller) { - if (exposed !== ctx.response) { - disposeResponseResult(response, 'late middleware response') + const setResponse = (response: TODO) => { + if (isSsrResponse(response)) { + if (response.serverSsrCleanup === 'stream') { + streamResponse = response } + ctx.response = response.response return } - 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 = 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) + const disposeStreamResponse = async (reason: unknown) => { + const response = streamResponse + if (!response) { + return } + + streamResponse = undefined + retiredStreamIdentities ??= new WeakSet() + retiredStreamIdentities.add(response.response) + if (response.response.body) { + retiredStreamIdentities.add(response.response.body) + } + const currentResponse = ctx.response + if (isResponseAlias(currentResponse, response.response)) { + ctx.response = undefined + } + await response.dispose(reason) + } + + const disposeAbandonedResult = (result: TODO) => { + const exposed = handleCtxResult(result)?.response + const response = isSsrResponse(exposed) ? exposed.response : exposed + if (streamResponse && isResponseAlias(response, streamResponse.response)) { + void disposeStreamResponse(signal.reason).catch(console.error) + return + } + if ( + response instanceof Response && + retiredStreamIdentities && + (retiredStreamIdentities.has(response) || + (response.body !== null && retiredStreamIdentities.has(response.body))) + ) { + return + } + + disposeLateResponse(result, signal) + } + + const getFinalResponse = async (): Promise => { + const response = ctx.response + if (!response) { + throwRouteHandlerError() + } + + if (!streamResponse) { + return response + } + + if (response === streamResponse.response) { + return streamResponse + } + + if ( + streamResponse.response.body !== null && + response.body === streamResponse.response.body + ) { + return { ...streamResponse, response } + } + + await disposeStreamResponse('middleware response replaced') + return response } let nextPromise: Promise | undefined function next(nextCtx?: TODO): Promise { - // Only the deepest started invocation can call next(). - const result = runNext(index, nextCtx) + const result = runNext(nextCtx) nextPromise = result return result } - async function runNext(caller: number, nextCtx?: TODO): Promise { - signal.throwIfAborted() + async function runNext(nextCtx?: TODO): Promise { + if (signal.aborted) { + throw signal.reason + } // Merge context if provided using safeObjectMerge for prototype pollution prevention if (nextCtx) { if (nextCtx.context) { ctx.context = safeObjectMerge(ctx.context, nextCtx.context) } - // 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]! + // Copy own properties except context (Object.keys returns only own enumerable properties) + for (const key of Object.keys(nextCtx)) { if (key === 'response') { - setResponse(nextCtx.response, caller) + setResponse(nextCtx.response) } else if (key !== 'context') { ctx[key] = nextCtx[key] } } } - const depth = ++index - const isTerminal = depth === middlewares.length - const middleware = - depth < middlewares.length - ? middlewares[depth] - : isTerminal - ? terminal - : undefined - const middlewareNext = isTerminal && terminalNext ? terminalNext : next - if (!middleware) { - return ctx - } + index++ + const middleware = middlewares[index] + if (!middleware) return ctx let result: TODO try { - const pending = middleware({ ...ctx, next: middlewareNext }) + const pending = middleware({ ...ctx, next }) // A directly returned next() promise already propagates request aborts. - if (nextPromise && pending === nextPromise) { + if (pending === nextPromise) { nextPromise = undefined result = await pending - signal.throwIfAborted() - } else if (!isPromise(pending)) { - result = pending - signal.throwIfAborted() + if (isSignalAborted(signal)) { + disposeAbandonedResult(result) + throw signal.reason + } } else { - result = await waitForRequest( - pending, - signal, - disposeAbandonedResult, - disposeAbandonedResult, - ) + result = await waitForRequest(pending, signal, disposeAbandonedResult) } } catch (err) { - 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) - } - if (err !== signal.reason) { - disposeAbandonedResult(err) - } + if (isSignalAborted(signal)) { throw signal.reason } - if (err instanceof Response) { - // 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, - ) + if (isSpecialResponse(err)) { + setResponse(err) return ctx } throw err } - if (depth < returnedDepth) { - returnedDepth = depth - } - if (isTerminal && terminalNext && !result) { - throwRouteHandlerError() - } - - 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)) + const normalized = handleCtxResult(result) + if (normalized) { + if (normalized.response !== undefined) { + setResponse(normalized.response) } - return ctx - } - - if (result && result !== ctx) { - const response = getResponseFromResult(result) - // 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 (normalized.context) { + ctx.context = safeObjectMerge(ctx.context, normalized.context) } - 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(-1) - let response = ctx.response + await runNext() + const response = await waitForRequest( + getFinalResponse(), + signal, + disposeAbandonedResult, + ) + if (signal.aborted) { + disposeAbandonedResult(response) + throw signal.reason + } + return { ctx, response } + } catch (err) { + const disposal = disposeStreamResponse(signal.aborted ? signal.reason : err) + if (signal.aborted) { + void disposal.catch(console.error) + } else { + await disposal + } + throw err + } +} + +/** + * Wrap a route handler as middleware + */ +function handlerToMiddleware( + handler: RouteMethodHandlerFn, + mayDefer: boolean = false, +): TODO { + if (mayDefer) { + return handler + } + return async (ctx: TODO) => { + const response = await handler({ ...ctx, next: throwIfMayNotDefer }) if (!response) { throwRouteHandlerError() } - if (signal.aborted) { - throw signal.reason - } - 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) { - returnedDepth = -1 - if (responseOwnership) { - disposeResponseOwnership( - responseOwnership, - signal.aborted ? signal.reason : err, - ) - } - throw err + return response } } @@ -639,56 +482,33 @@ export function createStartHandler( }) } - 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 + const startRequestResolver: RequestHandler = async ( + request, + requestOpts, + ) => { + let router: AnyRouter | null = null as AnyRouter | null + let responseOwnsCleanup = false as boolean try { - signal.throwIfAborted() - // 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) - } + request.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 = getOrigin(request) + + if (handledProtocolRelativeURL) { + return Response.redirect(url, 308) } - 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 - let startOptions: AnyStartInstanceOptions - if (startInstance) { - const pendingStartOptions = startInstance.getOptions() - startOptions = isPromise(pendingStartOptions) - ? await waitForRequest(pendingStartOptions, signal) - : pendingStartOptions - signal.throwIfAborted() - } else { - startOptions = {} as AnyStartInstanceOptions - } + const entries = await waitForRequest(getEntries(), request.signal) + const hasStartInstance = !!entries.startEntry.startInstance + const startOptions: AnyStartInstanceOptions = + (await waitForRequest( + entries.startEntry.startInstance?.getOptions(), + request.signal, + )) || ({} as AnyStartInstanceOptions) const { hasPluginAdapters, pluginSerializationAdapters } = entries.pluginAdapters @@ -701,88 +521,60 @@ export function createStartHandler( const requestStartOptions = { ...startOptions, - requestMiddleware: startInstance + requestMiddleware: hasStartInstance ? startOptions.requestMiddleware - : isServerFnRequest - ? [defaultCsrfMiddleware] - : undefined, + : [defaultCsrfMiddleware], serializationAdapters, } - 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, - ) - } + // Flatten request middlewares once + const flattenedRequestMiddlewares = requestStartOptions.requestMiddleware + ? flattenMiddlewares(requestStartOptions.requestMiddleware) + : [] + + // Create set for deduplication + const executedRequestMiddlewares = new Set( + flattenedRequestMiddlewares, + ) // Memoized router getter - const getRouter = (): Promise => { - routerPromise ??= (async () => { - signal.throwIfAborted() - const routerUrl = url === requestUrl ? getNormalizedURL(url).url : url - const pendingRouter = entries.routerEntry.getRouter() - const requestRouter = isPromise(pendingRouter) - ? await waitForRequest(pendingRouter, signal) - : pendingRouter + const getRouter = async (): Promise => { + if (router) return router - let isShell = IS_SHELL_ENV - if (IS_PRERENDERING && !isShell) { - isShell = request.headers.get(HEADERS.TSS_SHELL) === 'true' - } + router = await waitForRequest( + entries.routerEntry.getRouter(), + request.signal, + ) - const history = createServerHistory( - routerUrl.pathname + routerUrl.search + routerUrl.hash, - ) + let isShell = IS_SHELL_ENV + if (IS_PRERENDERING && !isShell) { + isShell = request.headers.get(HEADERS.TSS_SHELL) === 'true' + } - requestRouter.update({ - history, - isShell, - isPrerendering: IS_PRERENDERING, - origin: requestRouter.options.origin ?? routerUrl.origin, - // Start-owned options that RouterConstructorOptions omits. - ...{ - defaultSsr: requestStartOptions.defaultSsr, - serializationAdapters: requestRouter.options.serializationAdapters - ?.length - ? [ - ...requestStartOptions.serializationAdapters, - ...requestRouter.options.serializationAdapters, - ] - : requestStartOptions.serializationAdapters, - }, - basepath: ROUTER_BASEPATH, - }) + const history = createMemoryHistory({ + initialEntries: [href], + }) - router = requestRouter - return requestRouter - })() + router.update({ + history, + isShell, + isPrerendering: IS_PRERENDERING, + origin: router.options.origin ?? origin, + ...{ + defaultSsr: requestStartOptions.defaultSsr, + serializationAdapters: [ + ...requestStartOptions.serializationAdapters, + ...(router.options.serializationAdapters || []), + ], + }, + basepath: ROUTER_BASEPATH, + }) - return routerPromise + return router } - const handlerType = isServerFnRequest - ? ('serverFn' as const) - : ('router' as const) - const startContext = { - getRouter, - startOptions: requestStartOptions, - request, - executedRequestMiddlewares, - handlerType, - } - let terminal: ( - ctx: PipelineContext, - ) => Promise - - if (isServerFnRequest) { + // Check for server function requests first (early exit) + if (SERVER_FN_BASE && url.pathname.startsWith(SERVER_FN_BASE)) { if ( process.env.NODE_ENV !== 'production' && process.env.TSS_DISABLE_CSRF_MIDDLEWARE_WARNING !== 'true' && @@ -799,236 +591,224 @@ export function createStartHandler( throw new Error('Invalid server action param for serverFnId') } - terminal = ({ context }) => - runWithStartContext( - { ...startContext, contextAfterGlobalMiddlewares: context }, + const serverFnHandler = async ({ context }: TODO) => { + return runWithStartContext( + { + getRouter, + startOptions: requestStartOptions, + contextAfterGlobalMiddlewares: context, + request, + executedRequestMiddlewares, + handlerType: 'serverFn', + }, () => 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, - routerInstance: AnyRouter, - ): Promise => { - if ( - !/(^|,)\s*(\*\/\*|text\/html)/.test( - request.headers.get('Accept') || '*/*', - ) - ) { - return normalizeSsrResponse( - Response.json( - { error: 'Only HTML requests are supported here' }, - { status: 406 }, - ), - ) - } + } - const pendingManifest = resolveManifestForRequest({ + const middlewares = flattenedRequestMiddlewares.map( + (d) => d.options.server, + ) + const { response: middlewareResponse } = await executeMiddleware( + [...middlewares, serverFnHandler], + { + request, + pathname: url.pathname, + handlerType: 'serverFn', + context: createNullProtoObject(requestOpts?.context), + }, + request.signal, + ) + + const result = await handleRedirectResponse( + middlewareResponse, + getRouter, + request.signal, + request.headers.get('x-tsr-serverFn') === 'true', + ) + bindSsrResponseToRequest(router ?? undefined, result, request.signal) + request.signal.throwIfAborted() + responseOwnsCleanup = result.serverSsrCleanup === 'stream' + return result.response + } + + // Router execution function + const executeRouter = async ( + serverContext: TODO, + matchedRoutes?: ReadonlyArray, + ): Promise => { + const acceptHeader = request.headers.get('Accept') || '*/*' + const acceptParts = acceptHeader.split(',') + const supportedMimeTypes = ['*/*', 'text/html'] + + const isSupported = supportedMimeTypes.some((mimeType) => + acceptParts.some((part) => part.trim().startsWith(mimeType)), + ) + + if (!isSupported) { + return normalizeSsrResponse( + Response.json( + { error: 'Only HTML requests are supported here' }, + { status: 500 }, + ), + ) + } + + const manifest = await waitForRequest( + resolveManifestForRequest({ request, requestInlineCss: requestOpts?.inlineCss, getBaseManifest: () => getBaseManifest(matchedRoutes), - }) - const manifest = isPromise(pendingManifest) - ? await waitForRequest(pendingManifest, signal) - : pendingManifest + }), + request.signal, + ) - const earlyHints = createEarlyHintsForRequest(requestOpts) + const earlyHints = createEarlyHintsForRequest({ + onEarlyHints: requestOpts?.onEarlyHints, + responseLinkHeader: requestOpts?.responseLinkHeader, + }) - earlyHints?.collectStatic({ manifest, matchedRoutes }) + earlyHints?.collectStatic({ manifest, matchedRoutes }) - // 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: () => storedStartContext?.requestAssets, - }) + const routerInstance = await getRouter() - // `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, - _skipLocationUpdate: true, - }) - signal.throwIfAborted() + attachRouterServerSsrUtils({ + router: routerInstance, + manifest, + getRequestAssets: () => + getStartContext({ throwIfNotFound: false })?.requestAssets, + }) - if (routerInstance._serverResult?.type === 'redirect') { - return normalizeSsrResponse(routerInstance._serverResult.redirect) - } + // `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: request.signal }) + request.signal.throwIfAborted() - earlyHints?.collectDynamic( - _getRenderedMatches(routerInstance.stores.matches.get()), - ) - - // Pass request-scoped assets to dehydrate for manifest injection - await routerInstance.serverSsr!.dehydrate({ - requestAssets: storedStartContext?.requestAssets, - signal, - }) - signal.throwIfAborted() - - const responseHeaders = getStartResponseHeaders(routerInstance) - earlyHints?.appendResponseHeaders(responseHeaders) - signal.throwIfAborted() - return normalizeSsrResponse( - await cb({ - request, - router: routerInstance, - responseHeaders, - }), - ) + if (routerInstance._serverResult?.type === 'redirect') { + return normalizeSsrResponse(routerInstance._serverResult.redirect) } - terminal = ({ context }) => - runWithStartContext( - { ...startContext, contextAfterGlobalMiddlewares: context }, - () => - handleServerRoutes({ + earlyHints?.collectDynamic( + _getRenderedMatches(routerInstance.stores.matches.get()), + ) + + // Pass request-scoped assets to dehydrate for manifest injection + const ctx = getStartContext({ throwIfNotFound: false }) + await waitForRequest( + routerInstance.serverSsr!.dehydrate({ + requestAssets: ctx?.requestAssets, + }), + request.signal, + ) + request.signal.throwIfAborted() + + const responseHeaders = getStartResponseHeaders({ + router: routerInstance, + }) + earlyHints?.appendResponseHeaders(responseHeaders) + request.signal.throwIfAborted() + const response = await waitForRequest( + cb({ + request, + router: routerInstance, + responseHeaders, + }), + request.signal, + (late) => disposeLateResponse(late, request.signal), + ) + return normalizeSsrResponse(response) + } + + // Main request handler + const requestHandlerMiddleware = async ({ context }: TODO) => { + return runWithStartContext( + { + getRouter, + startOptions: requestStartOptions, + contextAfterGlobalMiddlewares: context, + request, + executedRequestMiddlewares, + handlerType: 'router', + }, + async () => { + try { + return await handleServerRoutes({ getRouter, request, + url, executeRouter, context, executedRequestMiddlewares, - signal, - event, - }), - ) - } - - 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 = 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( - middlewareResponse, - signal.aborted ? signal.reason : error, + }) + } catch (err) { + if (err instanceof Response) { + return err + } + throw err + } + }, ) - throw error } - bindSsrResponseToRequest(router, result, signal) - signal.throwIfAborted() - responseOwnsCleanup = result.serverSsrCleanup === 'stream' - response = result.response + + const middlewares = flattenedRequestMiddlewares.map( + (d) => d.options.server, + ) + const { response: middlewareResponse } = await executeMiddleware( + [...middlewares, requestHandlerMiddleware], + { + request, + pathname: url.pathname, + handlerType: 'router', + context: createNullProtoObject(requestOpts?.context), + }, + request.signal, + ) + + const response = await handleRedirectResponse( + middlewareResponse, + getRouter, + request.signal, + false, + ) + bindSsrResponseToRequest(router ?? undefined, response, request.signal) + request.signal.throwIfAborted() + responseOwnsCleanup = response.serverSsrCleanup === 'stream' + return response.response } finally { if (router?.serverSsr && !responseOwnsCleanup) { - // Stream disposal already publishes its cleanup writes at the pipeline - // boundary. Only live eager SSR state can still add response helpers. + // 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. 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. + router = null } - return response } - return withStartRequest(startRequestResolver) + return requestHandler(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( - ssrResponse: SsrResponse, + response: HandlerCallbackResult, getRouter: () => Promise, signal: AbortSignal, serializeRedirect: boolean, - event: StartEvent, ): Promise { signal.throwIfAborted() - const redirect = ssrResponse.response - if (!isRedirect(redirect)) { + const ssrResponse = normalizeSsrResponse(response) + if (!isRedirect(ssrResponse.response)) { return ssrResponse } - const opts = redirect.options - const href = redirect.headers.get('Location') || opts.href + const opts = ssrResponse.response.options + const href = ssrResponse.response.headers.get('Location') || opts.href if ( !href && opts.to && @@ -1057,104 +837,69 @@ async function handleRedirectResponse( } signal.throwIfAborted() + let redirect = ssrResponse.response // Unambiguous relative hrefs need no route resolution or protocol policy. // Every scheme falls back to the router to honor its custom allowlist. if (href && !isDangerousProtocol(href, relativeRedirectProtocols)) { - opts.href = href + redirect.options.href = href redirect.headers.set('Location', href) } else { - const router = await getRouter() + const router = await waitForRequest(getRouter(), signal) signal.throwIfAborted() - // Resolves `redirect` in place. - router.resolveRedirect(redirect) + redirect = router.resolveRedirect(redirect) } if (serializeRedirect) { - const redirectOptions = { ...(opts as TODO) } + const redirectOptions = { ...(redirect.options as TODO) } delete redirectOptions.headers - redirectOptions.isSerializedRedirect = true const responseHeaders = new Headers(redirect.headers) responseHeaders.set('content-type', 'application/json') - // 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, + return waitForRequest( + replaceSsrResponse( + ssrResponse, + Response.json( + { + ...redirectOptions, + isSerializedRedirect: true, + }, + { headers: responseHeaders }, + ), + 'redirect response replaced', ), - serverSsrCleanup: 'none', - } - } - - ssrResponse.response = finalizeResponse(redirect, event) - return ssrResponse -} - -function withParsedParams( - handler: RouteMethodHandlerFn, - matchedRoutes: ReadonlyArray, -): TODO { - if ( - !matchedRoutes.some( - (route) => route.options.params?.parse ?? route.options.parseParams, + signal, ) - ) { - return handler } - return (ctx: TODO) => { - // Parse inside the pipeline so middleware can catch errors. Keep the raw - // params for app-router validation when the handler defers to rendering. - const params = Object.assign(Object.create(null), ctx.params) - for (const route of matchedRoutes) { - const parse = route.options.params?.parse ?? route.options.parseParams - if (parse) { - Object.assign(params, parse(params)) - } - } - return handler({ ...ctx, params }) - } + return waitForRequest( + replaceSsrResponse(ssrResponse, redirect, 'redirect response replaced'), + signal, + ) } async function handleServerRoutes({ getRouter, request, + url, executeRouter, context, executedRequestMiddlewares, - signal, - event, }: { getRouter: () => Promise request: Request + url: URL executeRouter: ( serverContext: any, - matchedRoutes: ReadonlyArray, - router: AnyRouter, + matchedRoutes?: ReadonlyArray, ) => Promise context: any - executedRequestMiddlewares: Set | undefined - signal: AbortSignal - event: StartEvent + executedRequestMiddlewares: Set }): Promise { const router = await getRouter() - const { pathname } = router.latestLocation + const rewrittenUrl = executeRewriteInput(router.rewrite, url) + const pathname = rewrittenUrl.pathname // 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 cached match avoids another route-tree traversal during the app router render. + // the match will be cached internally, so no extra work is done during the app router render const [matchedRoutes, rawParams, foundRoute] = router.getMatchedRoutes(pathname) @@ -1162,9 +907,6 @@ async function handleServerRoutes({ // Collect and dedupe route middlewares const routeMiddlewares: Array = [] - let terminalHandler: TODO = (ctx: TODO) => - executeRouter(ctx.context, matchedRoutes, router) - let terminalNext: TODO // Collect middleware from matched routes, filtering out those already executed // in the request phase @@ -1175,7 +917,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) } } @@ -1184,6 +926,7 @@ async function handleServerRoutes({ // Add handler middleware if exact match const server = foundRoute?.options.server + let isHeadFallback = false if (server?.handlers && isExactMatch) { const handlers = typeof server.handlers === 'function' @@ -1197,34 +940,34 @@ async function handleServerRoutes({ requestMethod === 'HEAD' ? (handlers['HEAD'] ?? handlers['GET'] ?? handlers['ANY']) : (handlers[requestMethod] ?? handlers['ANY']) + isHeadFallback = + requestMethod === 'HEAD' && handler !== undefined && !handlers['HEAD'] + if (handler) { const mayDefer = !!foundRoute.options.component - if (typeof handler !== 'function') { + if (typeof handler === 'function') { + routeMiddlewares.push(handlerToMiddleware(handler, mayDefer)) + } else { if (handler.middleware?.length) { const handlerMiddlewares = flattenMiddlewares(handler.middleware) for (const m of handlerMiddlewares) { routeMiddlewares.push(m.options.server) } } - } - const routeHandler = - typeof handler === 'function' ? handler : handler.handler - if (routeHandler) { - const parsedHandler = withParsedParams(routeHandler, matchedRoutes) - if (!mayDefer) { - terminalHandler = parsedHandler - terminalNext = throwIfMayNotDefer - } else { - routeMiddlewares.push(parsedHandler) + if (handler.handler) { + routeMiddlewares.push(handlerToMiddleware(handler.handler, mayDefer)) } } } } - const response = await executeMiddleware( + // Final middleware: execute router with matched routes for dev styles + routeMiddlewares.push(((ctx: TODO) => + executeRouter(ctx.context, matchedRoutes)) as TODO) + + const { ctx, response } = await executeMiddleware( routeMiddlewares, - terminalHandler, { request, context, @@ -1232,10 +975,27 @@ async function handleServerRoutes({ pathname, handlerType: 'router', }, - signal, - event, - terminalNext, + request.signal, ) + // RFC 9110 §9.3.2: HEAD must carry the same header fields as GET but no body. + // Resolve any redirect before stripping so the Location header survives. + if (isHeadFallback) { + if (!ctx.response) { + throwRouteHandlerError() + } + + const resolved = await handleRedirectResponse( + response, + getRouter, + request.signal, + false, + ) + return waitForRequest( + stripSsrResponseBody(resolved, 'HEAD body stripped'), + request.signal, + ) + } + return normalizeSsrResponse(response) } diff --git a/packages/start-server-core/src/early-hints.ts b/packages/start-server-core/src/early-hints.ts index 4b504d77d5..f46cf5f587 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', } - addEarlyHintFetchAttrs(hint, attrs) + if (attrs.crossOrigin !== undefined) hint.crossOrigin = attrs.crossOrigin hints.push(hint) } diff --git a/packages/start-server-core/src/finalManifest.ts b/packages/start-server-core/src/finalManifest.ts index f1a9a7044e..274e6cb000 100644 --- a/packages/start-server-core/src/finalManifest.ts +++ b/packages/start-server-core/src/finalManifest.ts @@ -3,7 +3,10 @@ import { resolveTransformAssetsConfig, transformManifestAssets, } from './transformAssetUrls' -import { getStaticInlineCss, resolveInlineCssForRequest } from './inlineCss' +import { + getStaticHandlerInlineCssDefault, + resolveInlineCssForRequest, +} from './inlineCss' import type { ServerManifest } from '@tanstack/router-core' import type { HandlerInlineCssOption } from './inlineCss' import type { @@ -37,12 +40,7 @@ export interface FinalManifestOptions { } type FinalManifestCacheKey = 'inline-css' | 'linked-css' -// 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 -> +type FinalManifestCache = Map> export type GetBaseManifest = () => Promise export interface FinalManifestRequestOptions { @@ -64,9 +62,7 @@ export interface FinalManifestResolver { warmup: (opts: { getBaseManifest: GetBaseManifest }) => Promise | undefined - resolveCached: ( - opts: FinalManifestRequestOptions, - ) => ServerManifest | Promise + resolveCached: (opts: FinalManifestRequestOptions) => Promise resolveUncached: ( opts: FinalManifestRequestOptions, ) => Promise @@ -147,7 +143,9 @@ export function createFinalManifestResolver( opts.transformAssets, { cacheCreateTransform: opts.cacheCreateTransform }, ) - const handlerDefaultInlineCss = getStaticInlineCss(undefined, opts.inlineCss) + const handlerDefaultInlineCss = getStaticHandlerInlineCssDefault( + opts.inlineCss, + ) const getRequestManifestOptions = async ( requestOpts: FinalManifestRequestOptions, @@ -192,24 +190,8 @@ export function createFinalManifestResolver( transformResolver.getTransformFn({ warmup: true }), onError: transformResolver.clearCachedCreateTransform, }), - 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) - }, + resolveCached: (requestOpts) => + resolveRequest(requestOpts, finalManifestCache), resolveUncached: (requestOpts) => resolveRequest(requestOpts, undefined), } } @@ -219,41 +201,35 @@ function getFinalManifestCacheKey(inlineCss: boolean): FinalManifestCacheKey { } function cacheFinalManifestPromise( - finalManifestCache: FinalManifestCache, + cachedFinalManifestPromises: FinalManifestCache, cacheKey: FinalManifestCacheKey, promise: Promise, ): Promise { - 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 - }, - ) + const cachedFinalManifestPromise = promise.catch((error) => { + if ( + cachedFinalManifestPromises.get(cacheKey) === cachedFinalManifestPromise + ) { + cachedFinalManifestPromises.delete(cacheKey) + } + throw error + }) - finalManifestCache.set(cacheKey, cachedPromise) - return cachedPromise + cachedFinalManifestPromises.set(cacheKey, cachedFinalManifestPromise) + return cachedFinalManifestPromise } -function getOrCreateCachedFinalManifest( - finalManifestCache: FinalManifestCache, +function getOrCreateCachedFinalManifestPromise( + cachedFinalManifestPromises: FinalManifestCache, cacheKey: FinalManifestCacheKey, computeFinalManifest: () => Promise, -): ServerManifest | Promise { - const cached = finalManifestCache.get(cacheKey) - if (cached) { - return cached +): Promise { + const cachedFinalManifestPromise = cachedFinalManifestPromises.get(cacheKey) + if (cachedFinalManifestPromise) { + return cachedFinalManifestPromise } return cacheFinalManifestPromise( - finalManifestCache, + cachedFinalManifestPromises, cacheKey, Promise.resolve().then(computeFinalManifest), ) @@ -287,7 +263,7 @@ async function resolveFinalManifest(opts: { } if (opts.finalManifestCache && (!opts.transformFn || opts.cache)) { - return getOrCreateCachedFinalManifest( + return getOrCreateCachedFinalManifestPromise( opts.finalManifestCache, getFinalManifestCacheKey(opts.inlineCss), computeFinalManifest, @@ -314,13 +290,11 @@ function warmupFinalManifest(opts: { return undefined } - // Warmup runs when the handler is created, before any request fills the - // cache. const inlineCss = opts.handlerDefaultInlineCss - const warmupPromise = cacheFinalManifestPromise( + const warmupPromise = getOrCreateCachedFinalManifestPromise( opts.finalManifestCache, getFinalManifestCacheKey(inlineCss), - Promise.resolve().then(async () => { + async () => { const [base, transformFn] = await Promise.all([ opts.getBaseManifest(), opts.getTransformFn(), @@ -331,7 +305,7 @@ function warmupFinalManifest(opts: { transformFn, inlineCss, }) - }), + }, ) if (opts.onError) { diff --git a/packages/start-server-core/src/frame-protocol.ts b/packages/start-server-core/src/frame-protocol.ts index b1f32eb702..e96275c0bb 100644 --- a/packages/start-server-core/src/frame-protocol.ts +++ b/packages/start-server-core/src/frame-protocol.ts @@ -8,41 +8,31 @@ * - payload: variable length bytes */ -import { - FRAME_HEADER_SIZE, - FRAME_TYPE_CHUNK, - FRAME_TYPE_END, - FRAME_TYPE_ERROR, - FRAME_TYPE_JSON, - MAX_FRAME_PAYLOAD_SIZE, -} from '@tanstack/start-client-core/client-rpc' +// Re-export constants from shared location +import { FRAME_HEADER_SIZE, FrameType } from '@tanstack/start-client-core' -type FrameType = - | typeof FRAME_TYPE_JSON - | typeof FRAME_TYPE_CHUNK - | typeof FRAME_TYPE_END - | typeof FRAME_TYPE_ERROR +export { + FRAME_HEADER_SIZE, + FrameType, + TSS_CONTENT_TYPE_FRAMED, + TSS_CONTENT_TYPE_FRAMED_VERSIONED, + TSS_FRAMED_PROTOCOL_VERSION, +} from '@tanstack/start-client-core' /** Cached TextEncoder for frame encoding */ const textEncoder = new TextEncoder() /** Shared empty payload for END frames - avoids allocation per call */ const EMPTY_PAYLOAD = new Uint8Array(0) -const MAX_ERROR_MESSAGE_CODE_UNITS = 4096 /** * Encodes a single frame with header and payload. */ -function encodeFrame( +export function encodeFrame( type: FrameType, streamId: number, payload: Uint8Array, ): Uint8Array { - if (payload.byteLength > MAX_FRAME_PAYLOAD_SIZE) { - throw new RangeError( - `Frame payload exceeds ${MAX_FRAME_PAYLOAD_SIZE} bytes`, - ) - } const frame = new Uint8Array(FRAME_HEADER_SIZE + payload.length) // Write header bytes directly to avoid DataView allocation per frame // Frame format: [type:1][streamId:4 BE][length:4 BE] @@ -59,15 +49,37 @@ function encodeFrame( return frame } -/** Encodes an error message payload, truncated to a bounded length. */ -function encodeErrorPayload(error: unknown): Uint8Array { - const originalMessage = - error instanceof Error ? error.message : String(error ?? 'Unknown error') +/** + * Encodes a JSON frame (type 0, streamId 0). + */ +export function encodeJSONFrame(json: string): Uint8Array { + return encodeFrame(FrameType.JSON, 0, textEncoder.encode(json)) +} + +/** + * Encodes a raw stream chunk frame. + */ +export function encodeChunkFrame( + streamId: number, + chunk: Uint8Array, +): Uint8Array { + return encodeFrame(FrameType.CHUNK, streamId, chunk) +} + +/** + * Encodes a raw stream end frame. + */ +export function encodeEndFrame(streamId: number): Uint8Array { + return encodeFrame(FrameType.END, streamId, EMPTY_PAYLOAD) +} + +/** + * Encodes a raw stream error frame. + */ +export function encodeErrorFrame(streamId: number, error: unknown): Uint8Array { const message = - originalMessage.length > MAX_ERROR_MESSAGE_CODE_UNITS - ? `${originalMessage.slice(0, MAX_ERROR_MESSAGE_CODE_UNITS)}…` - : originalMessage - return textEncoder.encode(message) + error instanceof Error ? error.message : String(error ?? 'Unknown error') + return encodeFrame(FrameType.ERROR, streamId, textEncoder.encode(message)) } /** @@ -79,280 +91,168 @@ export interface LateStreamRegistration { stream: ReadableStream } -/** One serialized JSON patch and the raw streams referenced by that patch. */ -export interface MultiplexedStreamRecord { - json: Uint8Array - rawStreams: Array -} - -export interface MultiplexedStreamOptions { - onCancel?: (reason?: unknown) => void - signal?: AbortSignal -} - -type CancellableReader = Pick< - ReadableStreamDefaultReader, - 'cancel' | 'releaseLock' -> - /** - * Creates a multiplexed ReadableStream from serialized response records. + * Creates a multiplexed ReadableStream from JSON stream and raw streams. * - * A record's JSON frame is admitted before any raw stream referenced by that - * record starts. Raw streams from admitted records are pumped concurrently. - * The caller bounds the stream count before records reach this function. + * The JSON stream emits NDJSON lines (from seroval's toCrossJSONStream). + * Raw streams are pumped concurrently, interleaved with JSON frames. + * + * Supports late stream registration for RawStreams discovered after initial + * serialization (e.g., from resolved Promises). + * + * @param jsonStream Stream of JSON strings (each string is one NDJSON line) + * @param rawStreams Map of stream IDs to raw binary streams (known at start) + * @param lateStreamSource Optional stream of late registrations for streams discovered later */ export function createMultiplexedStream( - recordStream: ReadableStream, - options: MultiplexedStreamOptions = {}, + jsonStream: ReadableStream, + rawStreams: Map>, + lateStreamSource?: ReadableStream, ): ReadableStream { + // Shared state for the multiplexed stream let controller: ReadableStreamDefaultController - let stopped: false | [unknown] = false - let activePumps = 0 - let wakeDemand: (() => void) | undefined - let admission: Promise | undefined - const readers = new Set() - const pendingRawStreams = new Set>() - const abortOutput = () => errorOutput(options.signal?.reason) + let cancelled = false + const readers: Array> = [] - const wakeAdmission = () => { - const wake = wakeDemand - wakeDemand = undefined - wake?.() - } - - const cancelReader = (reader: CancellableReader, reason?: unknown) => { - void reader.cancel(reason).catch(() => {}) - } - - const cancelStream = (stream: ReadableStream, reason?: unknown) => { - void stream.cancel(reason).catch(() => {}) - } - - const stop = (reason?: unknown) => { - if (stopped) { + // Helper to enqueue a frame, ignoring errors if stream is closed/cancelled + const enqueue = (frame: Uint8Array): boolean => { + if (cancelled) return false + try { + controller.enqueue(frame) + return true + } catch { return false } - stopped = [reason] - options.signal?.removeEventListener('abort', abortOutput) - wakeAdmission() - for (const reader of readers) { - cancelReader(reader, reason) - } - for (const stream of pendingRawStreams) { - cancelStream(stream, reason) - } - pendingRawStreams.clear() - return true } - const errorOutput = (error: unknown) => { - if (!stop(error)) { - return - } + // Helper to error the output stream (for fatal errors like JSON stream failure) + const errorOutput = (error: unknown): void => { + if (cancelled) return + cancelled = true try { controller.error(error) } catch { - // The output was already closed by its consumer. + // Already errored + } + // Cancel all readers to stop other pumps + for (const reader of readers) { + reader.cancel().catch(() => {}) } } - const waitForDemand = async () => { - while (!stopped && (controller.desiredSize ?? 0) <= 0) { - await new Promise((resolve) => { - wakeDemand = resolve - }) - } - return !stopped - } - - // Only the pump at the head of this chain may inspect desiredSize and - // enqueue. Each other pump can retain at most one unencoded source chunk. - // The frame is encoded only once the output has demand for it. - const admitFrame = ( - type: FrameType, - streamId: number, - payload: Uint8Array, - ): boolean | Promise => { - if (stopped) { - return false - } - if (!admission && (controller.desiredSize ?? 0) > 0) { - controller.enqueue(encodeFrame(type, streamId, payload)) - return true - } - - const runAdmission = async () => { - if (!(await waitForDemand())) { - return false - } - controller.enqueue(encodeFrame(type, streamId, payload)) - return true - } - const result = admission ? admission.then(runAdmission) : runAdmission() - const clearAdmission = () => { - if (admission === tail) { - admission = undefined - } - } - const tail = result.then(clearAdmission, clearAdmission) - admission = tail - return result - } - - const maybeClose = () => { - if (activePumps !== 0 || !stop()) { - return - } - try { - controller.close() - } catch { - // The output was already closed by its consumer. - } - } - - const startPump = (pump: () => Promise) => { - activePumps++ - void pump().then( - () => { - activePumps-- - maybeClose() - }, - (error) => { - activePumps-- - errorOutput(error) - }, - ) - } - + // Pumps a raw stream, sending CHUNK frames and END/ERROR on completion async function pumpRawStream( streamId: number, stream: ReadableStream, - ) { + ): Promise { const reader = stream.getReader() - readers.add(reader) + readers.push(reader) try { - while (!stopped) { + while (!cancelled) { const { done, value } = await reader.read() - // Cancellation can run while the read is suspended. - // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition - if (stopped) { - return - } if (done) { - const frameAdmission = admitFrame( - FRAME_TYPE_END, - streamId, - EMPTY_PAYLOAD, - ) - if (frameAdmission !== true) { - await frameAdmission - } + enqueue(encodeEndFrame(streamId)) return } - if (!(value instanceof Uint8Array)) { - throw new TypeError('RawStream chunks must be Uint8Array') - } - // One frame per read, split only when the chunk exceeds a frame. - let offset = 0 - do { - const chunk = - value.byteLength <= MAX_FRAME_PAYLOAD_SIZE - ? value - : value.subarray(offset, offset + MAX_FRAME_PAYLOAD_SIZE) - const frameAdmission = admitFrame(FRAME_TYPE_CHUNK, streamId, chunk) - if ( - frameAdmission !== true && - (frameAdmission === false || !(await frameAdmission)) - ) { - return - } - offset += MAX_FRAME_PAYLOAD_SIZE - } while (offset < value.byteLength) + if (!enqueue(encodeChunkFrame(streamId, value))) return } } catch (error) { - if (!stopped) { - // A raw-stream failure is isolated to that stream. - const frameAdmission = admitFrame( - FRAME_TYPE_ERROR, - streamId, - encodeErrorPayload(error), - ) - if (frameAdmission !== true) { - await frameAdmission - } - } + // Raw stream error - send ERROR frame, don't fail entire response + enqueue(encodeErrorFrame(streamId, error)) } finally { - readers.delete(reader) reader.releaseLock() } } - async function pumpRecords() { - const reader = recordStream.getReader() - readers.add(reader) + // Pumps the JSON stream, sending JSON frames + // JSON stream errors are fatal - they error the entire output + async function pumpJSON(): Promise { + const reader = jsonStream.getReader() + readers.push(reader) try { - while (!stopped) { + while (!cancelled) { const { done, value } = await reader.read() - // Cancellation can run while the read is suspended. - // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition - if (stopped) { - if (!done) { - for (const registration of value.rawStreams) { - cancelStream(registration.stream, stopped[0]) - } - } - return - } - if (done) { - return - } - for (const registration of value.rawStreams) { - pendingRawStreams.add(registration.stream) - } - const frameAdmission = admitFrame(FRAME_TYPE_JSON, 0, value.json) - if ( - frameAdmission !== true && - (frameAdmission === false || !(await frameAdmission)) - ) { - return - } - for (const registration of value.rawStreams) { - pendingRawStreams.delete(registration.stream) - startPump( - pumpRawStream.bind(undefined, registration.id, registration.stream), - ) - } + if (done) return + if (!enqueue(encodeJSONFrame(value))) return } } catch (error) { - if (!stopped) { - // JSON records describe the response graph, so losing one is fatal. - errorOutput(error) - } + // JSON stream error is fatal - error the entire output + errorOutput(error) + throw error // Re-throw to signal failure to Promise.all } finally { - readers.delete(reader) reader.releaseLock() } } + // Pumps late stream registrations, spawning raw stream pumps as they arrive + async function pumpLateStreams(): Promise>> { + if (!lateStreamSource) return [] + + const lateStreamPumps: Array> = [] + const reader = lateStreamSource.getReader() + readers.push(reader) + try { + while (!cancelled) { + const { done, value } = await reader.read() + if (done) break + // Start pumping this late stream and track it + lateStreamPumps.push(pumpRawStream(value.id, value.stream)) + } + } finally { + reader.releaseLock() + } + return lateStreamPumps + } + return new ReadableStream({ - start(ctrl) { + async start(ctrl) { controller = ctrl - if (options.signal?.aborted) { - cancelStream(recordStream, options.signal.reason) - errorOutput(options.signal.reason) - return + + // Collect all pump promises + const pumps: Array>>> = [pumpJSON()] + + for (const [streamId, stream] of rawStreams) { + pumps.push(pumpRawStream(streamId, stream)) } - options.signal?.addEventListener('abort', abortOutput, { once: true }) - startPump(pumpRecords) - }, - pull() { - wakeAdmission() - }, - cancel(reason) { - if (stop(reason)) { - options.onCancel?.(reason) + + // Add late stream pump (returns array of spawned pump promises) + if (lateStreamSource) { + pumps.push(pumpLateStreams()) } + + try { + // Wait for initial pumps to complete + const results = await Promise.all(pumps) + + // Wait for any late stream pumps that were spawned + const latePumps = results.find(Array.isArray) as + | Array> + | undefined + if (latePumps && latePumps.length > 0) { + await Promise.all(latePumps) + } + + // All pumps done - close the output stream + if (!cancelled) { + try { + controller.close() + } catch { + // Already closed + } + } + } catch { + // Error already handled by errorOutput in pumpJSON + // or was a raw stream error (non-fatal, already sent ERROR frame) + } + }, + + cancel() { + cancelled = true + // Cancel all readers to stop pumps quickly + for (const reader of readers) { + reader.cancel().catch(() => {}) + } + readers.length = 0 }, }) } diff --git a/packages/start-server-core/src/headers.ts b/packages/start-server-core/src/headers.ts deleted file mode 100644 index e336588a32..0000000000 --- a/packages/start-server-core/src/headers.ts +++ /dev/null @@ -1,14 +0,0 @@ -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 00d036b024..ee818e0cf1 100644 --- a/packages/start-server-core/src/index.tsx +++ b/packages/start-server-core/src/index.tsx @@ -30,6 +30,8 @@ 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 6fd7bd7fe2..249b7f40c8 100644 --- a/packages/start-server-core/src/inlineCss.ts +++ b/packages/start-server-core/src/inlineCss.ts @@ -4,21 +4,13 @@ export type HandlerInlineCssOption = | boolean | ((ctx: { request: Request }) => Awaitable) -/** - * 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, +export function getStaticHandlerInlineCssDefault( handlerInlineCss: HandlerInlineCssOption | undefined, -): boolean | undefined { - if (requestInlineCss !== undefined) { - return requestInlineCss - } +) { if (typeof handlerInlineCss === 'function') { return undefined } + return handlerInlineCss ?? true } @@ -27,15 +19,13 @@ export async function resolveInlineCssForRequest(opts: { handlerInlineCss: HandlerInlineCssOption | undefined requestInlineCss: boolean | undefined }) { - const inlineCss = getStaticInlineCss( - opts.requestInlineCss, - opts.handlerInlineCss, - ) - if (inlineCss !== undefined) { - return inlineCss + if (opts.requestInlineCss !== undefined) { + return opts.requestInlineCss } - // Only a handler callback leaves the choice open. - return await ( - opts.handlerInlineCss as Exclude - )({ request: opts.request }) + + if (typeof opts.handlerInlineCss === 'function') { + return await opts.handlerInlineCss({ request: opts.request }) + } + + return opts.handlerInlineCss ?? true } diff --git a/packages/start-server-core/src/internal-request-response.ts b/packages/start-server-core/src/internal-request-response.ts deleted file mode 100644 index 90128ab29c..0000000000 --- a/packages/start-server-core/src/internal-request-response.ts +++ /dev/null @@ -1,1490 +0,0 @@ -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 83c529ff9f..e0ad8a336a 100644 --- a/packages/start-server-core/src/request-response.ts +++ b/packages/start-server-core/src/request-response.ts @@ -1,30 +1,428 @@ -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 { AsyncLocalStorage } from 'node:async_hooks' -export type { - ReadonlyResponseHeaders, +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, RequestHeaderName, + ResponseHeaderMap, ResponseHeaderName, -} from './internal-request-response' + 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() + for (const [name, value] of Object.entries(headers)) { + event.res.headers.set(name, value) + } +} + +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) +} diff --git a/packages/start-server-core/src/serializer/ServerFunctionSerializationAdapter.ts b/packages/start-server-core/src/serializer/ServerFunctionSerializationAdapter.ts index 0eb4993cac..d127b253d5 100644 --- a/packages/start-server-core/src/serializer/ServerFunctionSerializationAdapter.ts +++ b/packages/start-server-core/src/serializer/ServerFunctionSerializationAdapter.ts @@ -18,18 +18,7 @@ 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( - { - 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 - } + const result = await serverFn(opts ?? {}, signal) 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 9fdad40281..e7d961decf 100644 --- a/packages/start-server-core/src/server-functions-handler.ts +++ b/packages/start-server-core/src/server-functions-handler.ts @@ -1,186 +1,51 @@ -import { invariant, isNotFound, isRedirect } from '@tanstack/router-core' import { createRawStreamRPCPlugin, - defaultSerovalDeserializerPlugins as routerDefaultSerovalPlugins, -} from '@tanstack/router-core/ssr/server' + invariant, + isNotFound, + isRedirect, +} from '@tanstack/router-core' import { - TSS_CONTENT_TYPE_FRAMED_VERSIONED, TSS_FORMDATA_CONTEXT, X_TSS_RAW_RESPONSE, X_TSS_SERIALIZED, - getSerovalPlugins, + getDefaultSerovalPlugins, + 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 { - createFinalizedResponse, - getErrorHeaders, - getParsedRequestUrl, - getSerializedResponseState, - protectResponseHeaders, - resolveErrorResponseStatus, - setProtectedResponseHeaders, -} from './internal-request-response' +import { getResponse } from './request-response' import { getServerFnById } from './getServerFnById' -import { createMultiplexedStream } from './frame-protocol' -import type { - LateStreamRegistration, - MultiplexedStreamOptions, - MultiplexedStreamRecord, +import { + TSS_CONTENT_TYPE_FRAMED_VERSIONED, + createMultiplexedStream, } from './frame-protocol' +import type { LateStreamRegistration } from './frame-protocol' import type { Plugin as SerovalPlugin } from 'seroval' -import type { StartEvent } from './internal-request-response' -// 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', -}) +// Cache serovalPlugins at module level to avoid repeated calls +let serovalPlugins: Array> | undefined = undefined -/** 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'], -]) +// Known FormData 'Content-Type' header values - module-level constant +const FORM_DATA_CONTENT_TYPES = [ + 'multipart/form-data', + 'application/x-www-form-urlencoded', +] // Maximum payload size for GET requests (1MB) const MAX_PAYLOAD_SIZE = 1_000_000 -const MAX_PENDING_SERIALIZATION_RECORDS = 1024 -const MAX_PENDING_SERIALIZATION_BYTES = 32 * 1024 * 1024 -const textEncoder = new TextEncoder() -function encodeSerializationRecord(value: unknown) { - return textEncoder.encode(JSON.stringify(value)) -} - -function exceedsPendingSerializationLimit( - record: Uint8Array, - recordCount: number, - pendingBytes: number, -) { - return ( - recordCount >= MAX_PENDING_SERIALIZATION_RECORDS || - pendingBytes + record.byteLength > MAX_PENDING_SERIALIZATION_BYTES - ) -} - -function runSerializationCleanup(dispose: () => void) { - try { - dispose() - } catch {} -} - -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 method = request.method + const methodUpper = method.toUpperCase() + const url = new URL(request.url) + const action = await getServerFnById(serverFnId, { origin: 'client' }) // Early method check: reject mismatched HTTP methods before parsing @@ -197,420 +62,370 @@ export const handleServerAction = async ({ ) } - const headers = request.headers - const isServerFn = headers.get('x-tsr-serverfn') === 'true' - let serovalPlugins: Array> | undefined - const getRequestSerovalPlugins = () => { - return (serovalPlugins ??= getSerovalPlugins(routerDefaultSerovalPlugins)) + const isServerFn = request.headers.get('x-tsr-serverFn') === 'true' + + // Initialize serovalPlugins lazily (cached at module level) + if (!serovalPlugins) { + serovalPlugins = getDefaultSerovalPlugins() } - const contentType = headers.get('content-type') - try { - let res: any - if ( - 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') { - if (process.env.NODE_ENV !== 'production') { - throw new Error( - 'Invariant failed: GET requests with FormData payloads are not supported', + const contentType = request.headers.get('Content-Type') + + function parsePayload(payload: any) { + const parsedPayload = fromJSON(payload, { plugins: serovalPlugins }) + return parsedPayload as any + } + + const response = await (async () => { + try { + let res = await (async () => { + // FormData + if ( + FORM_DATA_CONTENT_TYPES.some( + (type) => contentType && contentType.includes(type), ) - } + ) { + // We don't support GET requests with FormData payloads... that seems impossible + if (methodUpper === 'GET') { + if (process.env.NODE_ENV !== 'production') { + throw new Error( + 'Invariant failed: GET requests with FormData payloads are not supported', + ) + } - invariant() - } - const formData = await request.formData() - const serializedContext = formData.get(TSS_FORMDATA_CONTEXT) - formData.delete(TSS_FORMDATA_CONTEXT) - - const params: { context?: unknown; data: FormData; method: string } = { - data: formData, - method: methodUpper, - } - if (typeof serializedContext === 'string') { - try { - const parsedContext = JSON.parse(serializedContext) - const deserializedContext = fromJSON(parsedContext, { - plugins: getRequestSerovalPlugins(), - }) - if (typeof deserializedContext === 'object' && deserializedContext) { - params.context = deserializedContext + invariant() } - } catch (e) { - // Log warning for debugging but don't expose to client - if (process.env.NODE_ENV === 'development') { - console.warn('Failed to parse FormData context:', e) + const formData = await request.formData() + const serializedContext = formData.get(TSS_FORMDATA_CONTEXT) + formData.delete(TSS_FORMDATA_CONTEXT) + + const params = { + context, + data: formData, + method: methodUpper, } + if (typeof serializedContext === 'string') { + try { + const parsedContext = JSON.parse(serializedContext) + const deserializedContext = fromJSON(parsedContext, { + plugins: serovalPlugins, + }) + if ( + typeof deserializedContext === 'object' && + deserializedContext + ) { + params.context = safeObjectMerge( + deserializedContext as Record, + context, + ) + } + } catch (e) { + // Log warning for debugging but don't expose to client + if (process.env.NODE_ENV === 'development') { + console.warn('Failed to parse FormData context:', e) + } + } + } + + return await action(params) } - } - res = await action(params) - } else { - 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') + // Get requests use the query string + 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') + } + // If there's a payload, we should try to parse it + const payload: any = payloadParam + ? parsePayload(JSON.parse(payloadParam)) + : {} + payload.context = safeObjectMerge(payload.context, context) + payload.method = methodUpper + // Send it through! + return await action(payload) } - json = payloadParam ? JSON.parse(payloadParam) : undefined - } else if (contentType?.includes('application/json')) { - json = await request.json() + + let jsonPayload + if (contentType?.includes('application/json')) { + jsonPayload = await request.json() + } + + const payload = jsonPayload ? parsePayload(jsonPayload) : {} + payload.context = safeObjectMerge(payload.context, context) + payload.method = methodUpper + return await action(payload) + })() + + const unwrapped = res.result || res.error + + if (isNotFound(res)) { + res = isNotFoundResponse(res) } - 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 failed = 'error' in res - const unwrapped = failed ? res.error : res.result - - if ( - !isServerFn && - (unwrapped instanceof Response || - unwrapped === null || - typeof unwrapped !== 'object') - ) { - return unwrapped - } - - if (unwrapped instanceof Response) { - if (failed) { - return toThrownServerFnResponse(unwrapped) - } - if (isRedirect(unwrapped)) { + if (!isServerFn) { return unwrapped } - return setProtectedResponseHeaders(unwrapped, RAW_RESPONSE_HEADERS) - } - return serializeResult(res, request, getRequestSerovalPlugins()) - } catch (error: any) { - if (error instanceof Response) { - return error - } + if (unwrapped instanceof Response) { + if (isRedirect(unwrapped)) { + return unwrapped + } + unwrapped.headers.set(X_TSS_RAW_RESPONSE, 'true') + return unwrapped + } - // Currently this server-side context has no idea how to - // build final URLs, so we need to defer that to the client. - // The client will check for __redirect and __notFound keys, - // and if they exist, it will handle them appropriately. + return serializeResult(res) - return createServerFnErrorResponse(error, serovalPlugins) - } -} + function serializeResult(res: unknown): Response { + let nonStreamingBody: any = undefined -/** - * Serializes a server-function result. A result that Seroval completes - * synchronously without RawStreams becomes plain JSON; everything else is a - * framed response whose records and raw streams are multiplexed in order. - */ -function serializeResult( - res: unknown, - request: Request, - plugins: Array>, -): Response | DeferredResponse { - const initialRecords: Array = [] - let initialBytes = 0 - const pendingRawStreams: Array = [] + const alsResponse = getResponse() + if (res !== undefined) { + // Collect raw streams encountered during initial synchronous serialization + const rawStreams = new Map>() - // Seroval replays synchronously discovered work before returning. Collect - // that first pass so a complete result can skip framing entirely. - let done = false as boolean - let initialParsed = false - let serializationFailure: [unknown] | undefined - let disposeSerialization: (() => void) | undefined - let onParse = (value: any, initial: boolean) => { - if (serializationFailure) { - return - } - initialParsed ||= initial - const record = encodeSerializationRecord(value) - if ( - exceedsPendingSerializationLimit( - record, - initialRecords.length, - initialBytes, - ) - ) { - serializationFailure = [ - new Error( - 'Server function serialization exceeded its pending output limit', + // Track whether we're still in the initial synchronous phase + // After initial phase, new RawStreams go to lateStreamWriter + let initialPhase = true + + // Late stream registration for RawStreams discovered after initial pass + // (e.g., from resolved Promises) + let lateStreamWriter: + | WritableStreamDefaultWriter + | undefined + let lateStreamReadable: + | ReadableStream + | undefined = undefined + const pendingLateStreams: Array = [] + + const rawStreamPlugin = createRawStreamRPCPlugin( + (id: number, stream: ReadableStream) => { + if (initialPhase) { + rawStreams.set(id, stream) + return + } + + if (lateStreamWriter) { + // Late stream - write to the late stream channel + lateStreamWriter.write({ id, stream }).catch(() => { + // Ignore write errors - stream may be closed + }) + return + } + + // Discovered after initial phase but before writer exists. + pendingLateStreams.push({ id, stream }) + }, + ) + + // Build plugins with RawStreamRPCPlugin first (before default SSR plugin) + const plugins = [rawStreamPlugin, ...(serovalPlugins || [])] + + // first run without the stream in case `result` does not need streaming + let done = false as boolean + const callbacks: { + onParse: (value: any) => void + onDone: () => void + onError: (error: any) => void + } = { + onParse: (value) => { + nonStreamingBody = value + }, + onDone: () => { + done = true + }, + onError: (error) => { + throw error + }, + } + toCrossJSONStream(res, { + refs: new Map(), + plugins, + onParse(value) { + callbacks.onParse(value) + }, + onDone() { + callbacks.onDone() + }, + onError: (error) => { + callbacks.onError(error) + }, + }) + + // End of initial synchronous phase - any new RawStreams are "late" + initialPhase = false + + // If any RawStreams are discovered after this point but before the + // late-stream writer exists, we buffer them and flush once the writer + // is ready. This avoids an occasional missed-stream race. + + // If no raw streams and done synchronously, return simple JSON + if (done && rawStreams.size === 0) { + return new Response( + nonStreamingBody ? JSON.stringify(nonStreamingBody) : undefined, + { + status: alsResponse.status, + statusText: alsResponse.statusText, + headers: { + 'Content-Type': 'application/json', + [X_TSS_SERIALIZED]: 'true', + }, + }, + ) + } + + // Not done synchronously or has raw streams - use framed protocol + // This supports late RawStreams from resolved Promises + const { readable, writable } = + new TransformStream() + lateStreamReadable = readable + lateStreamWriter = writable.getWriter() + + // Flush any late streams that were discovered in the small window + // between end of initial serialization and writer setup. + for (const registration of pendingLateStreams) { + lateStreamWriter.write(registration).catch(() => { + // Ignore write errors - stream may be closed + }) + } + pendingLateStreams.length = 0 + + // Create a stream of JSON chunks + const jsonStream = new ReadableStream({ + start(controller) { + callbacks.onParse = (value) => { + controller.enqueue(JSON.stringify(value) + '\n') + } + callbacks.onDone = () => { + try { + controller.close() + } catch { + // Already closed + } + // Close late stream writer when JSON serialization is done + // Any RawStreams not yet discovered won't be sent + lateStreamWriter + ?.close() + .catch(() => { + // Ignore close errors + }) + .finally(() => { + lateStreamWriter = undefined + }) + } + + callbacks.onError = (error) => { + controller.error(error) + lateStreamWriter + ?.abort(error) + .catch(() => { + // Ignore abort errors + }) + .finally(() => { + lateStreamWriter = undefined + }) + } + + // Emit initial body if we have one + if (nonStreamingBody !== undefined) { + callbacks.onParse(nonStreamingBody) + } + // If serialization already completed synchronously, close now + // This handles the case where onDone was called during toCrossJSONStream + // before we overwrote callbacks.onDone + if (done) { + callbacks.onDone() + } + }, + cancel() { + lateStreamWriter?.abort().catch(() => {}) + lateStreamWriter = undefined + }, + }) + + // Create multiplexed stream with JSON, initial raw streams, and late streams + const multiplexedStream = createMultiplexedStream( + jsonStream, + rawStreams, + lateStreamReadable, + ) + + return new Response(multiplexedStream, { + status: alsResponse.status, + statusText: alsResponse.statusText, + headers: { + 'Content-Type': TSS_CONTENT_TYPE_FRAMED_VERSIONED, + [X_TSS_SERIALIZED]: 'true', + }, + }) + } + + return new Response(undefined, { + status: alsResponse.status, + statusText: alsResponse.statusText, + }) + } + } catch (error: any) { + if (error instanceof Response) { + return error + } + // else if ( + // isPlainObject(error) && + // 'result' in error && + // error.result instanceof Response + // ) { + // return error.result + // } + + // Currently this server-side context has no idea how to + // build final URLs, so we need to defer that to the client. + // 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.info() + console.info('Server Fn Error!') + console.info() + console.error(error) + console.info() + + const serializedError = JSON.stringify( + await Promise.resolve( + toCrossJSONAsync(error, { + refs: new Map(), + plugins: serovalPlugins, + }), ), - ] - return - } - initialRecords.push(record) - initialBytes += record.byteLength - } - let onDone = () => { - if (initialParsed) { - done = true - } - } - let onError = (error: any) => { - serializationFailure ??= [error] - } - const rawStreamPlugin = createRawStreamRPCPlugin( - (id: number, stream: ReadableStream) => { - if (serializationFailure) { - cancelRawStream(stream, serializationFailure[0]) - return - } - if (id > MAX_FRAMED_STREAMS) { - const error = new Error( - `Too many raw streams in framed response (max ${MAX_FRAMED_STREAMS})`, - ) - cancelRawStream(stream, error) - onError(error) - return - } - pendingRawStreams.push({ id, stream }) - }, - ) - - const dispose = toCrossJSONStream(res, { - refs: new Map(), - plugins: [rawStreamPlugin, ...plugins], - onParse(value, initial) { - onParse(value, initial) - }, - onDone() { - onDone() - }, - onError: (error) => { - onError(error) - }, - }) - if (serializationFailure) { - runSerializationCleanup(dispose) - for (const registration of pendingRawStreams) { - cancelRawStream(registration.stream, serializationFailure[0]) - } - throw serializationFailure[0] - } - if (!done) { - disposeSerialization = dispose - } - - if (done && pendingRawStreams.length === 0 && initialRecords.length === 1) { - return new DeferredResponse(initialRecords[0]!) - } - - if (done && initialRecords.length === 1) { - const json = initialRecords[0]! - if (json.byteLength > MAX_FRAME_PAYLOAD_SIZE) { - const error = new Error( - 'Server function serialization exceeded its pending output limit', ) - for (const registration of pendingRawStreams) { - cancelRawStream(registration.stream, error) - } - throw error - } - - // Serialization is complete, so this one bounded record needs no writer - // or pending-serialization lifecycle. The mux still controls raw demand. - const rawStreams = pendingRawStreams.splice(0) - initialRecords.length = 0 - return createFramedResponse( - new ReadableStream({ - start(controller) { - controller.enqueue({ json, rawStreams }) - controller.close() + const response = getResponse() + return new Response(serializedError, { + status: response.status ?? 500, + statusText: response.statusText, + headers: { + 'Content-Type': 'application/json', + [X_TSS_SERIALIZED]: 'true', }, - cancel(reason) { - for (const registration of rawStreams) { - cancelRawStream(registration.stream, reason) - } - }, - }), - { signal: request.signal }, - ) - } - - // Couple every JSON patch to the RawStreams it introduces. The mux admits - // each JSON reference before it starts that stream's chunks. - const { readable, writable } = new TransformStream() - const writer = writable.getWriter() - const recordAbortController = new AbortController() - let pendingBytes = 0 - const pendingRecords = new Set() - - const abortRecordStream = (error: unknown) => { - if (serializationFailure) { - return + }) } - serializationFailure = [error] - const disposeCurrentSerialization = disposeSerialization - disposeSerialization = undefined - for (const registration of pendingRawStreams.splice(0)) { - cancelRawStream(registration.stream, error) - } - for (const record of pendingRecords) { - for (const registration of record.rawStreams) { - cancelRawStream(registration.stream, error) - } - } - pendingRecords.clear() - recordAbortController.abort(error) - void writer.abort(error).catch(() => {}) - if (disposeCurrentSerialization) { - runSerializationCleanup(disposeCurrentSerialization) - } - } + })() - const writeRecord = ( - json: Uint8Array, - rawStreams: Array, - ) => { - if (serializationFailure) { - for (const registration of rawStreams) { - cancelRawStream(registration.stream, serializationFailure[0]) - } - return false - } - - if ( - json.byteLength > MAX_FRAME_PAYLOAD_SIZE || - exceedsPendingSerializationLimit(json, pendingRecords.size, pendingBytes) - ) { - const error = new Error( - 'Server function serialization exceeded its pending output limit', - ) - for (const registration of rawStreams) { - cancelRawStream(registration.stream, error) - } - onError(error) - return false - } - - pendingBytes += json.byteLength - const record = { json, rawStreams } - pendingRecords.add(record) - void writer.write(record).then( - () => { - pendingRecords.delete(record) - pendingBytes -= json.byteLength - }, - (error) => { - const stillOwned = pendingRecords.delete(record) - pendingBytes -= json.byteLength - if (stillOwned) { - for (const registration of rawStreams) { - cancelRawStream(registration.stream, error) - } - } - }, - ) - return true - } - - onParse = (value) => { - if (serializationFailure) { - return - } - writeRecord(encodeSerializationRecord(value), pendingRawStreams.splice(0)) - } - onDone = () => { - if (serializationFailure) { - return - } - disposeSerialization = undefined - void writer.close().catch(() => {}) - } - onError = (error) => { - abortRecordStream(error) - } - - // Seroval buffers nested patches during its initial traversal. Their - // RawStream callbacks may precede the root callback, so start every - // synchronously discovered stream only after all initial records. - const initialRawStreams = pendingRawStreams.splice(0) - for (let index = 0; index < initialRecords.length; index++) { - const isLast = index === initialRecords.length - 1 - if (!writeRecord(initialRecords[index]!, isLast ? initialRawStreams : [])) { - // `writeRecord` recorded the failure. Nothing was handed to the client - // yet, so fail the whole call. - if (!isLast) { - for (const registration of initialRawStreams) { - cancelRawStream(registration.stream, serializationFailure![0]) - } - } - initialRecords.length = 0 - throw serializationFailure![0] - } - } - initialRecords.length = 0 - if (done) { - onDone() - } - - void writer.closed.catch((error) => { - abortRecordStream(error) - }) - - return createFramedResponse(readable, { - signal: AbortSignal.any([recordAbortController.signal, request.signal]), - onCancel: abortRecordStream, - }) -} - -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 - } + return response } 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' } - } - const response = new Response(JSON.stringify(rest), { + return new Response(JSON.stringify(rest), { status: 404, - headers: responseHeaders, + headers: { + 'Content-Type': 'application/json', + ...(headers || {}), + }, }) - 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 new file mode 100644 index 0000000000..8617cf8ae7 --- /dev/null +++ b/packages/start-server-core/src/session.ts @@ -0,0 +1,75 @@ +// 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 9d5ce5569e..a46aa444d2 100644 --- a/packages/start-server-core/tests/createCsrfMiddleware.test.ts +++ b/packages/start-server-core/tests/createCsrfMiddleware.test.ts @@ -264,110 +264,6 @@ 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 }), @@ -379,39 +275,6 @@ 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 f2918ed523..9a4affb0c2 100644 --- a/packages/start-server-core/tests/createStartHandler.test.ts +++ b/packages/start-server-core/tests/createStartHandler.test.ts @@ -1,89 +1,46 @@ // @vitest-environment node -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, -} from '@tanstack/start-client-core' + afterAll, + afterEach, + describe, + expect, + it, + onTestFinished, + vi, +} from 'vitest' +import { createMemoryHistory } from '@tanstack/history' +import { createMiddleware } from '@tanstack/start-client-core' import { BaseRootRoute, BaseRoute, RouterCore, + redirect, + type AnyRouter, +} from '@tanstack/router-core' +import { createNonReactiveMutableStore, createNonReactiveReadonlyStore, - createSerializationAdapter, - redirect, } from '@tanstack/router-core' import { attachRouterServerSsrUtils, createSsrStreamResponse, - transformReadableStreamWithRouter, } from '@tanstack/router-core/ssr/server' import { createStartHandler } from '../src/createStartHandler' import { - 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 { - getStaticInlineCss, + getStaticHandlerInlineCssDefault, resolveInlineCssForRequest, } from '../src/inlineCss' -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( - process.env, - 'TSS_SERVER_FN_BASE', - ) const previousServerFnBase = process.env.TSS_SERVER_FN_BASE process.env.TSS_SERVER_FN_BASE = '/_serverFn/' return { - hadServerFnBase, previousServerFnBase, requestMiddleware: [] as Array, serverFnResult: undefined as undefined | Response | object, - 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, } }) @@ -91,7 +48,7 @@ vi.mock('#tanstack-start-entry', () => ({ startInstance: { getOptions: () => ({ requestMiddleware: startMocks.requestMiddleware, - serializationAdapters: startMocks.serializationAdapters, + serializationAdapters: [], }), }, })) @@ -100,53 +57,9 @@ vi.mock('#tanstack-router-entry', () => ({ getRouter: () => startMocks.routerFactory?.() ?? startMocks.router, })) -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') - }) -} +vi.mock('../src/server-functions-handler', () => ({ + handleServerAction: () => startMocks.serverFnResult, +})) const getStoreConfig = () => ({ createMutableStore: createNonReactiveMutableStore, @@ -154,13 +67,12 @@ const getStoreConfig = () => ({ batch: (fn: () => void) => fn(), }) -function makeRouter(routeOptions: Record = {}) { +function makeRouter() { const rootRoute = new BaseRootRoute({}) const indexRoute = new BaseRoute({ getParentRoute: () => rootRoute, path: '/', component: () => null, - ...routeOptions, }) const router = new RouterCore( { @@ -205,1081 +117,36 @@ function waitForAbortOrRelease(signal: AbortSignal) { }) } -function makeStreamResponse( - router: ReturnType, - onCancel?: (reason?: unknown) => void, -) { +function makeStreamResponse(router: ReturnType) { attachRouterServerSsrUtils({ router: router as any, manifest: undefined }) const stream = new ReadableStream({ start(controller) { controller.enqueue(new TextEncoder().encode('stream')) }, - cancel(reason) { - onCancel?.(reason) + cancel() { router.serverSsr?.cleanup() }, }) return createSsrStreamResponse(router as any, new Response(stream)) } -function makeCompletingStreamResponse(router: ReturnType) { - attachRouterServerSsrUtils({ router: router as any, manifest: undefined }) - router.serverSsr!.disableHydration() - const source = new NodeReadableStream({ - start(controller) { - controller.enqueue(new TextEncoder().encode('stream')) - controller.close() - }, - }) - const stream = transformReadableStreamWithRouter(router as any, source) - return createSsrStreamResponse( - router as any, - new Response(stream as unknown as BodyInit), - ) -} - -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() }) afterAll(() => { - if (!startMocks.hadServerFnBase) { + if (startMocks.previousServerFnBase === undefined) { delete (process.env as Partial).TSS_SERVER_FN_BASE } else { process.env.TSS_SERVER_FN_BASE = startMocks.previousServerFnBase } }) -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) => @@ -1307,7 +174,7 @@ describe('createStartHandler redirect safety', () => { } else { startMocks.requestMiddleware = [createMiddleware().server(() => result)] } - const handler = createTestStartHandler(() => new Response('unused')) + const handler = createStartHandler(() => new Response('unused')) const response = await handler( new Request(`http://localhost/${rpc ? '_serverFn/test' : ''}`, { headers: rpc ? { 'x-tsr-serverFn': 'true' } : undefined, @@ -1316,9 +183,7 @@ describe('createStartHandler redirect safety', () => { ) const blocked = href.startsWith('//') expect(response.status).toBe(blocked ? 500 : rpc ? 200 : 307) - expect(response.headers.get('Location')).toBe( - blocked || rpc ? null : '/login', - ) + expect(response.headers.get('Location')).toBe(blocked ? null : '/login') expect(factory).toHaveBeenCalledTimes(href === '/login' ? 0 : 1) expect(updater).not.toHaveBeenCalled() expect(hash).not.toHaveBeenCalled() @@ -1358,9 +223,10 @@ describe('createStartHandler redirect safety', () => { hash: option === 'hash' ? hash : undefined, }) startMocks.requestMiddleware = [createMiddleware().server(() => result)] - const response = await createTestStartHandler( - () => new Response('unused'), - )(new Request('http://localhost/'), {}) + const response = await createStartHandler(() => new Response('unused'))( + new Request('http://localhost/'), + {}, + ) expect(response.status).toBe(500) expect(response.headers.get('Location')).toBeNull() expect(factory).not.toHaveBeenCalled() @@ -1383,7 +249,7 @@ describe('createStartHandler redirect safety', () => { }), ), ] - const response = await createTestStartHandler(() => new Response('unused'))( + const response = await createStartHandler(() => new Response('unused'))( new Request('http://localhost/'), {}, ) @@ -1405,7 +271,7 @@ describe('createStartHandler redirect safety', () => { startMocks.requestMiddleware = [ createMiddleware().server(() => redirect({ href })), ] - const handler = createTestStartHandler(() => new Response('unused')) + const handler = createStartHandler(() => new Response('unused')) const response = await handler(new Request('http://localhost/'), {}) @@ -1422,7 +288,7 @@ describe('createStartHandler redirect safety', () => { href: '/ignored', headers: { Location: '/login', 'set-cookie': 'session=secret; HttpOnly' }, }) - const handler = createTestStartHandler(() => new Response('unused')) + const handler = createStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { @@ -1432,7 +298,7 @@ describe('createStartHandler redirect safety', () => { ) expect(response.status).toBe(200) - expect(response.headers.get('Location')).toBeNull() + expect(response.headers.get('Location')).toBe('/login') expect(response.headers.get('set-cookie')).toBe('session=secret; HttpOnly') const body = await response.json() expect(body).toMatchObject({ href: '/login', isSerializedRedirect: true }) @@ -1461,7 +327,7 @@ describe('createStartHandler redirect safety', () => { }), ), ] - const handler = createTestStartHandler(() => new Response('unused')) + const handler = createStartHandler(() => new Response('unused')) const response = await handler(new Request('http://localhost/'), {}) @@ -1484,33 +350,13 @@ describe('createStartHandler redirect safety', () => { }), ), ] - const handler = createTestStartHandler(() => new Response('unused')) + const handler = createStartHandler(() => 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 }, @@ -1533,7 +379,7 @@ describe('createStartHandler redirect safety', () => { }), ), ] - const handler = createTestStartHandler(() => new Response('unused')) + const handler = createStartHandler(() => new Response('unused')) const response = await handler(new Request('http://localhost/'), {}) expect(response.status).toBe(status) expect(response.headers.get('Location')).toBe(location) @@ -1555,7 +401,7 @@ describe('createStartHandler redirect safety', () => { async ({ href, rpc }) => { startMocks.router = makeRouter() startMocks.serverFnResult = redirect({ href }) - const handler = createTestStartHandler(() => new Response('unused')) + const handler = createStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { @@ -1574,7 +420,7 @@ describe('createStartHandler redirect safety', () => { startMocks.requestMiddleware = [ createMiddleware().server(() => redirect({ href: '/\\evil.example' })), ] - const handler = createTestStartHandler(() => new Response('unused')) + const handler = createStartHandler(() => new Response('unused')) const response = await handler(new Request('http://localhost/'), {}) @@ -1588,7 +434,7 @@ describe('createStartHandler redirect safety', () => { href: '/safe', headers: { 'set-cookie': 'session=secret; HttpOnly' }, }) - const handler = createTestStartHandler(() => new Response('unused')) + const handler = createStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { @@ -1610,61 +456,6 @@ 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', @@ -1674,7 +465,7 @@ describe('createStartHandler redirect safety', () => { const options = { href: '/work', statusCode: 303, headers } const result = redirect(options) startMocks.serverFnResult = result - const handler = createTestStartHandler(() => new Response('unused')) + const handler = createStartHandler(() => new Response('unused')) const rpcResponse = await handler( new Request('http://localhost/_serverFn/test', { @@ -1710,7 +501,7 @@ describe('createStartHandler redirect safety', () => { startMocks.requestMiddleware = [ createMiddleware().server(() => redirect({ href: '/safe' })), ] - const handler = createTestStartHandler(() => new Response('unused')) + const handler = createStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/', { @@ -1737,7 +528,7 @@ describe('createStartHandler redirect safety', () => { ...('hash' in target ? { Location: '/work' } : undefined), }, }) - const handler = createTestStartHandler(() => new Response('unused')) + const handler = createStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { @@ -1762,671 +553,7 @@ 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! - router.history.push('/pushed') - router.history.replace('/replaced') - await router.navigate({ to: '/navigated' }) - return 'request data' - }) - const router = makeRouterWithRouteWork({ loader }) - startMocks.router = router - const load = vi.spyOn(router, 'load') - 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) - return new Response(loadedRouter.state.matches.at(-1)?.loaderData as string) - }) - const response = await handler(new Request('http://localhost/work'), {}) - - expect(response.status).toBe(200) - expect(await response.text()).toBe('request data') - expect(loader).toHaveBeenCalledTimes(1) - expect(load).toHaveBeenCalledTimes(1) -}) - -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 = createTestStartHandler(render) - - const response = await handler( - new Request('http://localhost/', { - headers: { accept: 'application/json' }, - }), - {}, - ) - - expect(response.status).toBe(406) - expect(response.headers.get('content-type')).toContain('application/json') - expect(await response.json()).toEqual({ - error: 'Only HTML requests are supported here', - }) - expect(render).not.toHaveBeenCalled() - }) - - it.each(['text/html', '*/*', undefined])( - 'does not return 406 for Accept: %s', - async (accept) => { - startMocks.routerFactory = vi.fn(makeRouter) - const render = vi.fn(() => new Response('ok')) - const handler = createTestStartHandler(render) - - const response = await handler( - new Request('http://localhost/', { - headers: accept === undefined ? undefined : { accept }, - }), - {}, - ) - - expect(response.status).not.toBe(406) - expect(await response.text()).toBe('ok') - expect(render).toHaveBeenCalledTimes(1) - }, - ) -}) - 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() @@ -2435,7 +562,7 @@ describe('createStartHandler SSR cleanup ownership', () => { startMocks.serverFnResult = ssrResponse const dispose = vi.spyOn(ssrResponse as any, 'dispose') - const handler = createTestStartHandler(() => new Response('unused')) + const handler = createStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { headers: { 'x-tsr-serverFn': 'true' }, @@ -2451,114 +578,6 @@ describe('createStartHandler SSR cleanup ownership', () => { expect(router.serverSsr).toBeUndefined() }) - it('does not cancel the returned response when an inner result settles late', async () => { - 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 }, - ) - startMocks.requestMiddleware = [ - 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) - - const innerCancel = vi.fn() - resolveInner(new Response(new ReadableStream({ cancel: innerCancel }))) - await new Promise((resolve) => setTimeout(resolve, 20)) - - expect(timeoutCancel).not.toHaveBeenCalled() - expect(innerCancel).toHaveBeenCalledExactlyOnceWith( - 'late middleware response', - ) - 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 @@ -2573,7 +592,7 @@ describe('createStartHandler SSR cleanup ownership', () => { }), ] - const handler = createTestStartHandler(() => new Response('unused')) + const handler = createStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { headers: { 'x-tsr-serverFn': 'true' }, @@ -2602,7 +621,7 @@ describe('createStartHandler SSR cleanup ownership', () => { }), ] - const handler = createTestStartHandler(() => new Response('unused')) + const handler = createStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { headers: { 'x-tsr-serverFn': 'true' }, @@ -2631,7 +650,7 @@ describe('createStartHandler SSR cleanup ownership', () => { }), ] - const handler = createTestStartHandler(() => new Response('unused')) + const handler = createStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { headers: { 'x-tsr-serverFn': 'true' }, @@ -2647,139 +666,6 @@ 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) => { - const router = makeRouter() - startMocks.router = router - const cancel = vi.fn(() => new Promise(() => {})) - startMocks.serverFnResult = new Response(new ReadableStream({ cancel })) - const replacement = new Response('replacement') - startMocks.requestMiddleware = [ - createMiddleware().server(async ({ next }) => { - const result = await next() - if (mode === 'return') { - return replacement - } - if (mode === 'throw') { - throw replacement - } - result.response = replacement - return result - }), - ] - - const handler = createTestStartHandler(() => new Response('unused')) - const response = await handler( - new Request('http://localhost/_serverFn/test', { - headers: { 'x-tsr-serverFn': 'true' }, - }), - {}, - ) - - 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') - }, - ) - - it('preserves a plain stream when middleware pipes the body', async () => { - const router = makeRouter() - startMocks.router = router - const cancel = vi.fn() - startMocks.serverFnResult = new Response( - new ReadableStream({ - start(controller) { - controller.enqueue(new TextEncoder().encode('stream')) - controller.close() - }, - cancel, - }), - ) - startMocks.requestMiddleware = [ - createMiddleware().server(async ({ next }) => { - const result = await next() - return new Response( - result.response.body!.pipeThrough(new TransformStream()), - result.response, - ) - }), - ] - - const handler = createTestStartHandler(() => new Response('unused')) - const response = await handler( - new Request('http://localhost/_serverFn/test', { - headers: { 'x-tsr-serverFn': 'true' }, - }), - {}, - ) - - await expect(response.text()).resolves.toBe('stream') - expect(cancel).not.toHaveBeenCalled() - }) - it('preserves stream ownership when middleware wraps same body', async () => { const router = makeRouter() startMocks.router = router @@ -2796,7 +682,7 @@ describe('createStartHandler SSR cleanup ownership', () => { }), ] - const handler = createTestStartHandler(() => new Response('unused')) + const handler = createStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { headers: { 'x-tsr-serverFn': 'true' }, @@ -2814,365 +700,20 @@ 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 - const ssrResponse = makeCompletingStreamResponse(router) - startMocks.serverFnResult = ssrResponse - const dispose = vi.spyOn(ssrResponse as any, 'dispose') - let wrappedResponse: Response | undefined - startMocks.requestMiddleware = [ - createMiddleware().server(async ({ next }) => { - const result = await next() - wrappedResponse = new Response( - result.response.body!.pipeThrough(new TransformStream()), - result.response, - ) - return wrappedResponse - }), - ] - - const handler = createTestStartHandler(() => new Response('unused')) - const response = await handler( - new Request('http://localhost/_serverFn/test', { - headers: { 'x-tsr-serverFn': 'true' }, - }), - {}, - ) - - expect(response).toBe(wrappedResponse) - expect(dispose).not.toHaveBeenCalled() - await expect(response.text()).resolves.toBe('stream') - expect(router.serverSsr).toBeUndefined() - }) - - it.each([false, true])( - 'cancels a derived body after handoff with a router transform: %s', - async (useRouterTransform) => { - const router = makeRouter() - startMocks.router = router - const sourceCancel = vi.fn() - const source = new ReadableStream({ cancel: sourceCancel }) - let dispose: ReturnType - startMocks.requestMiddleware = [ - createMiddleware().server(async ({ next }) => { - const result = await next() - return new Response( - result.response.body!.pipeThrough(new TransformStream()), - result.response, - ) - }), - ] - const requestController = new AbortController() - const handler = createTestStartHandler( - ({ router: requestRouter, request }) => { - const responseBody = useRouterTransform - ? transformReadableStreamWithRouter(requestRouter, source, { - signal: request.signal, - }) - : source - const ssrResponse = createSsrStreamResponse( - requestRouter, - new Response(responseBody), - ) - dispose = vi.spyOn(ssrResponse, 'dispose') - return ssrResponse - }, - ) - const response = await handler( - new Request('http://localhost/', { - signal: requestController.signal, - }), - {}, - ) - const derivedCancel = vi.spyOn(response.body!, 'cancel') - const reason = new Error('request disconnected') - - expect(source.locked).toBe(true) - requestController.abort(reason) - - await vi.waitFor(() => { - expect(dispose).toHaveBeenCalledExactlyOnceWith(reason) - expect(derivedCancel).toHaveBeenCalledExactlyOnceWith(reason) - expect(sourceCancel).toHaveBeenCalledExactlyOnceWith(reason) - expect(source.locked).toBe(false) - expect(router.serverSsr).toBeUndefined() - }) - }, - ) - - it('preserves both Response.clone() branches when the clone is assigned', async () => { - const router = makeRouter() - startMocks.router = router - const ssrResponse = makeCompletingStreamResponse(router) - startMocks.serverFnResult = ssrResponse - const dispose = vi.spyOn(ssrResponse as any, 'dispose') - let siblingText!: Promise - startMocks.requestMiddleware = [ - createMiddleware().server(async ({ next }) => { - const result = await next() - 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 = createTestStartHandler(() => new Response('unused')) - const response = await handler( - new Request('http://localhost/_serverFn/test', { - headers: { 'x-tsr-serverFn': 'true' }, - }), - {}, - ) - - expect(dispose).not.toHaveBeenCalled() - await expect(Promise.all([response.text(), siblingText])).resolves.toEqual([ - 'stream', - 'stream', - ]) - expect(router.serverSsr).toBeUndefined() - }) - - it('disposes a piped stream that outer middleware replaces', async () => { - const router = makeRouter() - startMocks.router = router - const ssrResponse = makeCompletingStreamResponse(router) - startMocks.serverFnResult = ssrResponse - const dispose = vi.spyOn(ssrResponse as any, 'dispose') - const replacement = new Response('replacement') - let derivedCancel!: ReturnType - startMocks.requestMiddleware = [ - createMiddleware().server(async ({ next }) => { - await next() - expect(dispose).not.toHaveBeenCalled() - return replacement - }), - createMiddleware().server(async ({ next }) => { - const result = await next() - const response = new Response( - result.response.body!.pipeThrough(new TransformStream()), - result.response, - ) - derivedCancel = vi.spyOn(response.body!, 'cancel') - return response - }), - ] - - const handler = createTestStartHandler(() => new Response('unused')) - const response = await handler( - new Request('http://localhost/_serverFn/test', { - headers: { 'x-tsr-serverFn': 'true' }, - }), - {}, - ) - - expect(response).toBe(replacement) - expect(dispose).toHaveBeenCalledOnce() - expect(derivedCancel).toHaveBeenCalledWith('middleware response replaced') - expect(router.serverSsr).toBeUndefined() - }) - - it('refreshes a cloned response before an outer replacement', async () => { - const router = makeRouter() - startMocks.router = router - const ssrResponse = makeCompletingStreamResponse(router) - startMocks.serverFnResult = ssrResponse - const dispose = vi.spyOn(ssrResponse as any, 'dispose') - const consoleError = vi - .spyOn(console, 'error') - .mockImplementation(() => undefined) - const replacement = new Response('replacement') - let ownerBody!: ReadableStream - let cloneCancellation!: Promise - startMocks.requestMiddleware = [ - createMiddleware().server(async ({ next }) => { - await next() - return replacement - }), - createMiddleware().server(async ({ next }) => { - const result = await next() - cloneCancellation = result.response.clone().body!.cancel('not used') - ownerBody = result.response.body! - vi.spyOn(ownerBody, 'cancel') - return result - }), - ] - - try { - const handler = createTestStartHandler(() => new Response('unused')) - const response = await handler( - new Request('http://localhost/_serverFn/test', { - headers: { 'x-tsr-serverFn': 'true' }, - }), - {}, - ) - - expect(response).toBe(replacement) - await expect(response.text()).resolves.toBe('replacement') - expect(dispose).toHaveBeenCalledOnce() - expect(ownerBody.cancel).toHaveBeenCalledOnce() - await cloneCancellation - expect(router.serverSsr).toBeUndefined() - await Promise.resolve() - await Promise.resolve() - expect(consoleError).not.toHaveBeenCalled() - } finally { - consoleError.mockRestore() - } - }) - - it('disposes a locked stream that middleware replaces with no body', async () => { - const router = makeRouter() - startMocks.router = router - const ssrResponse = makeCompletingStreamResponse(router) - startMocks.serverFnResult = ssrResponse - const dispose = vi.spyOn(ssrResponse as any, 'dispose') - let reader: ReadableStreamDefaultReader | undefined - startMocks.requestMiddleware = [ - createMiddleware().server(async ({ next }) => { - const result = await next() - reader = result.response.body!.getReader() - return new Response(null, { status: 204 }) - }), - ] - - 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).toBeNull() - expect(dispose).toHaveBeenCalledOnce() - expect(router.serverSsr).toBeUndefined() - reader?.releaseLock() - }) - - it('leaves a stream that middleware reads to the response that replaces it', async () => { + it('disposes stream response on middleware error after next', 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 = 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) - 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 { - reader?.releaseLock() - } - }) - - it('disposes an in-place replacement on middleware error', async () => { - const router = makeRouter() - startMocks.router = router - const ssrResponse = makeStreamResponse(router) - startMocks.serverFnResult = ssrResponse - const dispose = vi.spyOn(ssrResponse as any, 'dispose') - const cancel = vi.fn() - startMocks.requestMiddleware = [ - createMiddleware().server(async ({ next }) => { - const result = await next() - result.response = new Response(new ReadableStream({ cancel })) + await next() throw new Error('middleware failed') }), ] - const handler = createTestStartHandler(() => new Response('unused')) + const handler = createStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { headers: { 'x-tsr-serverFn': 'true' }, @@ -3182,7 +723,6 @@ describe('createStartHandler SSR cleanup ownership', () => { expect(response.status).toBe(500) expect(dispose).toHaveBeenCalledOnce() - expect(cancel).toHaveBeenCalledOnce() expect(router.serverSsr).toBeUndefined() }) @@ -3195,13 +735,12 @@ describe('createStartHandler SSR cleanup ownership', () => { const replacement = new Response('handled', { status: 418 }) startMocks.requestMiddleware = [ createMiddleware().server(async ({ next }) => { - const result = await next() - result.response = result.response.clone() + await next() throw replacement }), ] - const handler = createTestStartHandler(() => new Response('unused')) + const handler = createStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { headers: { 'x-tsr-serverFn': 'true' }, @@ -3209,49 +748,11 @@ describe('createStartHandler SSR cleanup ownership', () => { {}, ) - // 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(response).toBe(replacement) expect(dispose).toHaveBeenCalledOnce() expect(router.serverSsr).toBeUndefined() }) - it('disposes a side-cloned stream before an unrelated thrown response', async () => { - const router = makeRouter() - startMocks.router = router - const ssrResponse = makeCompletingStreamResponse(router) - startMocks.serverFnResult = ssrResponse - const dispose = vi.spyOn(ssrResponse as any, 'dispose') - const replacement = new Response('handled', { status: 418 }) - let cloneCancellation!: Promise - startMocks.requestMiddleware = [ - createMiddleware().server(async ({ next }) => { - const result = await next() - cloneCancellation = result.response.clone().body!.cancel('not used') - throw replacement - }), - ] - - const handler = createTestStartHandler(() => new Response('unused')) - const response = await handler( - new Request('http://localhost/_serverFn/test', { - headers: { 'x-tsr-serverFn': 'true' }, - }), - {}, - ) - - // 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() - // 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() - }) - it('honors in-place response assignment on returned context', async () => { const router = makeRouter() startMocks.router = router @@ -3267,7 +768,7 @@ describe('createStartHandler SSR cleanup ownership', () => { }), ] - const handler = createTestStartHandler(() => new Response('unused')) + const handler = createStartHandler(() => new Response('unused')) const response = await handler( new Request('http://localhost/_serverFn/test', { headers: { 'x-tsr-serverFn': 'true' }, @@ -3281,911 +782,6 @@ 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 = [] - startMocks.routerFactory = () => { - factoryCalls++ - return makeRouter() - } - startMocks.serverFnHandler = async () => { - instances = await Promise.all([getRouterInstance(), getRouterInstance()]) - return new Response('ok') - } - - const handler = createTestStartHandler(() => new Response('unused')) - const response = await handler( - new Request('http://localhost/_serverFn/test', { - headers: { 'x-tsr-serverFn': 'true' }, - }), - {}, - ) - - await expect(response.text()).resolves.toBe('ok') - expect(factoryCalls).toBe(1) - expect(instances[0]).toBe(instances[1]) - }) - - it('shares one router failure between sequential request-context reads', async () => { - const factoryError = new Error('router factory failed') - const errors: Array = [] - let factoryCalls = 0 - startMocks.routerFactory = () => { - factoryCalls++ - throw factoryError - } - startMocks.serverFnHandler = async () => { - for (let attempt = 0; attempt < 2; attempt++) { - try { - await getRouterInstance() - } catch (error) { - errors.push(error) - } - } - return new Response('ok') - } - - const handler = createTestStartHandler(() => new Response('unused')) - const response = await handler( - new Request('http://localhost/_serverFn/test', { - headers: { 'x-tsr-serverFn': 'true' }, - }), - {}, - ) - - await expect(response.text()).resolves.toBe('ok') - expect(factoryCalls).toBe(1) - expect(errors).toEqual([factoryError, factoryError]) - }) - - it('does not start the router factory from a continuation after request abort', async () => { - const requestController = new AbortController() - const reason = new Error('request aborted') - let factoryCalls = 0 - let lateError: unknown - let continueServerFn!: () => void - const serverFnCanContinue = new Promise((resolve) => { - continueServerFn = resolve - }) - let notifyServerFnStarted!: () => void - const serverFnStarted = new Promise((resolve) => { - notifyServerFnStarted = resolve - }) - let notifyLateReadFinished!: () => void - const lateReadFinished = new Promise((resolve) => { - notifyLateReadFinished = resolve - }) - - startMocks.routerFactory = () => { - factoryCalls++ - return makeRouter() - } - startMocks.serverFnHandler = async () => { - notifyServerFnStarted() - await serverFnCanContinue - try { - await getRouterInstance() - } catch (error) { - lateError = error - } - notifyLateReadFinished() - return new Response('late') - } - - const handler = createTestStartHandler(() => new Response('unused')) - const response = handler( - new Request('http://localhost/_serverFn/test', { - headers: { 'x-tsr-serverFn': 'true' }, - signal: requestController.signal, - }), - {}, - ) - - await serverFnStarted - requestController.abort(reason) - expect((await response).status).toBe(500) - - continueServerFn() - await lateReadFinished - expect(factoryCalls).toBe(0) - expect(lateError).toBe(reason) - }) -}) - -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') - const cancel = vi.fn() - const thrownResponse = new Response( - new ReadableStream({ cancel }), - ) - // Abort during the `instanceof Response` check, immediately after the - // fast path's first abort check has passed. - const responsePrototype = new Proxy(Response.prototype, { - getPrototypeOf() { - requestController.abort(cancellation) - return Response.prototype - }, - }) - Object.setPrototypeOf(thrownResponse, responsePrototype) - startMocks.serverFnHandler = () => { - throw thrownResponse - } - 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.status).toBe(500) - await vi.waitFor(() => { - expect(cancel).toHaveBeenCalledOnce() - expect(cancel).toHaveBeenCalledWith(cancellation) - }) - }) - - it.each([ - ['Response', 'sole-terminal'], - ['SsrResponse', 'sole-terminal'], - ['Response', 'middleware-chain'], - ['SsrResponse', 'middleware-chain'], - ] as const)( - 'does not read context from a direct %s result in the %s path', - async (resultType, executionPath) => { - if (executionPath === 'middleware-chain') { - startMocks.requestMiddleware = [ - createMiddleware().server(({ next }) => next()), - ] - } - const directResponse = new Response(resultType, { status: 202 }) - const directResult = - resultType === 'Response' - ? directResponse - : { response: directResponse, serverSsrCleanup: 'none' as const } - const contextGetter = vi.fn(() => { - throw new Error('direct response context must not be read') - }) - Object.defineProperty(directResult, 'context', { - get: contextGetter, - }) - startMocks.serverFnHandler = () => directResult - 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(202) - await expect(response.text()).resolves.toBe(resultType) - expect(contextGetter).not.toHaveBeenCalled() - }, - ) - - it('does not invoke the sole terminal after abort while copying request context', async () => { - const requestController = new AbortController() - const cancellation = new Error('request disconnected') - const serverFnHandler = vi.fn(() => new Response('must not run')) - const requestContext = {} as { abort: boolean } - Object.defineProperty(requestContext, 'abort', { - enumerable: true, - get() { - requestController.abort(cancellation) - return true - }, - }) - startMocks.serverFnHandler = serverFnHandler - const handler = createStartHandler<{ - server: { requestContext: { abort: boolean } } - }>(() => new Response('unused')) - - 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() - }) - - it('does not invoke a direct handler when its handler factory aborts', async () => { - const requestController = new AbortController() - const cancellation = new Error('request disconnected') - const routeHandler = vi.fn(() => new Response('must not run')) - const handlers = vi.fn(() => { - requestController.abort(cancellation) - return { GET: routeHandler } - }) - const router = makeRouter({ - component: undefined, - server: { handlers }, - }) - startMocks.router = router - const render = vi.fn(() => new Response('must not render')) - const handler = createTestStartHandler(render) - - const response = await handler( - new Request('http://localhost/', { - signal: requestController.signal, - }), - {}, - ) - - expect(response.status).toBe(500) - expect(handlers).toHaveBeenCalledOnce() - expect(routeHandler).not.toHaveBeenCalled() - expect(render).not.toHaveBeenCalled() - }) - - it('returns an exact non-component handler response without rendering a document', async () => { - const routeHandler = vi.fn(() => new Response('direct', { status: 201 })) - const router = makeRouter({ - component: undefined, - server: { - handlers: { - GET: routeHandler, - }, - }, - }) - startMocks.router = router - 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(201) - await expect(response.text()).resolves.toBe('direct') - expect(routeHandler).toHaveBeenCalledOnce() - expect(render).not.toHaveBeenCalled() - expect(router.serverSsr).toBeUndefined() - }) - - it('preserves request context, params, and pathname for a direct handler', async () => { - const routeHandler = vi.fn( - ({ context, params, pathname, handlerType, request }: any) => - Response.json({ - context, - params, - pathname, - handlerType, - requestUrl: request.url, - }), - ) - const router = makeRouter({ - path: '/items/$itemId', - component: undefined, - server: { - handlers: { - GET: routeHandler, - }, - }, - }) - startMocks.router = router - const render = vi.fn(() => new Response('must not render')) - const handler = createStartHandler<{ - server: { requestContext: { requestValue: string } } - }>(render) - - const response = await handler( - new Request('http://localhost/items/42?source=test'), - { context: { requestValue: 'preserved' } }, - ) - - await expect(response.json()).resolves.toMatchObject({ - context: { requestValue: 'preserved' }, - params: { itemId: '42' }, - pathname: '/items/42', - handlerType: 'router', - requestUrl: 'http://localhost/items/42?source=test', - }) - expect(render).not.toHaveBeenCalled() - }) - - it.each( - [false, true].flatMap((component) => - ['function', 'object'].flatMap((handlerKind) => - ['params.parse', 'parseParams'].map((parserKind) => ({ - component, - handlerKind, - parserKind, - })), - ), - ), - )( - 'parses server handler params (component=$component, handler=$handlerKind, parser=$parserKind)', - async ({ component, handlerKind, parserKind }) => { - const parse = (params: { itemId: string }) => ({ - itemId: Number(params.itemId), - }) - const routeHandler = vi.fn(({ params }: any) => Response.json(params)) - startMocks.router = makeRouter({ - path: '/items/$itemId', - component: component ? () => null : undefined, - ...(parserKind === 'params.parse' - ? { params: { parse } } - : { parseParams: parse }), - server: { - handlers: { - GET: - handlerKind === 'function' - ? routeHandler - : { handler: routeHandler }, - }, - }, - }) - const render = vi.fn(() => new Response('must not render')) - const handler = createStartHandler(render) - - const response = await handler( - new Request('http://localhost/items/42'), - {}, - ) - - expect(response.status).toBe(200) - await expect(response.json()).resolves.toEqual({ itemId: 42 }) - expect(routeHandler).toHaveBeenCalledOnce() - expect(render).not.toHaveBeenCalled() - }, - ) - - it.each(['route', 'handler'] as const)( - 'lets %s middleware catch terminal handler parameter parsing errors', - async (placement) => { - const error = new Error('Invalid item id') - const middleware = createMiddleware().server(async ({ next }) => { - try { - return await next() - } catch (caught) { - expect(caught).toBe(error) - return new Response(error.message, { status: 400 }) - } - }) - const routeHandler = vi.fn(() => new Response('must not run')) - startMocks.router = makeRouter({ - path: '/items/$itemId', - component: undefined, - params: { - parse: () => { - throw error - }, - }, - server: { - ...(placement === 'route' ? { middleware: [middleware] } : {}), - handlers: { - GET: - placement === 'handler' - ? { middleware: [middleware], handler: routeHandler } - : routeHandler, - }, - }, - }) - const render = vi.fn(() => new Response('must not render')) - const handler = createStartHandler(render) - - const response = await handler( - new Request('http://localhost/items/nope'), - {}, - ) - - expect(response.status).toBe(400) - await expect(response.text()).resolves.toBe('Invalid item id') - expect(routeHandler).not.toHaveBeenCalled() - expect(render).not.toHaveBeenCalled() - }, - ) - - it.each(['route', 'handler'] as const)( - 'runs %s middleware instead of incorrectly taking the direct path', - async (placement) => { - const events: Array = [] - const middleware = createMiddleware().server(async ({ next }) => { - events.push('middleware before') - const result = await next({ - context: { middlewarePlacement: placement }, - }) - events.push('middleware after') - result.response.headers.set('x-middleware', placement) - return result - }) - const routeHandler = vi.fn(({ context }: any) => { - events.push('handler') - return Response.json(context) - }) - const handlers = { - GET: - placement === 'handler' - ? { middleware: [middleware], handler: routeHandler } - : routeHandler, - } - const router = makeRouter({ - component: undefined, - server: { - ...(placement === 'route' ? { middleware: [middleware] } : {}), - handlers, - }, - }) - startMocks.router = router - const render = vi.fn(() => new Response('must not render')) - const handler = createTestStartHandler(render) - - const response = await handler(new Request('http://localhost/'), {}) - - expect(response.headers.get('x-middleware')).toBe(placement) - await expect(response.json()).resolves.toMatchObject({ - middlewarePlacement: placement, - }) - expect(events).toEqual([ - 'middleware before', - 'handler', - 'middleware after', - ]) - expect(render).not.toHaveBeenCalled() - }, - ) - - it('rejects a missing direct response before middleware resumes', async () => { - const afterNext = vi.fn() - const middleware = createMiddleware().server(async ({ next }) => { - await next() - afterNext() - return new Response('must not return') - }) - const router = makeRouter({ - component: undefined, - server: { - middleware: [middleware], - handlers: { GET: () => undefined }, - }, - }) - startMocks.router = router - const handler = createTestStartHandler( - () => new Response('must not render'), - ) - - const response = await handler(new Request('http://localhost/'), {}) - - expect(response.status).toBe(500) - expect(afterNext).not.toHaveBeenCalled() - }) - - 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(() => { - events.push('render') - return Response.json({ context: loadedContext }) - }) - const handler = createTestStartHandler(render) - - const response = await handler(new Request('http://localhost/'), { - context: requestContext, - }) - - 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() - }) - - it('cancels a direct handler body that resolves after request abort', async () => { - const requestController = new AbortController() - const cancellation = new Error('request disconnected') - let notifyHandlerStarted!: () => void - const handlerStarted = new Promise((resolve) => { - notifyHandlerStarted = resolve - }) - let resolveHandler!: (response: Response) => void - const handlerResult = new Promise((resolve) => { - resolveHandler = resolve - }) - const routeHandler = vi.fn(() => { - notifyHandlerStarted() - return handlerResult - }) - const router = makeRouter({ - component: undefined, - server: { - handlers: { - GET: routeHandler, - }, - }, - }) - startMocks.router = router - const render = vi.fn(() => new Response('must not render')) - const handler = createTestStartHandler(render) - const response = handler( - new Request('http://localhost/', { - signal: requestController.signal, - }), - {}, - ) - - await handlerStarted - requestController.abort(cancellation) - expect((await response).status).toBe(500) - - const cancel = vi.fn((_reason: unknown) => new Promise(() => {})) - resolveHandler(new Response(new ReadableStream({ cancel }))) - - await vi.waitFor(() => { - expect(cancel).toHaveBeenCalledOnce() - expect(cancel).toHaveBeenCalledWith(cancellation) - }) - expect(render).not.toHaveBeenCalled() - }) -}) - -describe('createStartHandler HEAD fallback', () => { - it('strips and disposes the rendered document body', async () => { - const router = makeRouter() - startMocks.router = router - const cancel = vi.fn() - let cleanupEffects = 0 - - const handler = createTestStartHandler(({ router: requestRouter }) => { - requestRouter.serverSsr!.onCleanup(() => { - cleanupEffects++ - }) - return createSsrStreamResponse( - requestRouter, - new Response(new ReadableStream({ cancel }), { - headers: { 'x-rendered': 'true' }, - status: 201, - }), - ) - }) - const response = await handler( - new Request('http://localhost/', { method: 'HEAD' }), - {}, - ) - - expect(response.status).toBe(201) - expect(response.headers.get('x-rendered')).toBe('true') - expect(response.body).toBeNull() - expect(cancel).toHaveBeenCalledOnce() - expect(cancel).toHaveBeenCalledWith('HEAD body stripped') - expect(cleanupEffects).toBe(1) - expect(router.serverSsr).toBeUndefined() - }) - - it('cancels a plain streaming GET body before stripping it', async () => { - const cancel = vi.fn() - const router = makeRouter({ - server: { - handlers: { - GET: () => - new Response( - new ReadableStream({ - cancel, - }), - ), - }, - }, - }) - startMocks.router = router - - const handler = createTestStartHandler( - () => new Response('must not render'), - ) - const response = await handler( - new Request('http://localhost/', { method: 'HEAD' }), - {}, - ) - - expect(response.body).toBeNull() - expect(cancel).toHaveBeenCalledOnce() - expect(cancel).toHaveBeenCalledWith('HEAD body stripped') - }) -}) - describe('createStartHandler request cancellation', () => { it.each(['beforeLoad', 'loader'] as const)( 'aborts route %s work and does not render HTML', @@ -4208,7 +804,7 @@ describe('createStartHandler request cancellation', () => { startMocks.router = router const requestController = new AbortController() const render = vi.fn(() => new Response('must not render')) - const handler = createTestStartHandler(render) + const handler = createStartHandler(render) const response = handler( new Request('http://localhost/work', { signal: requestController.signal, @@ -4243,14 +839,16 @@ describe('createStartHandler request cancellation', () => { >((resolve) => { resolveRender = resolve }) - let cleanupEffects = 0 + let cleanupCalls = 0 let cancelCalls = 0 let lateStreamResponse!: ReturnType - const handler = createTestStartHandler(({ router: requestRouter }) => { + const handler = createStartHandler(({ router: requestRouter }) => { const serverSsr = requestRouter.serverSsr! - serverSsr.onCleanup(() => { - cleanupEffects++ - }) + const cleanup = serverSsr.cleanup + serverSsr.cleanup = () => { + cleanupCalls++ + cleanup() + } lateStreamResponse = createSsrStreamResponse( requestRouter, new Response( @@ -4276,13 +874,13 @@ describe('createStartHandler request cancellation', () => { requestController.abort(new Error('request disconnected')) expect((await response).status).toBe(500) - expect(cleanupEffects).toBe(1) + expect(cleanupCalls).toBe(1) expect(router.serverSsr).toBeUndefined() resolveRender(lateStreamResponse) await Promise.resolve() await Promise.resolve() - expect(cleanupEffects).toBe(1) + expect(cleanupCalls).toBe(1) expect(cancelCalls).toBe(1) expect(router.serverSsr).toBeUndefined() }) @@ -4300,7 +898,7 @@ describe('createStartHandler request cancellation', () => { resolveRender = resolve }) const cancel = vi.fn((_reason: unknown) => new Promise(() => {})) - const handler = createTestStartHandler(() => { + const handler = createStartHandler(() => { notifyRenderStarted() return renderResult }) @@ -4323,77 +921,26 @@ describe('createStartHandler request cancellation', () => { }) }) - it.each(['resolves', 'rejects'] as const)( - 'cancels a plain response when request middleware %s later', - async (settlement) => { - const router = makeRouter() - startMocks.router = router - const requestController = new AbortController() - let notifyMiddlewareStarted!: () => void - const middlewareStarted = new Promise((resolve) => { - notifyMiddlewareStarted = resolve - }) - let settleMiddleware!: (value: Response) => void - const middlewareResult = new Promise((resolve, reject) => { - settleMiddleware = settlement === 'resolves' ? resolve : reject - }) - const cancel = vi.fn((_reason: unknown) => new Promise(() => {})) - startMocks.requestMiddleware = [ - createMiddleware().server(() => { - notifyMiddlewareStarted() - return middlewareResult - }), - ] - const handler = createTestStartHandler( - () => new Response('must not render'), - ) - const response = handler( - new Request('http://localhost/', { - signal: requestController.signal, - }), - {}, - ) - - await middlewareStarted - const cancellation = new Error('request disconnected') - requestController.abort(cancellation) - - expect((await response).status).toBe(500) - settleMiddleware(new Response(new ReadableStream({ cancel }))) - await vi.waitFor(() => { - expect(cancel).toHaveBeenCalledTimes(1) - expect(cancel).toHaveBeenCalledWith(cancellation) - }) - }, - ) - - it('cancels a stream resolved by the render callback later', async () => { + it('cancels a plain response resolved by request middleware later', async () => { const router = makeRouter() startMocks.router = router const requestController = new AbortController() - let notifyRenderStarted!: () => void - const renderStarted = new Promise((resolve) => { - notifyRenderStarted = resolve + let notifyMiddlewareStarted!: () => void + const middlewareStarted = new Promise((resolve) => { + notifyMiddlewareStarted = resolve }) - let resolveRender!: ( - value: ReturnType, - ) => void - const renderResult = new Promise< - ReturnType - >((resolve) => { - resolveRender = resolve + let resolveMiddleware!: (value: Response) => void + const middlewareResult = new Promise((resolve) => { + resolveMiddleware = resolve }) const cancel = vi.fn((_reason: unknown) => new Promise(() => {})) - let streamResponse!: ReturnType - - const handler = createTestStartHandler(({ router: requestRouter }) => { - streamResponse = createSsrStreamResponse( - requestRouter, - new Response(new ReadableStream({ cancel })), - ) - notifyRenderStarted() - return renderResult - }) + startMocks.requestMiddleware = [ + createMiddleware().server(() => { + notifyMiddlewareStarted() + return middlewareResult + }), + ] + const handler = createStartHandler(() => new Response('must not render')) const response = handler( new Request('http://localhost/', { signal: requestController.signal, @@ -4401,32 +948,139 @@ describe('createStartHandler request cancellation', () => { {}, ) - await renderStarted + await middlewareStarted const cancellation = new Error('request disconnected') requestController.abort(cancellation) - expect((await response).status).toBe(500) - resolveRender(streamResponse) + expect((await response).status).toBe(500) + resolveMiddleware(new Response(new ReadableStream({ cancel }))) await vi.waitFor(() => { expect(cancel).toHaveBeenCalledTimes(1) expect(cancel).toHaveBeenCalledWith(cancellation) }) }) - it('disposes a side-cloned stream when the request aborts after handoff', async () => { + it.each(['throw', 'reject'] as const)( + 'reports a %s from disposal of a late render response', + async (failureMode) => { + const router = makeRouter() + startMocks.router = router + const requestController = new AbortController() + const cleanupError = new Error('late stream cleanup failed') + const dispose = vi.fn(() => { + if (failureMode === 'throw') { + throw cleanupError + } + return Promise.reject(cleanupError) + }) + const consoleError = vi + .spyOn(console, 'error') + .mockImplementation(() => undefined) + let notifyRenderStarted!: () => void + const renderStarted = new Promise((resolve) => { + notifyRenderStarted = resolve + }) + let resolveRender!: (value: any) => void + const renderResult = new Promise((resolve) => { + resolveRender = resolve + }) + onTestFinished(() => { + consoleError.mockRestore() + }) + onTestFinished(() => { + router.serverSsr?.cleanup() + }) + + const handler = createStartHandler(() => { + notifyRenderStarted() + return renderResult + }) + const response = handler( + new Request('http://localhost/', { + signal: requestController.signal, + }), + {}, + ) + + await renderStarted + requestController.abort(new Error('request disconnected')) + expect((await response).status).toBe(500) + + resolveRender({ + response: new Response('stream'), + serverSsrCleanup: 'stream', + dispose, + }) + await vi.waitFor(() => { + expect(consoleError).toHaveBeenCalledWith(cleanupError) + }) + expect(dispose).toHaveBeenCalledOnce() + }, + ) + + it.each(['throw', 'reject'] as const)( + 'reports a stream disposal %s when middleware is aborted', + async (failureMode) => { + const router = makeRouter() + startMocks.router = router + const requestController = new AbortController() + const cleanupError = new Error('custom stream cleanup failed') + const consoleError = vi + .spyOn(console, 'error') + .mockImplementation(() => undefined) + const ssrResponse = makeStreamResponse(router) + const dispose = vi.fn(() => { + if (failureMode === 'throw') { + throw cleanupError + } + return Promise.reject(cleanupError) + }) + ;(ssrResponse as any).dispose = dispose + startMocks.serverFnResult = ssrResponse + let notifyMiddlewareStarted!: () => void + const middlewareStarted = new Promise((resolve) => { + notifyMiddlewareStarted = resolve + }) + startMocks.requestMiddleware = [ + createMiddleware().server(async ({ next }) => { + await next() + notifyMiddlewareStarted() + return new Promise(() => {}) + }), + ] + onTestFinished(() => { + consoleError.mockRestore() + }) + onTestFinished(() => { + router.serverSsr?.cleanup() + }) + + const handler = createStartHandler(() => new Response('unused')) + const response = handler( + new Request('http://localhost/_serverFn/test', { + headers: { 'x-tsr-serverFn': 'true' }, + signal: requestController.signal, + }), + {}, + ) + + await middlewareStarted + requestController.abort(new Error('request disconnected')) + + expect((await response).status).toBe(500) + await vi.waitFor(() => { + expect(consoleError).toHaveBeenCalledWith(cleanupError) + }) + expect(dispose).toHaveBeenCalledOnce() + }, + ) + + it('disposes a stream when the request aborts after response handoff', async () => { const router = makeRouter() startMocks.router = router const requestController = new AbortController() let cancelCalls = 0 - let siblingResponse!: Response - startMocks.requestMiddleware = [ - createMiddleware().server(async ({ next }) => { - const result = await next() - siblingResponse = result.response.clone() - return result - }), - ] - const handler = createTestStartHandler(({ router: requestRouter }) => + const handler = createStartHandler(({ router: requestRouter }) => createSsrStreamResponse( requestRouter, new Response( @@ -4448,17 +1102,55 @@ describe('createStartHandler request cancellation', () => { ) expect(response.body).not.toBeNull() expect(router.serverSsr).toBeDefined() - const cancel = vi.spyOn(response.body!, 'cancel') - const reason = new Error('request disconnected') - requestController.abort(reason) - void siblingResponse.body!.cancel(reason) + requestController.abort(new Error('request disconnected')) + await Promise.resolve() - await vi.waitFor(() => { - expect(cancel).toHaveBeenCalledWith(reason) - expect(cancelCalls).toBe(1) - expect(router.serverSsr).toBeUndefined() + expect(cancelCalls).toBe(1) + expect(router.serverSsr).toBeUndefined() + }) + + it('settles when request middleware ignores cancellation', async () => { + const router = makeRouter() + startMocks.router = router + const requestController = new AbortController() + let notifyMiddlewareStarted!: () => void + const middlewareStarted = new Promise((resolve) => { + notifyMiddlewareStarted = resolve }) + const dispose = vi.fn(() => Promise.resolve()) + let releaseMiddleware!: (response: any) => void + const middlewareResult = new Promise((resolve) => { + releaseMiddleware = resolve + }) + startMocks.requestMiddleware = [ + createMiddleware().server(() => { + notifyMiddlewareStarted() + return middlewareResult + }), + ] + const render = vi.fn(() => new Response('must not render')) + const handler = createStartHandler(render) + const response = handler( + new Request('http://localhost/', { + signal: requestController.signal, + }), + {}, + ) + + await middlewareStarted + requestController.abort(new Error('request disconnected')) + + expect((await response).status).toBe(500) + expect(render).not.toHaveBeenCalled() + + releaseMiddleware({ + response: new Response('late'), + serverSsrCleanup: 'stream', + dispose, + }) + await vi.waitFor(() => expect(dispose).toHaveBeenCalledOnce()) + expect(render).not.toHaveBeenCalled() }) it('unwinds nested middleware when an inner operation ignores cancellation', async () => { @@ -4486,7 +1178,7 @@ describe('createStartHandler request cancellation', () => { }), ] const render = vi.fn(() => new Response('must not render')) - const handler = createTestStartHandler(render) + const handler = createStartHandler(render) const response = handler( new Request('http://localhost/', { signal: requestController.signal, @@ -4519,7 +1211,7 @@ describe('createStartHandler request cancellation', () => { }), ] const render = vi.fn(() => new Response('must not render')) - const handler = createTestStartHandler(render) + const handler = createStartHandler(render) const response = handler( new Request('http://localhost/', { signal: requestController.signal, @@ -4539,20 +1231,15 @@ describe('createStartHandler request cancellation', () => { startMocks.router = router const requestController = new AbortController() const reason = new Error('request disconnected') - const cancel = vi.fn() - const ssrResponse = makeStreamResponse(router, cancel) - const dispose = vi.spyOn(ssrResponse as any, 'dispose') startMocks.requestMiddleware = [ createMiddleware().server(({ next }) => next()), - createMiddleware().server(async ({ next }) => { - const result = await next() + createMiddleware().server(() => { requestController.abort(reason) - throw result.response + throw new Response('must not escape', { status: 418 }) }), - createMiddleware().server(() => ssrResponse as any), ] const render = vi.fn(() => new Response('must not render')) - const handler = createTestStartHandler(render) + const handler = createStartHandler(render) const response = await handler( new Request('http://localhost/', { @@ -4562,11 +1249,6 @@ describe('createStartHandler request cancellation', () => { ) expect(response.status).toBe(500) - await vi.waitFor(() => { - expect(dispose).toHaveBeenCalledWith(reason) - expect(cancel).toHaveBeenCalledOnce() - expect(cancel).toHaveBeenCalledWith(reason) - }) expect(render).not.toHaveBeenCalled() }) @@ -4577,9 +1259,9 @@ describe('createStartHandler request cancellation', () => { const reason = new Error('request disconnected') const observedErrors: Array = [] const afterNext = vi.fn() - const cancel = vi.fn() - const ssrResponse = makeStreamResponse(router, cancel) + const ssrResponse = makeStreamResponse(router) const dispose = vi.spyOn(ssrResponse as any, 'dispose') + const cancel = vi.spyOn(ssrResponse.response.body!, 'cancel') startMocks.requestMiddleware = [ createMiddleware().server(async ({ next }) => { try { @@ -4601,7 +1283,7 @@ describe('createStartHandler request cancellation', () => { createMiddleware().server(() => ssrResponse as any), ] const render = vi.fn(() => new Response('must not render')) - const handler = createTestStartHandler(render) + const handler = createStartHandler(render) const response = await handler( new Request('http://localhost/', { @@ -4613,6 +1295,7 @@ describe('createStartHandler request cancellation', () => { expect(response.status).toBe(500) await vi.waitFor(() => expect(observedErrors).toEqual([reason])) await vi.waitFor(() => { + expect(dispose).toHaveBeenCalledOnce() expect(dispose).toHaveBeenCalledWith(reason) expect(cancel).toHaveBeenCalledOnce() expect(cancel).toHaveBeenCalledWith(reason) @@ -4621,14 +1304,14 @@ describe('createStartHandler request cancellation', () => { expect(render).not.toHaveBeenCalled() }) - it('disposes a tagged final response when abort wins handoff', async () => { + it('disposes a tagged final response once when abort wins handoff', async () => { const router = makeRouter() startMocks.router = router const requestController = new AbortController() const reason = new Error('request disconnected') - const cancel = vi.fn() - const ssrResponse = makeStreamResponse(router, cancel) + const ssrResponse = makeStreamResponse(router) const dispose = vi.spyOn(ssrResponse as any, 'dispose') + const cancel = vi.spyOn(ssrResponse.response.body!, 'cancel') startMocks.requestMiddleware = [ createMiddleware().server(() => { queueMicrotask(() => { @@ -4638,7 +1321,7 @@ describe('createStartHandler request cancellation', () => { }), ] const render = vi.fn(() => new Response('must not render')) - const handler = createTestStartHandler(render) + const handler = createStartHandler(render) const response = await handler( new Request('http://localhost/', { @@ -4649,6 +1332,7 @@ describe('createStartHandler request cancellation', () => { expect(response.status).toBe(500) await vi.waitFor(() => { + expect(dispose).toHaveBeenCalledOnce() expect(dispose).toHaveBeenCalledWith(reason) expect(cancel).toHaveBeenCalledOnce() expect(cancel).toHaveBeenCalledWith(reason) @@ -4657,7 +1341,7 @@ describe('createStartHandler request cancellation', () => { expect(render).not.toHaveBeenCalled() }) - it('keeps late same-body disposal idempotent after abort', async () => { + it('ignores a late same-body alias after catch disposes its owner', async () => { const router = makeRouter() startMocks.router = router const requestController = new AbortController() @@ -4686,21 +1370,20 @@ describe('createStartHandler request cancellation', () => { return wrapped }), ] - const sourceCancel = vi.fn() const response = new Response( new ReadableStream({ start(controller) { controller.enqueue(new TextEncoder().encode('stream')) }, - cancel: sourceCancel, }), ) + const cancel = vi.spyOn(response.body!, 'cancel') let ssrResponse!: ReturnType const render = vi.fn(({ router: requestRouter }) => { ssrResponse = createSsrStreamResponse(requestRouter, response) return ssrResponse }) - const handler = createTestStartHandler(render) + const handler = createStartHandler(render) const result = handler( new Request('http://localhost/', { signal: requestController.signal, @@ -4716,65 +1399,10 @@ describe('createStartHandler request cancellation', () => { releaseMiddleware() await lateResultDelivered await vi.waitFor(() => { + expect(dispose).toHaveBeenCalledOnce() expect(dispose).toHaveBeenCalledWith(reason) - expect(sourceCancel).toHaveBeenCalledOnce() - expect(sourceCancel).toHaveBeenCalledWith(reason) - }) - expect(router.serverSsr).toBeUndefined() - }) - - it('cancels a piped body that middleware returns after abort', async () => { - const router = makeRouter() - startMocks.router = router - const requestController = new AbortController() - const reason = new Error('request disconnected') - let notifyResponseCaptured!: () => void - const responseCaptured = new Promise((resolve) => { - notifyResponseCaptured = resolve - }) - let releaseMiddleware!: () => void - const middlewareRelease = new Promise((resolve) => { - releaseMiddleware = resolve - }) - let derivedBody!: ReadableStream - startMocks.requestMiddleware = [ - createMiddleware().server(async ({ next }) => { - const result = await next() - const derived = new Response( - result.response.body!.pipeThrough(new TransformStream()), - result.response, - ) - derivedBody = derived.body! - notifyResponseCaptured() - await middlewareRelease - return derived - }), - ] - const sourceCancel = vi.fn() - const response = new Response( - new ReadableStream({ cancel: sourceCancel }), - ) - const handler = createTestStartHandler(({ router: requestRouter }) => - createSsrStreamResponse(requestRouter, response), - ) - const result = handler( - new Request('http://localhost/', { - signal: requestController.signal, - }), - {}, - ) - - await responseCaptured - const derivedCancel = vi.spyOn(derivedBody, 'cancel') - requestController.abort(reason) - - expect((await result).status).toBe(500) - expect(sourceCancel).not.toHaveBeenCalled() - releaseMiddleware() - await vi.waitFor(() => { - expect(derivedCancel).toHaveBeenCalledWith(reason) - expect(sourceCancel).toHaveBeenCalledOnce() - expect(sourceCancel).toHaveBeenCalledWith(reason) + expect(cancel).toHaveBeenCalledOnce() + expect(cancel).toHaveBeenCalledWith(reason) }) expect(router.serverSsr).toBeUndefined() }) @@ -4836,208 +1464,9 @@ describe('createStartHandler inlineCss option', () => { }) it('returns a static inline CSS default only for non-callback options', () => { - 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'), {}) + expect(getStaticHandlerInlineCssDefault(undefined)).toBe(true) + expect(getStaticHandlerInlineCssDefault(true)).toBe(true) + expect(getStaticHandlerInlineCssDefault(false)).toBe(false) + expect(getStaticHandlerInlineCssDefault(() => true)).toBe(undefined) }) }) diff --git a/packages/start-server-core/tests/early-hints.test.ts b/packages/start-server-core/tests/early-hints.test.ts index 22366eba0d..d56824a828 100644 --- a/packages/start-server-core/tests/early-hints.test.ts +++ b/packages/start-server-core/tests/early-hints.test.ts @@ -76,24 +76,18 @@ describe('early hints', () => { }, } - const hints = collectStaticHintsFromManifest(manifest, [ - { id: '__root__' }, - { id: '/posts' }, - ] as Array) - - expect(hints).toEqual([ - { - href: '/assets/root.js', - rel: 'modulepreload', - as: 'script', - fetchPriority: 'low', - }, + expect( + collectStaticHintsFromManifest(manifest, [ + { id: '__root__' }, + { id: '/posts' }, + ] as Array), + ).toEqual([ + { href: '/assets/root.js', rel: 'modulepreload', as: 'script' }, { href: '/assets/shared.js', rel: 'modulepreload', as: 'script', crossOrigin: 'anonymous', - fetchPriority: 'low', }, { href: '/assets/root.css', @@ -101,21 +95,9 @@ describe('early hints', () => { as: 'style', crossOrigin: 'use-credentials', }, - { - href: '/assets/posts.js', - rel: 'modulepreload', - as: 'script', - fetchPriority: 'low', - }, + { href: '/assets/posts.js', rel: 'modulepreload', as: 'script' }, { 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', () => { @@ -138,12 +120,7 @@ describe('early hints', () => { { id: '/posts' }, ] as Array), ).toEqual([ - { - href: '/assets/posts.js', - rel: 'modulepreload', - as: 'script', - fetchPriority: 'low', - }, + { href: '/assets/posts.js', rel: 'modulepreload', as: 'script' }, ]) }) @@ -172,12 +149,7 @@ describe('early hints', () => { { id: '/posts' }, ] as Array), ).toEqual([ - { - href: '/assets/posts.js', - rel: 'modulepreload', - as: 'script', - fetchPriority: 'low', - }, + { href: '/assets/posts.js', rel: 'modulepreload', as: 'script' }, ]) }) @@ -199,18 +171,12 @@ describe('early hints', () => { { id: '/posts' }, ] as Array), ).toEqual([ - { - href: '/assets/posts.js', - rel: 'preload', - as: 'script', - fetchPriority: 'low', - }, + { href: '/assets/posts.js', rel: 'preload', as: 'script' }, { href: '/assets/shared.js', rel: 'preload', as: 'script', crossOrigin: 'anonymous', - fetchPriority: 'low', }, ]) }) @@ -429,7 +395,7 @@ describe('early hints', () => { expect(events).toHaveLength(2) expect(headers.get('Link')).toBe( - '; rel=modulepreload; as=script; fetchpriority=low', + '; rel=modulepreload; as=script', ) }) diff --git a/packages/start-server-core/tests/error-entry-isolation.test.ts b/packages/start-server-core/tests/error-entry-isolation.test.ts deleted file mode 100644 index 6eb2feab5e..0000000000 --- a/packages/start-server-core/tests/error-entry-isolation.test.ts +++ /dev/null @@ -1,550 +0,0 @@ -// @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 deleted file mode 100644 index b4a32bb6b1..0000000000 --- a/packages/start-server-core/tests/external-sessions.test.ts +++ /dev/null @@ -1,174 +0,0 @@ -// @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 a41f64b576..dabcb19a3d 100644 --- a/packages/start-server-core/tests/finalManifest.test.ts +++ b/packages/start-server-core/tests/finalManifest.test.ts @@ -135,51 +135,6 @@ 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/frame-protocol.test.ts b/packages/start-server-core/tests/frame-protocol.test.ts index dd9f41cf4e..380f3a8351 100644 --- a/packages/start-server-core/tests/frame-protocol.test.ts +++ b/packages/start-server-core/tests/frame-protocol.test.ts @@ -1,150 +1,137 @@ -import { describe, expect, it, vi } from 'vitest' +import { describe, expect, it } from 'vitest' import { FRAME_HEADER_SIZE, - FRAME_TYPE_CHUNK, - FRAME_TYPE_END, - FRAME_TYPE_ERROR, - FRAME_TYPE_JSON, - MAX_FRAME_PAYLOAD_SIZE, -} from '@tanstack/start-client-core/client-rpc' -import { createMultiplexedStream } from '../src/frame-protocol' -import type { - LateStreamRegistration, - MultiplexedStreamRecord, + FrameType, + createMultiplexedStream, + encodeChunkFrame, + encodeEndFrame, + encodeErrorFrame, + encodeFrame, + encodeJSONFrame, } from '../src/frame-protocol' -function createRecord( - json: string, - rawStreams: Array = [], -): MultiplexedStreamRecord { - return { json: new TextEncoder().encode(json), rawStreams } -} - -function createRecordStream( - records: Array, -): ReadableStream { - return new ReadableStream({ - start(controller) { - for (const record of records) { - controller.enqueue(record) - } - controller.close() - }, - }) -} - -async function readFrames(stream: ReadableStream) { - const reader = stream.getReader() - const frames: Array = [] - for (;;) { - const { done, value } = await reader.read() - if (done) { - return frames - } - frames.push(value) - } -} - describe('frame-protocol', () => { - describe('frame encoding', () => { - it('should encode JSON, chunk, and end frames', async () => { + describe('encodeFrame', () => { + it('should encode frame with header and payload', () => { const payload = new Uint8Array([1, 2, 3, 4]) - const rawStream = new ReadableStream({ - start(controller) { - controller.enqueue(payload) - controller.close() - }, - }) - const frames = await readFrames( - createMultiplexedStream( - createRecordStream([ - createRecord('{"result":"ok"}', [{ id: 42, stream: rawStream }]), - ]), - ), - ) + const frame = encodeFrame(FrameType.CHUNK, 42, payload) - expect(frames).toHaveLength(3) - const jsonView = new DataView(frames[0]!.buffer, frames[0]!.byteOffset) - expect(jsonView.getUint8(0)).toBe(FRAME_TYPE_JSON) - expect(jsonView.getUint32(1, false)).toBe(0) + expect(frame.length).toBe(FRAME_HEADER_SIZE + payload.length) - const chunkView = new DataView(frames[1]!.buffer, frames[1]!.byteOffset) - expect(frames[1]!.length).toBe(FRAME_HEADER_SIZE + payload.length) - expect(chunkView.getUint8(0)).toBe(FRAME_TYPE_CHUNK) - expect(chunkView.getUint32(1, false)).toBe(42) - expect(chunkView.getUint32(5, false)).toBe(payload.length) - expect(frames[1]!.slice(FRAME_HEADER_SIZE)).toEqual(payload) + // Check header + const view = new DataView(frame.buffer) + expect(view.getUint8(0)).toBe(FrameType.CHUNK) + expect(view.getUint32(1, false)).toBe(42) // streamId big-endian + expect(view.getUint32(5, false)).toBe(4) // length big-endian - const endView = new DataView(frames[2]!.buffer, frames[2]!.byteOffset) - expect(frames[2]!.length).toBe(FRAME_HEADER_SIZE) - expect(endView.getUint8(0)).toBe(FRAME_TYPE_END) - expect(endView.getUint32(1, false)).toBe(42) - expect(endView.getUint32(5, false)).toBe(0) + // Check payload + expect(frame.slice(FRAME_HEADER_SIZE)).toEqual(payload) }) - it.each([ - [new Error('Something went wrong'), 'Something went wrong'], - ['string error', 'string error'], - [undefined, 'Unknown error'], - ])('should encode raw stream error payload %j', async (error, message) => { - const errorStream = new ReadableStream({ - start(controller) { - controller.error(error) - }, - }) - const frames = await readFrames( - createMultiplexedStream( - createRecordStream([ - createRecord('{}', [{ id: 789, stream: errorStream }]), - ]), - ), - ) - const frame = frames.find((value) => value[0] === FRAME_TYPE_ERROR)! - const view = new DataView(frame.buffer, frame.byteOffset) - expect(view.getUint8(0)).toBe(FRAME_TYPE_ERROR) - expect(view.getUint32(1, false)).toBe(789) - expect(new TextDecoder().decode(frame.slice(FRAME_HEADER_SIZE))).toBe( - message, - ) + it('should handle empty payload', () => { + const frame = encodeFrame(FrameType.END, 1, new Uint8Array(0)) + + expect(frame.length).toBe(FRAME_HEADER_SIZE) + + const view = new DataView(frame.buffer) + expect(view.getUint8(0)).toBe(FrameType.END) + expect(view.getUint32(5, false)).toBe(0) // length is 0 }) + }) + + describe('encodeJSONFrame', () => { + it('should encode JSON string as frame type 0 with streamId 0', () => { + const json = '{"hello":"world"}' + const frame = encodeJSONFrame(json) + + const view = new DataView(frame.buffer) + expect(view.getUint8(0)).toBe(FrameType.JSON) + expect(view.getUint32(1, false)).toBe(0) // streamId always 0 for JSON + + const encoder = new TextEncoder() + const expectedPayload = encoder.encode(json) + expect(view.getUint32(5, false)).toBe(expectedPayload.length) - it('should bound oversized raw-stream error messages', async () => { - const errorStream = new ReadableStream({ - start(controller) { - controller.error(new Error('x'.repeat(MAX_FRAME_PAYLOAD_SIZE + 1))) - }, - }) - const frames = await readFrames( - createMultiplexedStream( - createRecordStream([ - createRecord('{}', [{ id: 1, stream: errorStream }]), - ]), - ), - ) - const frame = frames.find((value) => value[0] === FRAME_TYPE_ERROR)! const payload = frame.slice(FRAME_HEADER_SIZE) - expect(payload.byteLength).toBeLessThan(MAX_FRAME_PAYLOAD_SIZE) - expect(new TextDecoder().decode(payload)).toMatch(/…$/) + expect(new TextDecoder().decode(payload)).toBe(json) + }) + }) + + describe('encodeChunkFrame', () => { + it('should encode binary chunk with frame type CHUNK', () => { + const chunk = new Uint8Array([0xff, 0xfe, 0xfd]) + const frame = encodeChunkFrame(123, chunk) + + const view = new DataView(frame.buffer) + expect(view.getUint8(0)).toBe(FrameType.CHUNK) + expect(view.getUint32(1, false)).toBe(123) + expect(view.getUint32(5, false)).toBe(3) + + expect(frame.slice(FRAME_HEADER_SIZE)).toEqual(chunk) + }) + }) + + describe('encodeEndFrame', () => { + it('should encode end frame with empty payload', () => { + const frame = encodeEndFrame(456) + + expect(frame.length).toBe(FRAME_HEADER_SIZE) + + const view = new DataView(frame.buffer) + expect(view.getUint8(0)).toBe(FrameType.END) + expect(view.getUint32(1, false)).toBe(456) + expect(view.getUint32(5, false)).toBe(0) + }) + }) + + describe('encodeErrorFrame', () => { + it('should encode Error message', () => { + const frame = encodeErrorFrame(789, new Error('Something went wrong')) + + const view = new DataView(frame.buffer) + expect(view.getUint8(0)).toBe(FrameType.ERROR) + expect(view.getUint32(1, false)).toBe(789) + + const payload = frame.slice(FRAME_HEADER_SIZE) + expect(new TextDecoder().decode(payload)).toBe('Something went wrong') + }) + + it('should handle non-Error values', () => { + const frame = encodeErrorFrame(1, 'string error') + + const payload = frame.slice(FRAME_HEADER_SIZE) + expect(new TextDecoder().decode(payload)).toBe('string error') + }) + + it('should handle undefined error', () => { + const frame = encodeErrorFrame(1, undefined) + + const payload = frame.slice(FRAME_HEADER_SIZE) + expect(new TextDecoder().decode(payload)).toBe('Unknown error') }) }) describe('createMultiplexedStream', () => { it('should multiplex JSON stream only', async () => { + const jsonStream = new ReadableStream({ + start(controller) { + controller.enqueue('{"data":1}') + controller.enqueue('{"data":2}') + controller.close() + }, + }) + const multiplexed = createMultiplexedStream( - createRecordStream([ - createRecord('{"data":1}'), - createRecord('{"data":2}'), - ]), + jsonStream, + new Map(), // no raw streams ) const reader = multiplexed.getReader() const chunks: Array = [] - for (;;) { + while (true) { const { done, value } = await reader.read() - if (done) { - break - } + if (done) break chunks.push(value) } @@ -153,11 +140,18 @@ describe('frame-protocol', () => { // Both should be JSON frames for (const chunk of chunks) { const view = new DataView(chunk.buffer, chunk.byteOffset) - expect(view.getUint8(0)).toBe(FRAME_TYPE_JSON) + expect(view.getUint8(0)).toBe(FrameType.JSON) } }) it('should multiplex JSON and raw streams', async () => { + const jsonStream = new ReadableStream({ + start(controller) { + controller.enqueue('{"result":"ok"}') + controller.close() + }, + }) + const rawStream = new ReadableStream({ start(controller) { controller.enqueue(new Uint8Array([1, 2, 3])) @@ -165,20 +159,17 @@ describe('frame-protocol', () => { }, }) - const multiplexed = createMultiplexedStream( - createRecordStream([ - createRecord('{"result":"ok"}', [{ id: 5, stream: rawStream }]), - ]), - ) + const rawStreams = new Map>() + rawStreams.set(5, rawStream) + + const multiplexed = createMultiplexedStream(jsonStream, rawStreams) const reader = multiplexed.getReader() const chunks: Array = [] - for (;;) { + while (true) { const { done, value } = await reader.read() - if (done) { - break - } + if (done) break chunks.push(value) } @@ -190,349 +181,51 @@ describe('frame-protocol', () => { return view.getUint8(0) }) - expect(types).toEqual([FRAME_TYPE_JSON, FRAME_TYPE_CHUNK, FRAME_TYPE_END]) - }) - - it('splits raw chunks at the wire payload limit', async () => { - const payload = new Uint8Array(MAX_FRAME_PAYLOAD_SIZE + 1) - const rawStream = new ReadableStream({ - start(controller) { - controller.enqueue(payload) - controller.close() - }, - }) - const multiplexed = createMultiplexedStream( - createRecordStream([ - createRecord('{"ref":1}', [{ id: 1, stream: rawStream }]), - ]), - ) - const reader = multiplexed.getReader() - const frames: Array = [] - for (;;) { - const { done, value } = await reader.read() - if (done) { - break - } - frames.push(value) - } - - expect(frames.map((frame) => frame[0])).toEqual([ - FRAME_TYPE_JSON, - FRAME_TYPE_CHUNK, - FRAME_TYPE_CHUNK, - FRAME_TYPE_END, - ]) - expect(frames[1]!.byteLength - FRAME_HEADER_SIZE).toBe( - MAX_FRAME_PAYLOAD_SIZE, - ) - expect(frames[2]!.byteLength - FRAME_HEADER_SIZE).toBe(1) - }) - - it('bounds upstream reads and copies chunks only when output has demand', async () => { - const first = new Uint8Array([1]) - const second = new Uint8Array([2]) - const chunks = [first, second] - let pullCount = 0 - let chunkIndex = 0 - const rawStream = new ReadableStream( - { - pull(controller) { - pullCount++ - const chunk = chunks[chunkIndex++] - if (chunk) { - controller.enqueue(chunk) - } else { - controller.close() - } - }, - }, - { highWaterMark: 0 }, - ) - const multiplexed = createMultiplexedStream( - createRecordStream([ - createRecord('{"ref":1}', [{ id: 1, stream: rawStream }]), - ]), - ) - - // Let every currently runnable pump microtask settle without consuming - // the output. One chunk is queued and one is held unencoded by its pump. - await new Promise((resolve) => setTimeout(resolve, 0)) - expect(pullCount).toBe(1) - - // The second frame must copy its payload only after the first frame is - // consumed and output capacity becomes available. - second[0] = 9 - const reader = multiplexed.getReader() - const jsonFrame = (await reader.read()).value! - expect(new DataView(jsonFrame.buffer).getUint8(0)).toBe(FRAME_TYPE_JSON) - await new Promise((resolve) => setTimeout(resolve, 0)) - expect(pullCount).toBe(2) - const firstFrame = (await reader.read()).value! - const secondFrame = (await reader.read()).value! - expect(firstFrame.slice(FRAME_HEADER_SIZE)).toEqual(new Uint8Array([1])) - expect(secondFrame.slice(FRAME_HEADER_SIZE)).toEqual(new Uint8Array([9])) - - const endFrame = (await reader.read()).value! - expect(new DataView(endFrame.buffer).getUint8(0)).toBe(FRAME_TYPE_END) - await expect(reader.read()).resolves.toEqual({ - done: true, - value: undefined, - }) - }) - - it('bounds concurrent pumps while a late record waits for output demand', async () => { - const sources = Array.from({ length: 5 }, (_, index) => { - const chunks: Array = [] - const cancel = vi.fn() - const stream = new ReadableStream( - { - pull(controller) { - const chunk = new Uint8Array([index + 1, 1]) - chunks.push(chunk) - controller.enqueue(chunk) - }, - cancel, - }, - { highWaterMark: 0 }, - ) - return { id: index + 1, stream, chunks, cancel } - }) - const multiplexed = createMultiplexedStream( - createRecordStream([ - createRecord('{"refs":[1,2,3,4]}', sources.slice(0, 4)), - createRecord('{"ref":5}', [sources[4]!]), - ]), - ) - const reader = multiplexed.getReader() - - // The first JSON frame fills the output. Each active pump holds one - // unencoded chunk; the late stream waits for its own JSON admission. - await new Promise((resolve) => setTimeout(resolve, 0)) - expect(sources.map(({ chunks }) => chunks.length)).toEqual([ - 1, 1, 1, 1, 0, - ]) - expect((await reader.read()).value![0]).toBe(FRAME_TYPE_JSON) - await new Promise((resolve) => setTimeout(resolve, 0)) - expect(sources.map(({ chunks }) => chunks.length)).toEqual([ - 2, 1, 1, 1, 0, - ]) - - // Only the first raw frame has been copied into the output queue. - for (const source of sources.slice(0, 4)) { - source.chunks[0]![1] = 9 - } - for (let streamId = 1; streamId <= 4; streamId++) { - const frame = (await reader.read()).value! - expect(frame[0]).toBe(FRAME_TYPE_CHUNK) - expect(frame.slice(FRAME_HEADER_SIZE)).toEqual( - new Uint8Array([streamId, streamId === 1 ? 1 : 9]), - ) - } - expect((await reader.read()).value![0]).toBe(FRAME_TYPE_JSON) - await new Promise((resolve) => setTimeout(resolve, 0)) - expect(sources[4]!.chunks).toHaveLength(1) - - const reason = new Error('client disconnected') - await reader.cancel(reason) - await new Promise((resolve) => setTimeout(resolve, 0)) - for (const { stream, cancel } of sources) { - expect(cancel).toHaveBeenCalledExactlyOnceWith(reason) - expect(stream.locked).toBe(false) - } - }) - - it.each(['cancel', 'abort'] as const)( - 'releases active and unadmitted raw streams on %s while output is full', - async (mode) => { - const reason = new Error('request ended') - const abortController = new AbortController() - const sources = Array.from({ length: 3 }, (_, index) => { - const cancel = vi.fn(() => new Promise(() => {})) - const pull = vi.fn( - (controller: ReadableStreamDefaultController) => { - controller.enqueue(new Uint8Array([index])) - }, - ) - const stream = new ReadableStream( - { pull, cancel }, - { highWaterMark: 0 }, - ) - return { id: index + 1, stream, pull, cancel } - }) - const recordCancel = vi.fn(() => new Promise(() => {})) - const records = new ReadableStream({ - start(controller) { - controller.enqueue( - createRecord('{"refs":[1,2]}', sources.slice(0, 2)), - ) - controller.enqueue(createRecord('{"ref":3}', [sources[2]!])) - }, - cancel: recordCancel, - }) - const reader = createMultiplexedStream(records, { - signal: abortController.signal, - }).getReader() - - await new Promise((resolve) => setTimeout(resolve, 0)) - expect(sources.map(({ pull }) => pull.mock.calls.length)).toEqual([ - 1, 1, 0, - ]) - if (mode === 'abort') { - abortController.abort(reason) - await expect(reader.read()).rejects.toBe(reason) - } else { - await reader.cancel(reason) - } - await new Promise((resolve) => setTimeout(resolve, 0)) - - expect(recordCancel).toHaveBeenCalledExactlyOnceWith(reason) - expect(records.locked).toBe(false) - for (const { stream, cancel } of sources) { - expect(cancel).toHaveBeenCalledExactlyOnceWith(reason) - expect(stream.locked).toBe(false) - } - expect(sources.map(({ pull }) => pull.mock.calls.length)).toEqual([ - 1, 1, 0, - ]) - }, - ) - - it('does not let a ready frame overtake one waiting for demand', async () => { - let secondController: ReadableStreamDefaultController - const firstRawStream = new ReadableStream({ - start(controller) { - controller.enqueue(new Uint8Array([1])) - controller.close() - }, - }) - const secondRawStream = new ReadableStream({ - start(controller) { - secondController = controller - }, - }) - const multiplexed = createMultiplexedStream( - createRecordStream([ - createRecord('{"refs":[1,2]}', [ - { id: 1, stream: firstRawStream }, - { id: 2, stream: secondRawStream }, - ]), - ]), - ) - const reader = multiplexed.getReader() - - // The JSON frame fills the output queue. The first raw frame then waits - // for demand while the second raw-stream read remains pending. - await new Promise((resolve) => setTimeout(resolve, 0)) - secondController!.enqueue(new Uint8Array([2])) - secondController!.close() - - // Fulfilling the second read is already queued when consuming the JSON - // creates demand. It must not bypass the first frame's admission. - const jsonFrame = (await reader.read()).value! - expect(jsonFrame[0]).toBe(FRAME_TYPE_JSON) - const firstFrame = (await reader.read()).value! - const secondFrame = (await reader.read()).value! - expect(firstFrame[0]).toBe(FRAME_TYPE_CHUNK) - expect(secondFrame[0]).toBe(FRAME_TYPE_CHUNK) - expect( - new DataView(firstFrame.buffer, firstFrame.byteOffset).getUint32( - 1, - false, - ), - ).toBe(1) - expect( - new DataView(secondFrame.buffer, secondFrame.byteOffset).getUint32( - 1, - false, - ), - ).toBe(2) - - await reader.cancel() + expect(types).toContain(FrameType.JSON) + expect(types).toContain(FrameType.CHUNK) + expect(types).toContain(FrameType.END) }) it('should handle cancel without errors', async () => { - let recordStreamCancelled = false + // Create slow streams that won't complete before cancel + let jsonCancelled = false let rawCancelled = false + const jsonStream = new ReadableStream({ + async start(controller) { + await new Promise((r) => setTimeout(r, 100)) + controller.enqueue('{}\n') + controller.close() + }, + cancel() { + jsonCancelled = true + }, + }) + const rawStream = new ReadableStream({ - pull() { - return new Promise(() => {}) + async start(controller) { + await new Promise((r) => setTimeout(r, 100)) + controller.enqueue(new Uint8Array([1, 2, 3])) + controller.close() }, cancel() { rawCancelled = true - return new Promise(() => {}) }, }) - const recordStream = new ReadableStream({ - start(controller) { - controller.enqueue(createRecord('{}', [{ id: 1, stream: rawStream }])) - }, - cancel() { - recordStreamCancelled = true - return new Promise(() => {}) - }, - }) + const rawStreams = new Map>() + rawStreams.set(1, rawStream) - const multiplexed = createMultiplexedStream(recordStream) + const multiplexed = createMultiplexedStream(jsonStream, rawStreams) const reader = multiplexed.getReader() - await reader.read() - - // Output cancellation must not adopt a user cancellation promise that - // is allowed to remain pending forever. + // Cancel immediately before streams complete + // Should not throw ERR_INVALID_STATE await reader.cancel() - expect(recordStreamCancelled).toBe(true) + // Underlying reader.cancel should propagate to sources + expect(jsonCancelled).toBe(true) expect(rawCancelled).toBe(true) - expect(recordStream.locked).toBe(false) - expect(rawStream.locked).toBe(false) - }) - - it('cancels raw streams from a record fulfilled as the request aborts', async () => { - const reason = new Error('request aborted') - let cancelReason: unknown - let cancelCount = 0 - const rawStream = new ReadableStream({ - cancel(value) { - cancelCount++ - cancelReason = value - }, - }) - const abortController = new AbortController() - const multiplexed = createMultiplexedStream( - createRecordStream([ - createRecord('{}', [{ id: 1, stream: rawStream }]), - ]), - { signal: abortController.signal }, - ) - - // The record read is already fulfilled, but its pump has not resumed. - abortController.abort(reason) - - await expect(multiplexed.getReader().read()).rejects.toBe(reason) - expect(cancelCount).toBe(1) - expect(cancelReason).toBe(reason) - expect(rawStream.locked).toBe(false) - }) - - it('cancels a stream source for an already-aborted request', async () => { - const reason = new Error('request already aborted') - const cancel = vi.fn() - const recordStream = new ReadableStream({ - cancel, - }) - const abortController = new AbortController() - abortController.abort(reason) - - const multiplexed = createMultiplexedStream(recordStream, { - signal: abortController.signal, - }) - - await expect(multiplexed.getReader().read()).rejects.toBe(reason) - expect(cancel).toHaveBeenCalledOnce() - expect(cancel).toHaveBeenCalledWith(reason) - expect(recordStream.locked).toBe(false) }) it('should interleave multiple raw streams correctly', async () => { @@ -542,6 +235,13 @@ describe('frame-protocol', () => { const gate1 = new Promise((r) => (resolve1 = r)) const gate2 = new Promise((r) => (resolve2 = r)) + const jsonStream = new ReadableStream({ + start(controller) { + controller.enqueue('{"streams":[1,2]}') + controller.close() + }, + }) + const rawStream1 = new ReadableStream({ async start(controller) { controller.enqueue(new Uint8Array([0x11])) @@ -560,25 +260,19 @@ describe('frame-protocol', () => { }, }) - const multiplexed = createMultiplexedStream( - createRecordStream([ - createRecord('{"streams":[1,2]}', [ - { id: 1, stream: rawStream1 }, - { id: 2, stream: rawStream2 }, - ]), - ]), - ) + const rawStreams = new Map>() + rawStreams.set(1, rawStream1) + rawStreams.set(2, rawStream2) + + const multiplexed = createMultiplexedStream(jsonStream, rawStreams) const reader = multiplexed.getReader() const chunks: Array = [] // Read first batch (JSON + first chunks from both streams) for (let i = 0; i < 3; i++) { - const next = await reader.read() - if (next.done) { - break - } - chunks.push(next.value) + const { value } = await reader.read() + if (value) chunks.push(value) } // Release gates to let streams continue @@ -586,11 +280,9 @@ describe('frame-protocol', () => { resolve2!() // Read remaining chunks - for (;;) { + while (true) { const { done, value } = await reader.read() - if (done) { - break - } + if (done) break chunks.push(value) } @@ -603,50 +295,63 @@ describe('frame-protocol', () => { return view.getUint8(0) }) - expect(types.filter((t) => t === FRAME_TYPE_JSON).length).toBe(1) - expect(types.filter((t) => t === FRAME_TYPE_CHUNK).length).toBe(4) - expect(types.filter((t) => t === FRAME_TYPE_END).length).toBe(2) + expect(types.filter((t) => t === FrameType.JSON).length).toBe(1) + expect(types.filter((t) => t === FrameType.CHUNK).length).toBe(4) + expect(types.filter((t) => t === FrameType.END).length).toBe(2) }) it('should handle late stream registration', async () => { - // The record containing the late reference is emitted after a delay. - let resolveGate: () => void - const gate = new Promise((r) => (resolveGate = r)) - - const recordStream = new ReadableStream({ - async start(controller) { - await gate - controller.enqueue( - createRecord('{"ref":99}', [ - { - id: 99, - stream: new ReadableStream({ - start(c) { - c.enqueue(new Uint8Array([0xaa, 0xbb])) - c.close() - }, - }), - }, - ]), - ) + const jsonStream = new ReadableStream({ + start(controller) { + controller.enqueue('{"ref":99}') controller.close() }, }) - const multiplexed = createMultiplexedStream(recordStream) + // Late stream source that emits a registration after a delay + // (ensures framed protocol doesn't miss late-stream messages) + let resolveGate: () => void + const gate = new Promise((r) => (resolveGate = r)) + + const lateStreamSource = new ReadableStream<{ + id: number + stream: ReadableStream + }>({ + async start(controller) { + await gate + controller.enqueue({ + id: 99, + stream: new ReadableStream({ + start(c) { + c.enqueue(new Uint8Array([0xaa, 0xbb])) + c.close() + }, + }), + }) + controller.close() + }, + }) + + const multiplexed = createMultiplexedStream( + jsonStream, + new Map(), + lateStreamSource, + ) const reader = multiplexed.getReader() const chunks: Array = [] + // Read JSON frame first + const { value: jsonChunk } = await reader.read() + if (jsonChunk) chunks.push(jsonChunk) + // Release gate to let late stream arrive resolveGate!() // Read remaining frames - for (;;) { + while (true) { const { done, value } = await reader.read() - if (done) { - break - } + if (done) break chunks.push(value) } @@ -658,7 +363,7 @@ describe('frame-protocol', () => { return view.getUint8(0) }) - expect(types).toEqual([FRAME_TYPE_JSON, FRAME_TYPE_CHUNK, FRAME_TYPE_END]) + expect(types).toEqual([FrameType.JSON, FrameType.CHUNK, FrameType.END]) // Verify late stream data const chunkFrame = chunks[1]! @@ -673,41 +378,49 @@ describe('frame-protocol', () => { let startJson: () => void const jsonGate = new Promise((r) => (startJson = r)) - const recordStream = new ReadableStream({ + const jsonStream = new ReadableStream({ async start(controller) { await jsonGate - controller.enqueue( - createRecord('{"ref":1}', [ - { - id: 1, - stream: new ReadableStream({ - start(c) { - c.enqueue(new Uint8Array([0x01])) - c.close() - }, - }), - }, - ]), - ) + controller.enqueue('{"ref":1}') controller.close() }, }) - const multiplexed = createMultiplexedStream(recordStream) + // Late stream registers immediately (before JSON starts) + const lateStreamSource = new ReadableStream<{ + id: number + stream: ReadableStream + }>({ + start(controller) { + controller.enqueue({ + id: 1, + stream: new ReadableStream({ + start(c) { + c.enqueue(new Uint8Array([0x01])) + c.close() + }, + }), + }) + controller.close() + }, + }) + + const multiplexed = createMultiplexedStream( + jsonStream, + new Map(), + lateStreamSource, + ) const reader = multiplexed.getReader() const chunks: Array = [] - // The stream exists before its delayed JSON record, but the mux must not - // start it until after that record is admitted. + // Allow late stream to run before JSON await Promise.resolve() startJson!() - for (;;) { + while (true) { const { done, value } = await reader.read() - if (done) { - break - } + if (done) break chunks.push(value) } @@ -716,13 +429,27 @@ describe('frame-protocol', () => { return view.getUint8(0) }) - expect(types).toEqual([FRAME_TYPE_JSON, FRAME_TYPE_CHUNK, FRAME_TYPE_END]) + // Order is not strictly guaranteed, but all frames must be present. + expect(types.filter((t) => t === FrameType.JSON).length).toBe(1) + expect(types.filter((t) => t === FrameType.CHUNK).length).toBe(1) + expect(types.filter((t) => t === FrameType.END).length).toBe(1) }) it('should handle multiple late stream registrations', async () => { - const recordStream = createRecordStream([ - createRecord('{}', [ - { + const jsonStream = new ReadableStream({ + start(controller) { + controller.enqueue('{}') + controller.close() + }, + }) + + const lateStreamSource = new ReadableStream<{ + id: number + stream: ReadableStream + }>({ + start(controller) { + // Register two streams + controller.enqueue({ id: 10, stream: new ReadableStream({ start(c) { @@ -730,8 +457,8 @@ describe('frame-protocol', () => { c.close() }, }), - }, - { + }) + controller.enqueue({ id: 20, stream: new ReadableStream({ start(c) { @@ -739,20 +466,23 @@ describe('frame-protocol', () => { c.close() }, }), - }, - ]), - ]) + }) + controller.close() + }, + }) - const multiplexed = createMultiplexedStream(recordStream) + const multiplexed = createMultiplexedStream( + jsonStream, + new Map(), + lateStreamSource, + ) const reader = multiplexed.getReader() const chunks: Array = [] - for (;;) { + while (true) { const { done, value } = await reader.read() - if (done) { - break - } + if (done) break chunks.push(value) } @@ -765,15 +495,24 @@ describe('frame-protocol', () => { return view.getUint8(0) }) - expect(types.filter((t) => t === FRAME_TYPE_JSON).length).toBe(1) - expect(types.filter((t) => t === FRAME_TYPE_CHUNK).length).toBe(2) - expect(types.filter((t) => t === FRAME_TYPE_END).length).toBe(2) + expect(types.filter((t) => t === FrameType.JSON).length).toBe(1) + expect(types.filter((t) => t === FrameType.CHUNK).length).toBe(2) + expect(types.filter((t) => t === FrameType.END).length).toBe(2) }) it('should interleave initial and late streams', async () => { let resolveJson: () => void const jsonGate = new Promise((r) => (resolveJson = r)) + const jsonStream = new ReadableStream({ + async start(controller) { + controller.enqueue('{"first":true}') + await jsonGate + controller.enqueue('{"second":true}') + controller.close() + }, + }) + // Initial raw stream const initialRaw = new ReadableStream({ start(controller) { @@ -782,52 +521,51 @@ describe('frame-protocol', () => { }, }) - const recordStream = new ReadableStream({ - async start(controller) { - controller.enqueue( - createRecord('{"first":true}', [{ id: 1, stream: initialRaw }]), - ) - await jsonGate - controller.enqueue( - createRecord('{"second":true}', [ - { - id: 2, - stream: new ReadableStream({ - start(c) { - c.enqueue(new Uint8Array([2])) - c.close() - }, - }), + const rawStreams = new Map>() + rawStreams.set(1, initialRaw) + + // Late stream arrives after first JSON + const lateStreamSource = new ReadableStream<{ + id: number + stream: ReadableStream + }>({ + start(controller) { + controller.enqueue({ + id: 2, + stream: new ReadableStream({ + start(c) { + c.enqueue(new Uint8Array([2])) + c.close() }, - ]), - ) + }), + }) controller.close() }, }) - const multiplexed = createMultiplexedStream(recordStream) + const multiplexed = createMultiplexedStream( + jsonStream, + rawStreams, + lateStreamSource, + ) const reader = multiplexed.getReader() const chunks: Array = [] - // Read the first record and its stream. - for (let i = 0; i < 3; i++) { + // Read a few frames + for (let i = 0; i < 4; i++) { const { value, done } = await reader.read() - if (done) { - break - } - chunks.push(value) + if (done) break + if (value) chunks.push(value) } // Release JSON to complete resolveJson!() // Read remaining - for (;;) { + while (true) { const { done, value } = await reader.read() - if (done) { - break - } + if (done) break chunks.push(value) } @@ -839,32 +577,36 @@ describe('frame-protocol', () => { return view.getUint8(0) }) - expect(types.filter((t) => t === FRAME_TYPE_JSON).length).toBe(2) - expect(types.filter((t) => t === FRAME_TYPE_CHUNK).length).toBe(2) - expect(types.filter((t) => t === FRAME_TYPE_END).length).toBe(2) + expect(types.filter((t) => t === FrameType.JSON).length).toBe(2) + expect(types.filter((t) => t === FrameType.CHUNK).length).toBe(2) + expect(types.filter((t) => t === FrameType.END).length).toBe(2) }) it('should handle raw stream error', async () => { + const jsonStream = new ReadableStream({ + start(controller) { + controller.enqueue('{}') + controller.close() + }, + }) + const errorStream = new ReadableStream({ start(controller) { controller.error(new Error('Stream failed')) }, }) - const multiplexed = createMultiplexedStream( - createRecordStream([ - createRecord('{}', [{ id: 10, stream: errorStream }]), - ]), - ) + const rawStreams = new Map>() + rawStreams.set(10, errorStream) + + const multiplexed = createMultiplexedStream(jsonStream, rawStreams) const reader = multiplexed.getReader() const chunks: Array = [] - for (;;) { + while (true) { const { done, value } = await reader.read() - if (done) { - break - } + if (done) break chunks.push(value) } @@ -874,13 +616,13 @@ describe('frame-protocol', () => { return view.getUint8(0) }) - expect(types).toContain(FRAME_TYPE_JSON) - expect(types).toContain(FRAME_TYPE_ERROR) + expect(types).toContain(FrameType.JSON) + expect(types).toContain(FrameType.ERROR) // Find ERROR frame and check content const errorFrame = chunks.find((chunk) => { const view = new DataView(chunk.buffer, chunk.byteOffset) - return view.getUint8(0) === FRAME_TYPE_ERROR + return view.getUint8(0) === FrameType.ERROR }) expect(errorFrame).toBeDefined() @@ -889,10 +631,11 @@ describe('frame-protocol', () => { }) it('should propagate JSON stream error to output (fatal)', async () => { - let errorController: ReadableStreamDefaultController - const recordStream = new ReadableStream({ + let errorController: ReadableStreamDefaultController + const jsonStream = new ReadableStream({ start(controller) { errorController = controller + controller.enqueue('{"first":true}') }, }) @@ -905,18 +648,17 @@ describe('frame-protocol', () => { }, }) - errorController!.enqueue( - createRecord('{"first":true}', [{ id: 1, stream: rawStream }]), - ) + const rawStreams = new Map>() + rawStreams.set(1, rawStream) - const multiplexed = createMultiplexedStream(recordStream) + const multiplexed = createMultiplexedStream(jsonStream, rawStreams) const reader = multiplexed.getReader() // Should be able to read first JSON frame const { value: firstChunk } = await reader.read() expect(firstChunk).toBeDefined() const view = new DataView(firstChunk!.buffer, firstChunk!.byteOffset) - expect(view.getUint8(0)).toBe(FRAME_TYPE_JSON) + expect(view.getUint8(0)).toBe(FrameType.JSON) // Now error the JSON stream errorController!.error(new Error('JSON serialization failed')) @@ -927,6 +669,13 @@ describe('frame-protocol', () => { it('should not hang when raw stream never ends', async () => { // This tests the fix for hanging requests + const jsonStream = new ReadableStream({ + start(controller) { + controller.enqueue('{}') + controller.close() + }, + }) + let rawStreamCancelled = false const neverEndingStream = new ReadableStream({ start(controller) { @@ -938,11 +687,10 @@ describe('frame-protocol', () => { }, }) - const multiplexed = createMultiplexedStream( - createRecordStream([ - createRecord('{}', [{ id: 1, stream: neverEndingStream }]), - ]), - ) + const rawStreams = new Map>() + rawStreams.set(1, neverEndingStream) + + const multiplexed = createMultiplexedStream(jsonStream, rawStreams) const reader = multiplexed.getReader() // Read first two frames (JSON and CHUNK) diff --git a/packages/start-server-core/tests/header-contracts.test-d.ts b/packages/start-server-core/tests/header-contracts.test-d.ts deleted file mode 100644 index 6db9aaef5e..0000000000 --- a/packages/start-server-core/tests/header-contracts.test-d.ts +++ /dev/null @@ -1,70 +0,0 @@ -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 deleted file mode 100644 index 446ff084b3..0000000000 --- a/packages/start-server-core/tests/header-contracts.test.ts +++ /dev/null @@ -1,547 +0,0 @@ -// @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 deleted file mode 100644 index 95c5f2fa23..0000000000 --- a/packages/start-server-core/tests/redirect-protocol-reconciliation.test.ts +++ /dev/null @@ -1,664 +0,0 @@ -// @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 deleted file mode 100644 index 913407be36..0000000000 --- a/packages/start-server-core/tests/request-response.test.ts +++ /dev/null @@ -1,48 +0,0 @@ -import { describe, expect, it, vi } from 'vitest' -import { createServerEntry, getRequestUrl } from '../src/request-response' - -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 response = await entry.fetch( - new Request(`http://localhost${pathname}`), - ) - - expect(response.status).toBe(400) - expect(response.statusText).toBe('Bad Request') - expect(response.body).toBeNull() - expect(fetch).not.toHaveBeenCalled() - }) - - 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 response = await entry.fetch(new Request(`http://localhost${path}`)) - - 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 deleted file mode 100644 index a9a6c09172..0000000000 --- a/packages/start-server-core/tests/response-reconciliation.bench.md +++ /dev/null @@ -1,40 +0,0 @@ -# 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 deleted file mode 100644 index 389b6af847..0000000000 --- a/packages/start-server-core/tests/response-reconciliation.bench.ts +++ /dev/null @@ -1,391 +0,0 @@ -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 deleted file mode 100644 index 434a06efca..0000000000 --- a/packages/start-server-core/tests/server-functions-handler.test.ts +++ /dev/null @@ -1,554 +0,0 @@ -// @vitest-environment node - -import { beforeEach, expect, test, vi } from 'vitest' -import { createStream, fromCrossJSON } from 'seroval' -import { - TSS_CONTENT_TYPE_FRAMED_VERSIONED, - X_TSS_SERIALIZED, -} from '@tanstack/start-client-core' -import { - FRAME_HEADER_SIZE, - FRAME_TYPE_CHUNK, - FRAME_TYPE_JSON, - MAX_FRAMED_STREAMS, -} from '@tanstack/start-client-core/client-rpc' -import { RawStream } from '@tanstack/router-core' -import { defaultSerovalDeserializerPlugins } from '@tanstack/router-core/ssr/server' -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(), -})) - -vi.mock('../src/getServerFnById', () => ({ - getServerFnById: () => mocks.action, -})) - -vi.mock('@tanstack/start-client-core', async (importOriginal) => { - const actual = await importOriginal() - const { defaultSerovalDeserializerPlugins } = - await import('@tanstack/router-core/ssr/server') - return { - ...actual, - getSerovalPlugins: () => defaultSerovalDeserializerPlugins, - } -}) - -beforeEach(() => { - mocks.action.mockReset() -}) - -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() - for (;;) { - const { done, value } = await reader.read() - if (done) { - return frames - } - frames.push({ - type: value[0]!, - payload: value.slice(FRAME_HEADER_SIZE), - }) - } -} - -function expectRawReferenceBeforeChunk( - frames: Array<{ type: number; payload: Uint8Array }>, -) { - const chunkIndex = frames.findIndex( - (frame) => frame.type === FRAME_TYPE_CHUNK, - ) - const referenceIndex = frames.findIndex( - (frame) => - frame.type === FRAME_TYPE_JSON && - new TextDecoder().decode(frame.payload).includes('tss/RawStream'), - ) - expect(referenceIndex).toBeGreaterThanOrEqual(0) - expect(chunkIndex).toBeGreaterThan(referenceIndex) -} - -test.each([false, 0, '', null])( - 'preserves the direct server-function result %j', - async (result) => { - mocks.action.mockResolvedValue({ result }) - - await expect( - handleServerAction({ - request: new Request('http://localhost/_serverFn/test', { - method: 'POST', - }), - serverFnId: 'test', - }), - ).resolves.toBe(result) - }, -) - -test('serializes a complete direct JSON record without LF', async () => { - mocks.action.mockResolvedValue({ result: { value: 'complete' } }) - - const response = await callServerAction({ - request: new Request('http://localhost/_serverFn/test', { - method: 'POST', - headers: { 'x-tsr-serverFn': 'true' }, - }), - serverFnId: 'test', - }) - - const encoded = await response.text() - const parsed = JSON.parse(encoded) - expect(encoded).toBe(JSON.stringify(parsed)) - expect(encoded).not.toContain('\n') -}) - -test('cancelling a framed response disposes its serializer', async () => { - const cancel = vi.fn() - const source = new ReadableStream({ - cancel, - }) - mocks.action.mockResolvedValue({ result: source }) - - const response = await callServerAction({ - request: new Request('http://localhost/_serverFn/test', { - method: 'POST', - headers: { 'x-tsr-serverFn': 'true' }, - }), - serverFnId: 'test', - }) - - expect(source.locked).toBe(true) - await response.body!.cancel('client disconnected') - expect(cancel).toHaveBeenCalledOnce() - expect(source.locked).toBe(false) -}) - -test('aborting the request disposes a handed-off framed response', async () => { - const abortController = new AbortController() - const reason = new Error('request aborted') - const cancel = vi.fn() - const source = new ReadableStream({ cancel }) - mocks.action.mockResolvedValue({ result: new RawStream(source) }) - - const response = await callServerAction({ - request: new Request('http://localhost/_serverFn/test', { - method: 'POST', - headers: { 'x-tsr-serverFn': 'true' }, - signal: abortController.signal, - }), - serverFnId: 'test', - }) - - await vi.waitFor(() => { - expect(source.locked).toBe(true) - }) - abortController.abort(reason) - await vi.waitFor(() => { - expect(cancel).toHaveBeenCalledOnce() - expect(cancel).toHaveBeenCalledWith(reason) - expect(source.locked).toBe(false) - }) - await expect(response.body!.getReader().read()).rejects.toBe(reason) -}) - -test('cancels synchronous RawStreams without pulling when the request is already aborted', async () => { - const abortController = new AbortController() - const reason = new Error('request already aborted') - abortController.abort(reason) - const sources = Array.from({ length: 3 }, () => { - const cancel = vi.fn(() => new Promise(() => {})) - const pull = vi.fn() - const stream = new ReadableStream( - { pull, cancel }, - { highWaterMark: 0 }, - ) - return { stream, pull, cancel } - }) - mocks.action.mockResolvedValue({ - result: sources.map(({ stream }) => new RawStream(stream)), - }) - - const response = await callServerAction({ - request: new Request('http://localhost/_serverFn/test', { - method: 'POST', - headers: { 'x-tsr-serverFn': 'true' }, - signal: abortController.signal, - }), - serverFnId: 'test', - }) - - await expect(response.body!.getReader().read()).rejects.toBe(reason) - await new Promise((resolve) => setTimeout(resolve, 0)) - for (const { stream, pull, cancel } of sources) { - expect(pull).not.toHaveBeenCalled() - expect(cancel).toHaveBeenCalledExactlyOnceWith(reason) - expect(stream.locked).toBe(false) - } -}) - -test('bounds and cancels synchronous RawStreams when their response remains unread', async () => { - const sources = Array.from({ length: 3 }, () => { - const cancel = vi.fn() - const pull = vi.fn( - (controller: ReadableStreamDefaultController) => { - controller.enqueue(new Uint8Array(64 * 1024)) - }, - ) - const stream = new ReadableStream( - { pull, cancel }, - { highWaterMark: 0 }, - ) - return { stream, pull, cancel } - }) - mocks.action.mockResolvedValue({ - result: sources.map(({ stream }) => new RawStream(stream)), - }) - - const response = await callServerAction({ - request: new Request('http://localhost/_serverFn/test', { - method: 'POST', - headers: { 'x-tsr-serverFn': 'true' }, - }), - serverFnId: 'test', - }) - - await new Promise((resolve) => setTimeout(resolve, 0)) - expect(sources.map(({ pull }) => pull.mock.calls.length)).toEqual([1, 1, 1]) - const reason = new Error('client disconnected') - await response.body!.cancel(reason) - await new Promise((resolve) => setTimeout(resolve, 0)) - for (const { stream, pull, cancel } of sources) { - expect(pull).toHaveBeenCalledOnce() - expect(cancel).toHaveBeenCalledExactlyOnceWith(reason) - expect(stream.locked).toBe(false) - } -}) - -test('a synchronous serialization failure cancels registered raw streams', async () => { - const cancel = vi.fn() - const source = new ReadableStream({ cancel }) - mocks.action.mockResolvedValue({ - result: { - raw: new RawStream(source), - unsupported: () => {}, - }, - }) - const consoleInfo = vi.spyOn(console, 'info').mockImplementation(() => {}) - const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {}) - - try { - const response = await callServerAction({ - request: new Request('http://localhost/_serverFn/test', { - method: 'POST', - headers: { 'x-tsr-serverFn': 'true' }, - }), - serverFnId: 'test', - }) - - expect(cancel).toHaveBeenCalledOnce() - expect(cancel).toHaveBeenCalledWith(expect.any(Error)) - expect(source.locked).toBe(false) - expect(response.headers.get(X_TSS_SERIALIZED)).toBe('true') - expect(response.headers.get('content-type')).toBe('application/json') - expect( - fromCrossJSON<{ error: unknown }>(await response.json(), { - plugins: defaultSerovalDeserializerPlugins, - }).error, - ).toBeInstanceOf(Error) - } finally { - consoleInfo.mockRestore() - consoleError.mockRestore() - } -}) - -test('admits replayed nested RawStream references before their chunks', async () => { - const source = new ReadableStream({ - start(controller) { - controller.enqueue(new Uint8Array([1])) - controller.close() - }, - }) - const replayed = createStream() - replayed.next(new RawStream(source)) - replayed.return(undefined) - mocks.action.mockResolvedValue({ result: { replayed } }) - - const response = await callServerAction({ - request: new Request('http://localhost/_serverFn/test', { - method: 'POST', - headers: { 'x-tsr-serverFn': 'true' }, - }), - serverFnId: 'test', - }) - - expectRawReferenceBeforeChunk(await readFrames(response)) -}) - -test('frames every record from a synchronously replayed Seroval stream', async () => { - const replayed = createStream() - replayed.next(1) - replayed.return(undefined) - mocks.action.mockResolvedValue({ result: { replayed } }) - - const response = await callServerAction({ - request: new Request('http://localhost/_serverFn/test', { - method: 'POST', - headers: { 'x-tsr-serverFn': 'true' }, - }), - serverFnId: 'test', - }) - - expect(response.headers.get('content-type')).toBe( - TSS_CONTENT_TYPE_FRAMED_VERSIONED, - ) - const frames = await readFrames(response) - expect(frames.every((frame) => frame.type === FRAME_TYPE_JSON)).toBe(true) - expect(frames.length).toBeGreaterThan(1) - - const refs = new Map() - let result: any - for (let index = 0; index < frames.length; index++) { - const encoded = new TextDecoder().decode(frames[index]!.payload) - const parsed = JSON.parse(encoded) - expect(encoded).toBe(JSON.stringify(parsed)) - expect(encoded).not.toContain('\n') - const value = fromCrossJSON(parsed, { - refs, - plugins: defaultSerovalDeserializerPlugins, - }) - if (index === 0) { - result = value - } - } - - const events: Array<[string, unknown]> = [] - result.result.replayed.on({ - next(value: unknown) { - events.push(['next', value]) - }, - throw(error: unknown) { - events.push(['throw', error]) - }, - return(value: unknown) { - events.push(['return', value]) - }, - }) - expect(events).toEqual([ - ['next', 1], - ['return', undefined], - ]) -}) - -test('keeps work discovered after a transient synchronous completion', async () => { - const replayed = createStream() - replayed.return(undefined) - let resolveLate!: (value: RawStream) => void - const late = new Promise((resolve) => { - resolveLate = resolve - }) - mocks.action.mockResolvedValue({ result: { replayed, late } }) - - const response = await callServerAction({ - request: new Request('http://localhost/_serverFn/test', { - method: 'POST', - headers: { 'x-tsr-serverFn': 'true' }, - }), - serverFnId: 'test', - }) - resolveLate( - new RawStream( - new ReadableStream({ - start(controller) { - controller.enqueue(new Uint8Array([1])) - controller.close() - }, - }), - ), - ) - - expectRawReferenceBeforeChunk(await readFrames(response)) -}) - -test('bounds synchronously replayed Seroval records before framing', async () => { - const replayed = createStream() - for (let index = 0; index < 1025; index++) { - replayed.next(index) - } - replayed.return(undefined) - mocks.action.mockResolvedValue({ result: { replayed } }) - const consoleInfo = vi.spyOn(console, 'info').mockImplementation(() => {}) - const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {}) - - try { - const response = await callServerAction({ - request: new Request('http://localhost/_serverFn/test', { - method: 'POST', - headers: { 'x-tsr-serverFn': 'true' }, - }), - serverFnId: 'test', - }) - - const { error } = fromCrossJSON<{ error: unknown }>(await response.json(), { - plugins: defaultSerovalDeserializerPlugins, - }) - expect(error).toBeInstanceOf(Error) - expect((error as Error).message).toContain('pending output limit') - } finally { - consoleInfo.mockRestore() - consoleError.mockRestore() - } -}) - -test('admits late RawStream references before their chunks', async () => { - let resolveRawStream!: (value: RawStream) => void - const lateRawStream = new Promise((resolve) => { - resolveRawStream = resolve - }) - mocks.action.mockResolvedValue({ result: { lateRawStream } }) - - const response = await callServerAction({ - request: new Request('http://localhost/_serverFn/test', { - method: 'POST', - headers: { 'x-tsr-serverFn': 'true' }, - }), - serverFnId: 'test', - }) - resolveRawStream( - new RawStream( - new ReadableStream({ - start(controller) { - controller.enqueue(new Uint8Array([2])) - controller.close() - }, - }), - ), - ) - - expectRawReferenceBeforeChunk(await readFrames(response)) -}) - -test('rejects a non-ASCII JSON record larger than the wire limit', async () => { - const cancel = vi.fn() - const source = new ReadableStream({ cancel }) - mocks.action.mockResolvedValue({ - result: { - // UTF-16 length is within the old limit, but UTF-8 is over 16 MiB. - value: 'é'.repeat(8 * 1024 * 1024), - raw: new RawStream(source), - }, - }) - - const response = await callServerAction({ - request: new Request('http://localhost/_serverFn/test', { - method: 'POST', - headers: { 'x-tsr-serverFn': 'true' }, - }), - serverFnId: 'test', - }) - - expect(cancel).toHaveBeenCalledOnce() - expect(source.locked).toBe(false) - // Nothing reached the client yet, so the whole call fails. - expect(response.status).toBe(500) - expect(response.headers.get('content-type')).toBe('application/json') - expect(await response.text()).toContain('pending output limit') -}) - -test.each(['RawStream', 'ReadableStream'])( - 'serializes %s results despite a bodyless helper status', - async (kind) => { - const cancel = vi.fn() - const source = new ReadableStream({ cancel }) - 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 callServerAction({ - request: new Request('http://localhost/_serverFn/test', { - method: 'POST', - headers: { 'x-tsr-serverFn': 'true' }, - }), - serverFnId: 'test', - }) - - // Serialized replies always carry a body for the client to decode. - expect(response.status).toBe(200) - expect(response.statusText).toBe('') - 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() - } - }, -) - -test('rejects excess RawStreams before starting their readers', async () => { - let pullCount = 0 - let cancelCount = 0 - const sources = Array.from( - { length: MAX_FRAMED_STREAMS + 1 }, - () => - new ReadableStream( - { - pull() { - pullCount++ - }, - cancel() { - cancelCount++ - }, - }, - { highWaterMark: 0 }, - ), - ) - mocks.action.mockResolvedValue({ - result: sources.map((source) => new RawStream(source)), - }) - const consoleInfo = vi.spyOn(console, 'info').mockImplementation(() => {}) - const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {}) - - try { - const response = await callServerAction({ - request: new Request('http://localhost/_serverFn/test', { - method: 'POST', - headers: { 'x-tsr-serverFn': 'true' }, - }), - serverFnId: 'test', - }) - - expect(response.headers.get('content-type')).toBe('application/json') - expect(pullCount).toBe(0) - expect(cancelCount).toBe(MAX_FRAMED_STREAMS + 1) - expect(sources.every((source) => !source.locked)).toBe(true) - } finally { - consoleInfo.mockRestore() - consoleError.mockRestore() - } -}) diff --git a/packages/start-server-core/tests/server-functions-reconciliation.test.ts b/packages/start-server-core/tests/server-functions-reconciliation.test.ts deleted file mode 100644 index a924fa96e4..0000000000 --- a/packages/start-server-core/tests/server-functions-reconciliation.test.ts +++ /dev/null @@ -1,1588 +0,0 @@ -// @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 b142331a03..ac28a482bf 100644 --- a/packages/start-server-core/tsconfig.json +++ b/packages/start-server-core/tsconfig.json @@ -9,7 +9,6 @@ "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 09e3bf9539..a445c8fa1c 100644 --- a/packages/start-server-core/vite.config.ts +++ b/packages/start-server-core/vite.config.ts @@ -48,7 +48,6 @@ 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 deleted file mode 100644 index e3152437cc..0000000000 --- a/packages/start-server-core/vitest.bench.config.ts +++ /dev/null @@ -1,17 +0,0 @@ -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 9e64280e30..b079e01743 100644 --- a/packages/start-static-server-functions/CHANGELOG.md +++ b/packages/start-static-server-functions/CHANGELOG.md @@ -1,126 +1,5 @@ # @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 - -- [#8297](https://github.com/TanStack/router/pull/8297) [`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f) - Update `seroval` and `seroval-plugins` from 1.6.2 to 1.6.7. This picks up the typed array length guard, the `maxBase64Length` and `compactArrayBufferViews` options, and the `isStream` export. - -- Updated dependencies [[`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f), [`76a7c0b`](https://github.com/TanStack/router/commit/76a7c0bfadb42d5f7fe7b9e1748acc7333178c91)]: - - @tanstack/start-client-core@1.170.33 - - @tanstack/react-start@1.168.59 - - @tanstack/solid-start@1.168.56 - -## 1.167.37 - -### Patch Changes - -- Updated dependencies []: - - @tanstack/start-client-core@1.170.32 - - @tanstack/react-start@1.168.56 - - @tanstack/solid-start@1.168.54 - -## 1.167.36 - -### Patch Changes - -- [#8204](https://github.com/TanStack/router/pull/8204) [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26) - Stream large deferred SSR hydration payloads through a backpressure-aware router transport, fail known setup errors before response creation, and close cancelled or expired transforms safely. - - Start now cancels discarded middleware and HEAD response bodies, including plain streams and derived branches. - - Server-function raw streams share one ordered response. Arbitrary or sequential consumption can require potentially unbounded buffering of unread data on the client. Cancelling one raw stream discards it locally, while aborting the whole call cancels the response and server work. Consume streams concurrently, cancel unused streams promptly, or use separate calls when independent backpressure is required. A raw stream that exceeds its unread-byte limit now fails alone; sibling streams and the JSON result keep flowing. - - The JSON wire shape of a `RawStream` server-function argument changed. Clients and servers must run matching versions for requests that pass a `RawStream`. - - The frame-protocol constants (`FRAME_TYPE_*`, `MAX_FRAME_PAYLOAD_SIZE`, `MAX_FRAMED_STREAMS`) moved from the `@tanstack/start-client-core` root to the `@tanstack/start-client-core/client-rpc` subpath. - - Router requests whose `Accept` header allows neither `text/html` nor `*/*` now receive `406 Not Acceptable` instead of `500`. - - Framework adapters share the body `` composition (`getSsrBodyScriptParts`, `composeSsrBodyScripts`) and the eager HTML response wrapper (`renderSsrHtmlResponse`) from `@tanstack/router-core`. - - Solid SSR now emits one document type and renders late lazy errors through route boundaries. A Solid `` without a `fallback` no longer holds the streamed shell; it renders inside the nearest `` boundary like React and Vue, and now renders falsy resolved values. - - Static server functions decode cached `RawStream` values with the client deserializer plugins. - - SSR Query integrations now keep request cleanup and stream ownership aligned with the router lifecycle. - -- Updated dependencies [[`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26)]: - - @tanstack/start-client-core@1.170.31 - - @tanstack/react-start@1.168.55 - - @tanstack/solid-start@1.168.53 - -## 1.167.35 - -### Patch Changes - -- Updated dependencies []: - - @tanstack/start-client-core@1.170.30 - - @tanstack/react-start@1.168.53 - - @tanstack/solid-start@1.168.51 - -## 1.167.34 - -### Patch Changes - -- Updated dependencies []: - - @tanstack/start-client-core@1.170.29 - - @tanstack/react-start@1.168.51 - - @tanstack/solid-start@1.168.49 - ## 1.167.33 ### Patch Changes diff --git a/packages/start-static-server-functions/package.json b/packages/start-static-server-functions/package.json index 603d7524fb..9cc264d238 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.44", + "version": "1.167.33", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", @@ -60,7 +60,7 @@ }, "dependencies": { "@tanstack/start-client-core": "workspace:*", - "seroval": "^1.6.7" + "seroval": "^1.6.2" }, "devDependencies": { "vite": "*", diff --git a/packages/start-static-server-functions/src/staticFunctionMiddleware.ts b/packages/start-static-server-functions/src/staticFunctionMiddleware.ts index ff20ab1ba2..e6681fce1d 100644 --- a/packages/start-static-server-functions/src/staticFunctionMiddleware.ts +++ b/packages/start-static-server-functions/src/staticFunctionMiddleware.ts @@ -2,9 +2,7 @@ import fs from 'node:fs/promises' import path from 'node:path' import { createMiddleware, - defaultSerovalDeserializerPlugins, getDefaultSerovalPlugins, - getSerovalPlugins, } from '@tanstack/start-client-core' import { fromJSON, toJSONAsync } from 'seroval' @@ -71,6 +69,9 @@ const jsonToFilenameSafeString = (json: any) => { .replace(/\s+/g, '_') // Optionally replace whitespace with underscores } +const staticClientCache = + typeof document !== 'undefined' ? new Map() : null + async function addItemToCache({ functionId, data, @@ -80,25 +81,27 @@ async function addItemToCache({ data: any response: StaticCachedResult }): Promise { - const hash = jsonToFilenameSafeString(data) - const url = await getStaticCacheUrl({ functionId, hash }) - const clientUrl = process.env.TSS_CLIENT_OUTPUT_DIR! - const filePath = path.join(clientUrl, url) + { + const hash = jsonToFilenameSafeString(data) + const url = await getStaticCacheUrl({ functionId, hash }) + const clientUrl = process.env.TSS_CLIENT_OUTPUT_DIR! + const filePath = path.join(clientUrl, url) - // Ensure the directory exists - await fs.mkdir(path.dirname(filePath), { recursive: true }) + // Ensure the directory exists + await fs.mkdir(path.dirname(filePath), { recursive: true }) - // Store the result with fs - const stringifiedResult = JSON.stringify( - await toJSONAsync( - { - result: response.result, - context: response.context.sendContext, - }, - { plugins: getDefaultSerovalPlugins() }, - ), - ) - await fs.writeFile(filePath, stringifiedResult, 'utf-8') + // Store the result with fs + const stringifiedResult = JSON.stringify( + await toJSONAsync( + { + result: response.result, + context: response.context.sendContext, + }, + { plugins: getDefaultSerovalPlugins() }, + ), + ) + await fs.writeFile(filePath, stringifiedResult, 'utf-8') + } } const fetchItem = async ({ @@ -111,16 +114,15 @@ const fetchItem = async ({ const hash = jsonToFilenameSafeString(data) const url = await getStaticCacheUrl({ functionId, hash }) - return fetch(url, { + let result: any = staticClientCache?.get(url) + + result = await fetch(url, { method: 'GET', }) .then((r) => r.json()) - .then((d) => - fromJSON(d, { - // Cached responses may carry RawStream nodes. - plugins: getSerovalPlugins(defaultSerovalDeserializerPlugins), - }), - ) + .then((d) => fromJSON(d, { plugins: getDefaultSerovalPlugins() })) + + return result } export const staticFunctionMiddleware = createMiddleware({ type: 'function' }) diff --git a/packages/start-storage-context/CHANGELOG.md b/packages/start-storage-context/CHANGELOG.md index c8669ed975..a423c12423 100644 --- a/packages/start-storage-context/CHANGELOG.md +++ b/packages/start-storage-context/CHANGELOG.md @@ -1,88 +1,5 @@ # @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 - -- Updated dependencies [[`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f), [`0c1b5e3`](https://github.com/TanStack/router/commit/0c1b5e38de71b7e81bbf1fd81c73ee0cd68ffe47), [`3cdd1af`](https://github.com/TanStack/router/commit/3cdd1af04b3e2d6f777797ee7bddf285318dd9d2)]: - - @tanstack/router-core@1.171.33 - -## 1.167.34 - -### Patch Changes - -- Updated dependencies [[`cecae54`](https://github.com/TanStack/router/commit/cecae5440b8edaea77c5448fe3d74bbd20fe10a4), [`0103578`](https://github.com/TanStack/router/commit/01035782e53af9b929c784b94ddd64b95efb89c7), [`ce10dcd`](https://github.com/TanStack/router/commit/ce10dcd4d9d3d23738744e453205aad5c6dbd716), [`84936cc`](https://github.com/TanStack/router/commit/84936cc04530bba11059c57b293a794922bbc5aa), [`bbd2336`](https://github.com/TanStack/router/commit/bbd2336b8446de3f7dd85070895e7cf43980183e)]: - - @tanstack/router-core@1.171.32 - -## 1.167.33 - -### Patch Changes - -- Updated dependencies [[`bc80866`](https://github.com/TanStack/router/commit/bc80866f6d6eb3e6f152ee3682eb783c96403e83), [`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a0b2ad9`](https://github.com/TanStack/router/commit/a0b2ad99aee64af08d16b0e4ff26b3ba42a99f0a), [`1ca361b`](https://github.com/TanStack/router/commit/1ca361ba52a627d2f76ab33323bd83d1d0aa65a3)]: - - @tanstack/router-core@1.171.31 - -## 1.167.32 - -### Patch Changes - -- Updated dependencies [[`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5), [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef)]: - - @tanstack/router-core@1.171.30 - -## 1.167.31 - -### Patch Changes - -- Updated dependencies [[`f9836f1`](https://github.com/TanStack/router/commit/f9836f16f0e25b0a8495f5e01e3f303b1cbc8725), [`9c1871c`](https://github.com/TanStack/router/commit/9c1871ccc88bc1157186b8b460941a304ec740b8), [`9871c06`](https://github.com/TanStack/router/commit/9871c0625806001d6bf373524821a00303438a91), [`0654c0a`](https://github.com/TanStack/router/commit/0654c0a1a427db24d9af13c1d6ad1217a588c0c9)]: - - @tanstack/router-core@1.171.29 - ## 1.167.30 ### Patch Changes diff --git a/packages/start-storage-context/package.json b/packages/start-storage-context/package.json index 083facb749..73073cdf44 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.41", + "version": "1.167.30", "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 bbde704629..21aabd6cdf 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 function runWithStartContext( +export async function runWithStartContext( context: StartStorageContext, - fn: () => T, -): T { + fn: () => T | Promise, +): Promise { return startStorage.run(context, fn) } diff --git a/packages/valibot-adapter/tests/index.test.tsx b/packages/valibot-adapter/tests/index.test.tsx index b59c29d075..327de3093e 100644 --- a/packages/valibot-adapter/tests/index.test.tsx +++ b/packages/valibot-adapter/tests/index.test.tsx @@ -9,6 +9,7 @@ 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 deleted file mode 100644 index 8f7cbf15be..0000000000 --- a/packages/valibot-adapter/tests/jest-dom.setup.ts +++ /dev/null @@ -1,18 +0,0 @@ -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 8d553e0a59..8c8c0c519f 100644 --- a/packages/valibot-adapter/vite.config.ts +++ b/packages/valibot-adapter/vite.config.ts @@ -9,7 +9,6 @@ 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 ff72e56c32..4e20f51a13 100644 --- a/packages/vue-router-devtools/CHANGELOG.md +++ b/packages/vue-router-devtools/CHANGELOG.md @@ -1,21 +1,5 @@ # @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 - -- Updated dependencies [[`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`cb8749e`](https://github.com/TanStack/router/commit/cb8749e9fcd32d2290bf6c957b2701c3c0a14da5), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5), [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef)]: - - @tanstack/router-core@1.171.30 - - @tanstack/vue-router@1.170.33 - - @tanstack/router-devtools-core@1.168.2 - ## 1.167.1 ### Patch Changes diff --git a/packages/vue-router-devtools/package.json b/packages/vue-router-devtools/package.json index 411dd289be..8310965e0c 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.3", + "version": "1.167.1", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/vue-router-ssr-query/CHANGELOG.md b/packages/vue-router-ssr-query/CHANGELOG.md index a85b193dd8..da87eb506a 100644 --- a/packages/vue-router-ssr-query/CHANGELOG.md +++ b/packages/vue-router-ssr-query/CHANGELOG.md @@ -1,32 +1,5 @@ # @tanstack/vue-router-ssr-query -## 1.167.3 - -### Patch Changes - -- [#8204](https://github.com/TanStack/router/pull/8204) [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26) - Stream large deferred SSR hydration payloads through a backpressure-aware router transport, fail known setup errors before response creation, and close cancelled or expired transforms safely. - - Start now cancels discarded middleware and HEAD response bodies, including plain streams and derived branches. - - Server-function raw streams share one ordered response. Arbitrary or sequential consumption can require potentially unbounded buffering of unread data on the client. Cancelling one raw stream discards it locally, while aborting the whole call cancels the response and server work. Consume streams concurrently, cancel unused streams promptly, or use separate calls when independent backpressure is required. A raw stream that exceeds its unread-byte limit now fails alone; sibling streams and the JSON result keep flowing. - - The JSON wire shape of a `RawStream` server-function argument changed. Clients and servers must run matching versions for requests that pass a `RawStream`. - - The frame-protocol constants (`FRAME_TYPE_*`, `MAX_FRAME_PAYLOAD_SIZE`, `MAX_FRAMED_STREAMS`) moved from the `@tanstack/start-client-core` root to the `@tanstack/start-client-core/client-rpc` subpath. - - Router requests whose `Accept` header allows neither `text/html` nor `*/*` now receive `406 Not Acceptable` instead of `500`. - - Framework adapters share the body `` composition (`getSsrBodyScriptParts`, `composeSsrBodyScripts`) and the eager HTML response wrapper (`renderSsrHtmlResponse`) from `@tanstack/router-core`. - - Solid SSR now emits one document type and renders late lazy errors through route boundaries. A Solid `` without a `fallback` no longer holds the streamed shell; it renders inside the nearest `` boundary like React and Vue, and now renders falsy resolved values. - - Static server functions decode cached `RawStream` values with the client deserializer plugins. - - SSR Query integrations now keep request cleanup and stream ownership aligned with the router lifecycle. - -- Updated dependencies [[`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26)]: - - @tanstack/router-ssr-query-core@1.169.3 - ## 1.167.2 ### Patch Changes diff --git a/packages/vue-router-ssr-query/package.json b/packages/vue-router-ssr-query/package.json index 73e6dd1cc3..ff50d275fa 100644 --- a/packages/vue-router-ssr-query/package.json +++ b/packages/vue-router-ssr-query/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-router-ssr-query", - "version": "1.167.3", + "version": "1.167.2", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", @@ -75,7 +75,7 @@ "peerDependencies": { "@tanstack/query-core": ">=5.102.0", "@tanstack/vue-query": ">=5.102.0", - "@tanstack/vue-router": ">=1.170.30", + "@tanstack/vue-router": ">=1.127.0", "vue": "^3.3.0" } } diff --git a/packages/vue-router-ssr-query/src/index.tsx b/packages/vue-router-ssr-query/src/index.tsx index 42a97b7df1..c9b666acad 100644 --- a/packages/vue-router-ssr-query/src/index.tsx +++ b/packages/vue-router-ssr-query/src/index.tsx @@ -31,13 +31,6 @@ export function setupRouterSsrQueryIntegration( if (OGWrap) { return Vue.h(OGWrap, null, () => children) } - - // Returning the slot array creates an implicit Vue Fragment around the - // document. Preserve its sole VNode so `` remains the outer root. - if (children?.length === 1) { - return children[0] - } - return children } }, diff --git a/packages/vue-router/CHANGELOG.md b/packages/vue-router/CHANGELOG.md index a9cdeb2b70..862643140b 100644 --- a/packages/vue-router/CHANGELOG.md +++ b/packages/vue-router/CHANGELOG.md @@ -1,147 +1,5 @@ # @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 - -- [#8436](https://github.com/TanStack/router/pull/8436) [`f5ffd38`](https://github.com/TanStack/router/commit/f5ffd3884ba26778a2a8ce53b379a5bded231676) - Skip unused Link preload cleanup when preloading is disabled and ignore queued viewport notifications after their effect has been cleaned up. - -- Updated dependencies [[`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f), [`0c1b5e3`](https://github.com/TanStack/router/commit/0c1b5e38de71b7e81bbf1fd81c73ee0cd68ffe47), [`3cdd1af`](https://github.com/TanStack/router/commit/3cdd1af04b3e2d6f777797ee7bddf285318dd9d2)]: - - @tanstack/router-core@1.171.33 - -## 1.170.35 - -### Patch Changes - -- Updated dependencies [[`cecae54`](https://github.com/TanStack/router/commit/cecae5440b8edaea77c5448fe3d74bbd20fe10a4), [`0103578`](https://github.com/TanStack/router/commit/01035782e53af9b929c784b94ddd64b95efb89c7), [`ce10dcd`](https://github.com/TanStack/router/commit/ce10dcd4d9d3d23738744e453205aad5c6dbd716), [`84936cc`](https://github.com/TanStack/router/commit/84936cc04530bba11059c57b293a794922bbc5aa), [`bbd2336`](https://github.com/TanStack/router/commit/bbd2336b8446de3f7dd85070895e7cf43980183e)]: - - @tanstack/router-core@1.171.32 - -## 1.170.34 - -### Patch Changes - -- [#8418](https://github.com/TanStack/router/pull/8418) [`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387) - `deepEqual` now takes its flags as positional arguments — `deepEqual(a, b, partial?, explicitUndefined?)` — instead of an options object. The router's hot callers (Link option stabilization and active-state checks, `matchRoute`) no longer allocate an options object per comparison, and the comparator reads two booleans instead of a polymorphic object. `explicitUndefined` replaces `ignoreUndefined: false`. `deepEqual` is an internal helper; it stays exported for compatibility of two-argument calls. - -- [#8419](https://github.com/TanStack/router/pull/8419) [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd) - `resolvePath` (internal helper) now takes positional arguments — `resolvePath(base, to, trailingSlash?, cache?)` — so `buildLocation` and `matchRoute` no longer allocate an options object per path resolution. - -- [#8204](https://github.com/TanStack/router/pull/8204) [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26) - Stream large deferred SSR hydration payloads through a backpressure-aware router transport, fail known setup errors before response creation, and close cancelled or expired transforms safely. - - Start now cancels discarded middleware and HEAD response bodies, including plain streams and derived branches. - - Server-function raw streams share one ordered response. Arbitrary or sequential consumption can require potentially unbounded buffering of unread data on the client. Cancelling one raw stream discards it locally, while aborting the whole call cancels the response and server work. Consume streams concurrently, cancel unused streams promptly, or use separate calls when independent backpressure is required. A raw stream that exceeds its unread-byte limit now fails alone; sibling streams and the JSON result keep flowing. - - The JSON wire shape of a `RawStream` server-function argument changed. Clients and servers must run matching versions for requests that pass a `RawStream`. - - The frame-protocol constants (`FRAME_TYPE_*`, `MAX_FRAME_PAYLOAD_SIZE`, `MAX_FRAMED_STREAMS`) moved from the `@tanstack/start-client-core` root to the `@tanstack/start-client-core/client-rpc` subpath. - - Router requests whose `Accept` header allows neither `text/html` nor `*/*` now receive `406 Not Acceptable` instead of `500`. - - Framework adapters share the body `` composition (`getSsrBodyScriptParts`, `composeSsrBodyScripts`) and the eager HTML response wrapper (`renderSsrHtmlResponse`) from `@tanstack/router-core`. - - Solid SSR now emits one document type and renders late lazy errors through route boundaries. A Solid `` without a `fallback` no longer holds the streamed shell; it renders inside the nearest `` boundary like React and Vue, and now renders falsy resolved values. - - Static server functions decode cached `RawStream` values with the client deserializer plugins. - - SSR Query integrations now keep request cleanup and stream ownership aligned with the router lifecycle. - -- Updated dependencies [[`bc80866`](https://github.com/TanStack/router/commit/bc80866f6d6eb3e6f152ee3682eb783c96403e83), [`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a0b2ad9`](https://github.com/TanStack/router/commit/a0b2ad99aee64af08d16b0e4ff26b3ba42a99f0a), [`1ca361b`](https://github.com/TanStack/router/commit/1ca361ba52a627d2f76ab33323bd83d1d0aa65a3)]: - - @tanstack/router-core@1.171.31 - -## 1.170.33 - -### Patch Changes - -- [#8326](https://github.com/TanStack/router/pull/8326) [`cb8749e`](https://github.com/TanStack/router/commit/cb8749e9fcd32d2290bf6c957b2701c3c0a14da5) - Remove an unnecessary match Fragment to reduce VNode allocation and transient JIT compilation memory while preserving route content and scroll restoration. - -- [#8318](https://github.com/TanStack/router/pull/8318) [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8) - Allow active and inactive Link props to override base element props in React and Solid while preserving class/style merging. Keep React's `href`, `target`, and `disabled` values controlled by routing options. Preserve Vue object and nested-array class bindings, including reactive updates and server rendering, without mutating cached bindings during VNode normalization. - -- [#8327](https://github.com/TanStack/router/pull/8327) [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef) - Make `pathParamsAllowedCharacters` initialization-only. Configure it when creating the router; changing allowed characters requires a new router instance. Remove decoder-update bookkeeping and decoder-change checks from route-owned path caches. - -- [#8370](https://github.com/TanStack/router/pull/8370) [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5) - Stop exporting the internal `isPlainObject` and `isPlainArray` helpers. - -- [#8318](https://github.com/TanStack/router/pull/8318) [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8) - Reduce Link bundle size by sharing exact/fuzzy active-path checks and resolving only the selected active or inactive props. Avoid unnecessary class/style allocations while preserving reactive style updates, server rendering, and each framework's prop-override behavior. - -- Updated dependencies [[`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`8fff7fa`](https://github.com/TanStack/router/commit/8fff7fa1f2e6f061916b0bf5e0ec486b2e732f94), [`f021f6d`](https://github.com/TanStack/router/commit/f021f6d1c6dce6c9b54d70766f1d636d8fd9e184), [`ae68535`](https://github.com/TanStack/router/commit/ae68535929043607d4ee9438f8ae401f3a064862), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5), [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef)]: - - @tanstack/router-core@1.171.30 - - @tanstack/history@1.162.4 - -## 1.170.32 - -### Patch Changes - -- [#7824](https://github.com/TanStack/router/pull/7824) [`8c43c71`](https://github.com/TanStack/router/commit/8c43c712523fc63dc3a814f3a19617e270ce8ed1) - Upgrade TanStack Store to 0.11 and migrate router subscriptions to useSelector, preserving selector comparisons and Vue subscription cleanup. - -## 1.170.31 - -### Patch Changes - -- [#8308](https://github.com/TanStack/router/pull/8308) [`9c1871c`](https://github.com/TanStack/router/commit/9c1871ccc88bc1157186b8b460941a304ec740b8) - Validate navigation and redirect destinations, keep ambiguous relative URLs on the current origin, and constrain prerender requests and output paths. Prevent redirect headers from appearing in serialized server function response bodies. - - Preserve native form HTTP redirects, route error handling and masks for document redirects, and per-navigation destinations for shared loader redirects. Avoid redundant origin parsing and reduce link styling and server-rendering work. Configured origins must already be normalized. - - Keep blocked-link inactive props consistent during React hydration, honor explicit redirect Location headers before checking route options, and refresh Vue link state when destinations become internal. Reuse the protocol-relative URL check while parsing redirect schemes once. - - Reduce React link bundle size by sharing pathname comparisons, state-prop selection, and element creation. - - Share normalized pathname comparisons in Solid and Vue links to reduce bundle size. - -- Updated dependencies [[`f9836f1`](https://github.com/TanStack/router/commit/f9836f16f0e25b0a8495f5e01e3f303b1cbc8725), [`9c1871c`](https://github.com/TanStack/router/commit/9c1871ccc88bc1157186b8b460941a304ec740b8), [`9871c06`](https://github.com/TanStack/router/commit/9871c0625806001d6bf373524821a00303438a91), [`0654c0a`](https://github.com/TanStack/router/commit/0654c0a1a427db24d9af13c1d6ad1217a588c0c9)]: - - @tanstack/router-core@1.171.29 - - @tanstack/history@1.162.3 - ## 1.170.30 ### Patch Changes diff --git a/packages/vue-router/package.json b/packages/vue-router/package.json index 93ae8fdeed..c14ea9a242 100644 --- a/packages/vue-router/package.json +++ b/packages/vue-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-router", - "version": "1.170.42", + "version": "1.170.30", "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.2", + "@tanstack/vue-store": "^0.9.3", "@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 61c13bef1f..5fea4fef7a 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 `@tanstack/router-core#router-core` first for foundational concepts. +This skill builds on router-core. Read [router-core](../../../router-core/skills/router-core/SKILL.md) 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 -- `@tanstack/router-core#router-core` — all sub-skills for domain-specific patterns (search params, data loading, navigation, auth, SSR, etc.) +- [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.) diff --git a/packages/vue-router/src/Match.tsx b/packages/vue-router/src/Match.tsx index 0c3ff40f1d..56530bb38e 100644 --- a/packages/vue-router/src/Match.tsx +++ b/packages/vue-router/src/Match.tsx @@ -1,12 +1,12 @@ import * as Vue from 'vue' import { isNotFound, rootRouteId } from '@tanstack/router-core' import { isServer } from '@tanstack/router-core/isServer' -import { useSelector } from '@tanstack/vue-store' +import { useStore } from '@tanstack/vue-store' import { CatchBoundary } from './CatchBoundary' import { ClientOnly } from './ClientOnly' import { useRouter } from './useRouter' import { CatchNotFound } from './not-found' -import { provideLinkLocation, routeIdContext } from './matchContext' +import { routeIdContext } from './matchContext' import { renderRouteNotFound } from './renderRouteNotFound' import { ScrollRestoration } from './scroll-restoration' import { @@ -29,19 +29,14 @@ export const Match = Vue.defineComponent({ const routeId = props.routeId - const activeMatch = useSelector( + const activeMatch = useStore( router.stores.getMatchStore(routeId), (value) => value, - { compare: Object.is }, + { equal: Object.is }, ) // 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 @@ -134,9 +129,11 @@ export const Match = Vue.defineComponent({ return Vue.h(Vue.Fragment, null, [ content, - (isServer ?? router.isServer) && router.options.scrollRestoration - ? Vue.h(ScrollRestoration) - : null, + Vue.h(Vue.Fragment, null, [ + (isServer ?? router.isServer) && router.options.scrollRestoration + ? Vue.h(ScrollRestoration) + : null, + ]), ]) } @@ -161,7 +158,7 @@ export const MatchInner = Vue.defineComponent({ // Use routeId from context (provided by parent Match) — stable string. const routeId = Vue.inject(routeIdContext)! - const activeMatch = useSelector(router.stores.getMatchStore(routeId)) + const activeMatch = useStore(router.stores.getMatchStore(routeId)) // Combined selector for match state AND remount key // This ensures both are computed in the same selector call with consistent data @@ -298,11 +295,11 @@ export const Outlet = Vue.defineComponent({ const router = useRouter() const parentRouteId = Vue.inject(routeIdContext)! - const parentMatch = useSelector(router.stores.getMatchStore(parentRouteId)) + const parentMatch = useStore(router.stores.getMatchStore(parentRouteId)) const route = router.routesById[parentRouteId]! - const childRouteId = useSelector(router.stores.matches, (matches) => { + const childRouteId = useStore(router.stores.matches, (matches) => { const index = matches.findIndex( (match) => match.routeId === parentRouteId, ) diff --git a/packages/vue-router/src/Matches.tsx b/packages/vue-router/src/Matches.tsx index a22ec82e82..7edd5c7593 100644 --- a/packages/vue-router/src/Matches.tsx +++ b/packages/vue-router/src/Matches.tsx @@ -1,6 +1,6 @@ import * as Vue from 'vue' import { isServer } from '@tanstack/router-core/isServer' -import { useSelector } from '@tanstack/vue-store' +import { useStore } from '@tanstack/vue-store' import { CatchBoundary } from './CatchBoundary' import { useRouter } from './useRouter' import { useTransitionerSetup } from './Transitioner' @@ -91,7 +91,7 @@ const MatchesInner = Vue.defineComponent({ setup() { const router = useRouter() - const matches = useSelector(router.stores.matches) + const matches = useStore(router.stores.matches) const routeId = Vue.computed(() => matches.value[0]?.routeId) return () => { @@ -138,12 +138,12 @@ export type UseMatchRouteOptions< export function useMatchRoute() { const router = useRouter() - const location = useSelector(router.stores.location, (value) => value.href) - const resolvedLocation = useSelector( + const location = useStore(router.stores.location, (value) => value.href) + const resolvedLocation = useStore( router.stores.resolvedLocation, (value) => value?.href, ) - const status = useSelector(router.stores.status) + const status = useStore(router.stores.status) return < const TFrom extends string = string, @@ -276,7 +276,7 @@ export function useMatches< opts?: UseMatchesBaseOptions, ): Vue.Ref> { const router = useRouter() - return useSelector(router.stores.matches, (matches) => { + return useStore(router.stores.matches, (matches) => { return opts?.select ? opts.select(matches as Array>) : (matches as any) diff --git a/packages/vue-router/src/RouterProvider.tsx b/packages/vue-router/src/RouterProvider.tsx index 874a24fef0..32222237e5 100644 --- a/packages/vue-router/src/RouterProvider.tsx +++ b/packages/vue-router/src/RouterProvider.tsx @@ -1,8 +1,6 @@ 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, @@ -25,10 +23,6 @@ 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 @@ -111,7 +105,7 @@ export type RouterProps< TRouter['history'], TDehydrated >, - 'context' | 'pathParamsAllowedCharacters' + 'context' > & { router: TRouter context?: Partial< diff --git a/packages/vue-router/src/Scripts.tsx b/packages/vue-router/src/Scripts.tsx index 729441d28c..4c0d8feed0 100644 --- a/packages/vue-router/src/Scripts.tsx +++ b/packages/vue-router/src/Scripts.tsx @@ -1,28 +1,44 @@ import * as Vue from 'vue' -import { - composeSsrBodyScripts, - getSsrBodyScriptParts, -} from '@tanstack/router-core' +import { _getAssetMatches } from '@tanstack/router-core' +import { useStore } from '@tanstack/vue-store' import { isServer } from '@tanstack/router-core/isServer' -import { useSelector } from '@tanstack/vue-store' import { Asset } from './Asset' import { useRouter } from './useRouter' import type { RouterManagedTag } from '@tanstack/router-core' -/** - * During streaming SSR, `` marks where late hydration scripts may - * begin to be inserted. - */ export const Scripts = Vue.defineComponent({ name: 'Scripts', setup() { const router = useRouter() const nonce = router.options.ssr?.nonce - const matches = useSelector(router.stores.matches, (value) => value) + const matches = useStore(router.stores.matches, _getAssetMatches) - const scripts = Vue.computed(() => - getSsrBodyScriptParts(matches.value, router.ssr?.manifest, nonce), - ) + const scripts = Vue.computed(() => { + const userScripts: Array = [] + const assetScripts: Array = [] + const manifest = router.ssr?.manifest + for (const match of matches.value) { + for (const script of match.scripts ?? []) { + if (!script) { + continue + } + const { children, ...attrs } = script + userScripts.push({ + tag: 'script', + attrs: { ...attrs, nonce }, + children, + }) + } + for (const asset of manifest?.routes[match.routeId]?.scripts ?? []) { + assetScripts.push({ + tag: 'script', + attrs: { ...asset.attrs, nonce }, + children: asset.children, + }) + } + } + return [userScripts, assetScripts] as const + }) const mounted = Vue.ref(false) Vue.onMounted(() => { @@ -37,21 +53,20 @@ export const Scripts = Vue.defineComponent({ function renderScripts( router: ReturnType, - scriptParts: ReturnType, + [scripts, assetScripts]: readonly [ + Array, + Array, + ], mounted: boolean, nonce?: string, ) { const allScripts: Array = [] - let streamBoundary: RouterManagedTag | undefined - const [scripts, assetScripts] = scriptParts if ((isServer ?? router.isServer) && router.serverSsr) { - const initialHydrationScripts = - router.serverSsr.takeInitialHydrationScriptTags() - allScripts.push( - ...composeSsrBodyScripts(scriptParts, initialHydrationScripts), - ) - return renderScriptTags(allScripts) + const serverBufferedScript = router.serverSsr.takeBufferedScripts() + if (serverBufferedScript) { + allScripts.push(serverBufferedScript) + } } else if (router.ssr && !mounted) { allScripts.push({ tag: 'script', @@ -59,14 +74,15 @@ function renderScripts( children: '', } satisfies RouterManagedTag) - streamBoundary = { + allScripts.push({ tag: 'script', attrs: { nonce, + id: '$tsr-stream-barrier', 'data-allow-mismatch': true, }, children: '', - } satisfies RouterManagedTag + } satisfies RouterManagedTag) for (const asset of assetScripts) { allScripts.push({ @@ -82,18 +98,10 @@ function renderScripts( allScripts.push(...scripts) - if (mounted) { + if (mounted || ((isServer ?? router.isServer) && router.serverSsr)) { allScripts.push(...assetScripts) } - if (streamBoundary) { - allScripts.push(streamBoundary) - } - - return renderScriptTags(allScripts) -} - -function renderScriptTags(allScripts: Array) { return ( <> {allScripts.map((asset, i) => ( diff --git a/packages/vue-router/src/headContentUtils.tsx b/packages/vue-router/src/headContentUtils.tsx index b597d74c0c..adfc156c72 100644 --- a/packages/vue-router/src/headContentUtils.tsx +++ b/packages/vue-router/src/headContentUtils.tsx @@ -7,7 +7,7 @@ import { getScriptPreloadAttrs, resolveManifestCssLink, } from '@tanstack/router-core' -import { useSelector } from '@tanstack/vue-store' +import { useStore } from '@tanstack/vue-store' import { useRouter } from './useRouter' import type { AssetCrossOriginConfig, @@ -16,7 +16,7 @@ import type { export const useTags = (assetCrossOrigin?: AssetCrossOriginConfig) => { const router = useRouter() - const matches = useSelector(router.stores.matches, _getAssetMatches) + const matches = useStore(router.stores.matches, _getAssetMatches) const tags = Vue.computed>(() => { const currentMatches = matches.value diff --git a/packages/vue-router/src/index.tsx b/packages/vue-router/src/index.tsx index f63a763e25..2e14e349f0 100644 --- a/packages/vue-router/src/index.tsx +++ b/packages/vue-router/src/index.tsx @@ -15,6 +15,8 @@ export { stringifySearchWith, functionalUpdate, replaceEqualDeep, + isPlainObject, + isPlainArray, deepEqual, createControlledPromise, retainSearchParams, @@ -197,6 +199,7 @@ export type { RegisteredRouter, RouterContextOptions, ControllablePromise, + InjectedHtmlEntry, RouterOptions, RouterState, ListenerFn, diff --git a/packages/vue-router/src/link.tsx b/packages/vue-router/src/link.tsx index 34666743e3..c54fc2db06 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 { useStore } from '@tanstack/vue-store' import { useRouter } from './useRouter' -import { linkLocationContext } from './matchContext' import { useIntersectionObserver } from './utils' import type { @@ -29,6 +29,8 @@ import type { type EventHandler = (e: TEvent) => void +const timeoutMap = new WeakMap>() + type DataAttributes = { [K in `data-${string}`]?: unknown } @@ -108,16 +110,18 @@ function useLinkPropsImpl( // Ensure router is defined before proceeding if (!router) { console.warn('useRouter must be used inside a component!') - return {} + return Vue.computed(() => ({})) as unknown as LinkHTMLAttributes } + 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.shallowRef( - getExternalLinkProps(options, router), + return Vue.ref( + getExternalLinkProps(options, router, ref), ) as unknown as LinkHTMLAttributes } @@ -134,180 +138,177 @@ function useLinkPropsImpl( router, ) - const { resolvedProps, resolvedClass, resolvedStyle } = resolveStyleProps( - options, - isActive, - ) + const { + resolvedActiveProps, + resolvedInactiveProps, + resolvedClassName, + resolvedStyle, + } = resolveStyleProps(options, isActive) const result = combineResultProps({ href, options, isActive, - resolvedProps, - resolvedClass, + resolvedActiveProps, + resolvedInactiveProps, + resolvedClassName, resolvedStyle, }) - return Vue.shallowRef( + return Vue.ref( result as LinkHTMLAttributes, ) as unknown as LinkHTMLAttributes } - const ref = Vue.ref(null) + // 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 isExternal = () => !!getUrlScheme(`${getOptions().to}`) + const currentLocation: Vue.Ref< + ReturnType + > = isExternal.value + ? Vue.shallowRef(router.stores.location.get()) + : (useStore(router.stores.location, (l) => l, { + equal: (prev, next) => prev.href === next.href, + }) as Vue.Ref>) - // 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 + // Links that start external skip useStore above. Subscribe if they later + // become internal so active state follows subsequent location changes. + if (isExternal.value) { + Vue.watchEffect((onCleanup) => { + if (isExternal.value) { + return } - same &&= prev![key] === value - } - return same ? prev! : dest - }) - // 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 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()) }) } - let pendingPreload: 'intent' | 'viewport' | undefined - let preloadTimeout: ReturnType | undefined - const cancelPreload = () => { - clearTimeout(preloadTimeout) - preloadTimeout = pendingPreload = undefined + 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 + const enqueuePreload = ( e?: MouseEvent | FocusEvent | IntersectionObserverEntry, ) => { if (!e) { - cancelPreload() + clearTimeout(timeoutMap.get(ref)) + timeoutMap.delete(ref) + pendingPreload = undefined return } const isIntersecting = (e as IntersectionObserverEntry).isIntersecting const preloadMode = isIntersecting === undefined ? 'intent' : 'viewport' - if (preload() !== preloadMode || isIntersecting === false) { + if (preload.value !== preloadMode || isIntersecting === false) { if (isIntersecting === false && pendingPreload === 'viewport') { - cancelPreload() + clearTimeout(timeoutMap.get(ref)) + timeoutMap.delete(ref) + pendingPreload = undefined } return } - if (!preloadDelay()) { + if (!preloadDelay.value) { doPreload() return } - if (!preloadTimeout) { - const scheduledHref = state.value[0 /* href */] + if (!timeoutMap.has(ref)) { + const scheduledHref = next.value.href pendingPreload = preloadMode - preloadTimeout = setTimeout(() => { - preloadTimeout = pendingPreload = undefined - if ( - preload() === preloadMode && - state.value[0 /* href */] === scheduledHref - ) { - doPreload() - } - }, preloadDelay()) + timeoutMap.set( + ref, + setTimeout(() => { + timeoutMap.delete(ref) + pendingPreload = undefined + if ( + preload.value === preloadMode && + next.value.href === scheduledHref + ) { + doPreload() + } + }, preloadDelay.value), + ) } } useIntersectionObserver( ref, enqueuePreload, - () => preloadMode.value !== 'viewport', - // Intent preloading still needs timer cleanup without an observer. - () => !!preloadMode.value, + () => preload.value !== 'viewport', ) Vue.watchEffect(() => { - if (preloadMode.value !== 'render' || !preload()) { + if (preload.value !== 'render') { return } - const nextHref = state.value[0 /* href */] + const nextHref = next.value.href if (nextHref && renderFetchedHref !== nextHref) { renderFetchedHref = nextHref doPreload() @@ -317,8 +318,11 @@ function useLinkPropsImpl( // The click handler const handleClick = (e: PointerEvent): void => { const options = getOptions() - const href = !isExternal() && state.value[0 /* href */] - if (!options.disabled && (!href || getUrlScheme(href))) { + if ( + isExternal.value || + (!options.disabled && + (href.value === undefined || !!getUrlScheme(href.value))) + ) { return } @@ -342,22 +346,31 @@ function useLinkPropsImpl( } e.preventDefault() - enqueuePreload() // All is well? Navigate! - router.navigate(navigateOptions()) + router.navigate({ + ...options, + replace: options.replace, + resetScroll: options.resetScroll, + hashScrollIntoView: options.hashScrollIntoView, + startTransition: options.startTransition, + viewTransition: options.viewTransition, + ignoreBlocker: options.ignoreBlocker, + }) } } const handleTouchStart = () => { - if (preload() === 'intent') { + if (preload.value === 'intent') { doPreload() } } const handleLeave = () => { if (pendingPreload === 'intent') { - cancelPreload() + clearTimeout(timeoutMap.get(ref)) + timeoutMap.delete(ref) + pendingPreload = undefined } } @@ -371,6 +384,12 @@ 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), @@ -402,23 +421,25 @@ function useLinkPropsImpl( // Using Vue.computed ensures props are calculated at render time, not after const computedProps = Vue.computed(() => { const options = getOptions() - if (isExternal()) { + if (isExternal.value) { return getExternalLinkProps(options, router, ref, staticEventHandlers) } - const [href, isActive] = state.value - const { resolvedProps, resolvedClass, resolvedStyle } = resolveStyleProps( - options, - isActive, - ) + const { + resolvedActiveProps, + resolvedInactiveProps, + resolvedClassName, + resolvedStyle, + } = resolvedStyleProps.value return combineResultProps({ - href, + href: href.value, options, ref, staticEventHandlers, - isActive, - resolvedProps, - resolvedClass, + isActive: isActive.value, + resolvedActiveProps, + resolvedInactiveProps, + resolvedClassName, resolvedStyle, }) }) @@ -427,71 +448,60 @@ 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) || - (isActive ? STATIC_ACTIVE_PROPS : EMPTY_OBJECT) - const resolvedProps: StyledProps = - (typeof props === 'function' ? props() : props) || EMPTY_OBJECT - const baseClass = options.class - const stateClass = resolvedProps.class - const resolvedClass = baseClass - ? stateClass - ? [baseClass, stateClass] - : baseClass - : stateClass - ? stateClass - : undefined + const activeProps = options.activeProps || (() => ({ class: 'active' })) + const resolvedActiveProps: StyledProps = (isActive + ? typeof activeProps === 'function' + ? activeProps() + : activeProps + : {}) || { class: undefined, style: undefined } - const baseStyle = options.style - const stateStyle = resolvedProps.style - let resolvedStyle: Record | undefined - if (baseStyle || stateStyle) { - // Keep a snapshot of reactive styles rather than returning their proxy. - const style: Record = {} - Object.assign(style, baseStyle, stateStyle) - if (hasKeys(style)) { - resolvedStyle = style - } + const inactiveProps = options.inactiveProps || (() => ({})) + + const resolvedInactiveProps: StyledProps = (isActive + ? {} + : typeof inactiveProps === 'function' + ? inactiveProps() + : inactiveProps) || { class: undefined, style: undefined } + + const classes = [ + options.class, + resolvedActiveProps?.class, + resolvedInactiveProps?.class, + ].filter(Boolean) + const resolvedClassName = classes.length ? classes.join(' ') : undefined + + const result: Record = {} + + // Merge styles from all sources + if (options.style) { + Object.assign(result, options.style) } + + if (resolvedActiveProps?.style) { + Object.assign(result, resolvedActiveProps.style) + } + + if (resolvedInactiveProps?.style) { + Object.assign(result, resolvedInactiveProps.style) + } + + const resolvedStyle = hasKeys(result) ? result : undefined return { - resolvedProps, - resolvedClass, + resolvedActiveProps, + resolvedInactiveProps, + resolvedClassName, resolvedStyle, } } -const STATIC_ACTIVE_PROPS = { class: 'active' } -const EMPTY_OBJECT = {} - function combineResultProps({ href, options, isActive, - resolvedProps, - resolvedClass, + resolvedActiveProps, + resolvedInactiveProps, + resolvedClassName, resolvedStyle, ref, staticEventHandlers, @@ -500,8 +510,9 @@ function combineResultProps({ href: string | undefined options: AnyLinkPropsOptions isActive: boolean - resolvedProps: StyledProps - resolvedClass?: StyledProps['class'] + resolvedActiveProps: StyledProps + resolvedInactiveProps: StyledProps + resolvedClassName?: string resolvedStyle?: Record ref?: Vue.VNodeRef | undefined staticEventHandlers?: LinkEventHandlers @@ -519,8 +530,8 @@ function combineResultProps({ result.style = resolvedStyle } - if (resolvedClass) { - result.class = resolvedClass + if (resolvedClassName) { + result.class = resolvedClassName } if (disabled) { @@ -533,9 +544,15 @@ function combineResultProps({ result['aria-current'] = 'page' } - for (const key of Object.keys(resolvedProps)) { + for (const key of Object.keys(resolvedActiveProps)) { if (key !== 'class' && key !== 'style') { - result[key] = resolvedProps[key] + result[key] = resolvedActiveProps[key] + } + } + + for (const key of Object.keys(resolvedInactiveProps)) { + if (key !== 'class' && key !== 'style') { + result[key] = resolvedInactiveProps[key] } } @@ -546,7 +563,7 @@ function combineResultProps({ function getExternalLinkProps( options: AnyLinkPropsOptions, router: AnyRouter, - ref?: Vue.Ref, + ref: Vue.Ref, staticEventHandlers?: LinkEventHandlers, ): LinkHTMLAttributes { const dangerous = isDangerousProtocol( @@ -606,45 +623,56 @@ function getLinkEventHandlers( } } -// 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] - } + 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 } + return propsSafeToSpread } @@ -679,12 +707,10 @@ function getIsActive( } if (activeOptions?.includeSearch ?? true) { - const searchTest = deepEqual( - loc.search, - nextLoc.search, - !activeOptions?.exact, - activeOptions?.explicitUndefined, - ) + const searchTest = deepEqual(loc.search, nextLoc.search, { + partial: !activeOptions?.exact, + ignoreUndefined: !activeOptions?.explicitUndefined, + }) if (!searchTest) { return false } @@ -853,34 +879,6 @@ 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, @@ -911,12 +909,27 @@ const LinkImpl = Vue.defineComponent({ 'target', ], setup(props, { attrs, slots }) { - // The server renders once: read the props directly. - const linkPropsSource = useLinkPropsImpl( - (isServer ?? useRouter()?.isServer) - ? () => ({ ...props, ...attrs }) - : useLinkPropsSnapshot(props, attrs), - ) as LinkHTMLAttributes | Vue.ComputedRef + 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 return () => { const Component = props._asChild || 'a' @@ -946,8 +959,8 @@ const LinkImpl = Vue.defineComponent({ ) } - // Vue normalizes class bindings in place; preserve the cached bindings. - return Vue.h(Component, { ...linkProps }, slotContent) + // Return the component with props and children + return Vue.h(Component, linkProps, slotContent) } }, }) diff --git a/packages/vue-router/src/matchContext.tsx b/packages/vue-router/src/matchContext.tsx index d46757f443..01ed6d35de 100644 --- a/packages/vue-router/src/matchContext.tsx +++ b/packages/vue-router/src/matchContext.tsx @@ -1,7 +1,4 @@ -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' +import type { InjectionKey } from 'vue' // Stable routeId context — a plain string (not reactive) that identifies // which route this component belongs to. Provided by Match, consumed by @@ -9,31 +6,3 @@ import type { AnyRouter, ParsedLocation } from '@tanstack/router-core' 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/not-found.tsx b/packages/vue-router/src/not-found.tsx index 5a6b3c160d..05d9ab4c88 100644 --- a/packages/vue-router/src/not-found.tsx +++ b/packages/vue-router/src/not-found.tsx @@ -1,64 +1,55 @@ import * as Vue from 'vue' import { isNotFound } from '@tanstack/router-core' -import { useSelector } from '@tanstack/vue-store' +import { useStore } from '@tanstack/vue-store' import { CatchBoundary } from './CatchBoundary' import { useRouter } from './useRouter' import type { ErrorComponentProps, NotFoundError } from '@tanstack/router-core' -export const CatchNotFound = Vue.defineComponent({ - name: 'CatchNotFound', - inheritAttrs: false, - props: { - fallback: Function as Vue.PropType<(error: NotFoundError) => Vue.VNode>, - onCatch: Function as Vue.PropType<(error: NotFoundError) => void>, - children: { - type: Object as Vue.PropType, - required: true, - }, - }, - setup(props) { - const router = useRouter() - // TODO: Some way for the user to programmatically reset the not-found boundary? - const pathname = useSelector( - router.stores.location, - (location) => location.pathname, - ) - const status = useSelector(router.stores.status) +export function CatchNotFound(props: { + fallback?: (error: NotFoundError) => Vue.VNode + onCatch?: (error: NotFoundError) => void + children: Vue.VNode +}) { + const router = useRouter() + // TODO: Some way for the user to programmatically reset the not-found boundary? + const pathname = useStore( + router.stores.location, + (location) => location.pathname, + ) + const status = useStore(router.stores.status) - // Create a function that returns a VNode to match the SyncRouteComponent signature - const errorComponentFn = (componentProps: ErrorComponentProps) => { - const error = componentProps.error + // Create a function that returns a VNode to match the SyncRouteComponent signature + const errorComponentFn = (componentProps: ErrorComponentProps) => { + const error = componentProps.error + if (isNotFound(error)) { + // If a fallback is provided, use it + if (props.fallback) { + return props.fallback(error) + } + // Otherwise return a default not found message + return Vue.h('p', null, 'Not Found') + } else { + // Re-throw non-NotFound errors + throw error + } + } + + return Vue.h(CatchBoundary, { + getResetKey: () => `not-found-${pathname.value}-${status.value}`, + onCatch: (error: unknown) => { if (isNotFound(error)) { - // If a fallback is provided, use it - if (props.fallback) { - return props.fallback(error) + if (props.onCatch) { + props.onCatch(error) } - // Otherwise return a default not found message - return Vue.h('p', null, 'Not Found') } else { - // Re-throw non-NotFound errors throw error } - } - - return () => - Vue.h(CatchBoundary, { - getResetKey: () => `not-found-${pathname.value}-${status.value}`, - onCatch: (error: unknown) => { - if (isNotFound(error)) { - if (props.onCatch) { - props.onCatch(error) - } - } else { - throw error - } - }, - errorComponent: errorComponentFn, - children: props.children, - }) - }, -}) + }, + errorComponent: errorComponentFn, + children: props.children, + }) +} export const DefaultGlobalNotFound = Vue.defineComponent({ name: 'DefaultGlobalNotFound', diff --git a/packages/vue-router/src/route.ts b/packages/vue-router/src/route.ts index 7c931ecdf9..db9cd80a5c 100644 --- a/packages/vue-router/src/route.ts +++ b/packages/vue-router/src/route.ts @@ -51,7 +51,7 @@ import type { LinkComponentRoute } from './link' // Structural type for Vue SFC components (.vue files) // Uses structural matching to accept Vue components without breaking // TypeScript inference for inline function components -export type VueSFC = { +type VueSFC = { readonly __name?: string setup?: (...args: Array) => any render?: Function diff --git a/packages/vue-router/src/router.ts b/packages/vue-router/src/router.ts index b1f56cf929..27e7fbb891 100644 --- a/packages/vue-router/src/router.ts +++ b/packages/vue-router/src/router.ts @@ -11,7 +11,6 @@ import type { ErrorRouteComponent, NotFoundRouteComponent, RouteComponent, - VueSFC, } from './route' import type { VNode } from 'vue' @@ -23,7 +22,7 @@ declare module '@tanstack/router-core' { * @default Outlet * @link [API Docs](https://tanstack.com/router/latest/docs/framework/solid/api/router/RouterOptionsType#defaultcomponent-property) */ - defaultComponent?: RouteComponent | VueSFC + defaultComponent?: RouteComponent /** * The default `errorComponent` a route should use if no error component is provided. * @@ -31,14 +30,14 @@ declare module '@tanstack/router-core' { * @link [API Docs](https://tanstack.com/router/latest/docs/framework/solid/api/router/RouterOptionsType#defaulterrorcomponent-property) * @link [Guide](https://tanstack.com/router/latest/docs/framework/solid/guide/data-loading#handling-errors-with-routeoptionserrorcomponent) */ - defaultErrorComponent?: ErrorRouteComponent | VueSFC + defaultErrorComponent?: ErrorRouteComponent /** * The default `pendingComponent` a route should use if no pending component is provided. * * @link [API Docs](https://tanstack.com/router/latest/docs/framework/solid/api/router/RouterOptionsType#defaultpendingcomponent-property) * @link [Guide](https://tanstack.com/router/latest/docs/framework/solid/guide/data-loading#showing-a-pending-component) */ - defaultPendingComponent?: RouteComponent | VueSFC + defaultPendingComponent?: RouteComponent /** * The default `notFoundComponent` a route should use if no notFound component is provided. * @@ -46,7 +45,7 @@ declare module '@tanstack/router-core' { * @link [API Docs](https://tanstack.com/router/latest/docs/framework/solid/api/router/RouterOptionsType#defaultnotfoundcomponent-property) * @link [Guide](https://tanstack.com/router/latest/docs/framework/solid/guide/not-found-errors#default-router-wide-not-found-handling) */ - defaultNotFoundComponent?: NotFoundRouteComponent | VueSFC + defaultNotFoundComponent?: NotFoundRouteComponent /** * A component that will be used to wrap the entire router. * diff --git a/packages/vue-router/src/ssr/defaultStreamHandler.tsx b/packages/vue-router/src/ssr/defaultStreamHandler.tsx index 574a1edb66..5c663c8f5b 100644 --- a/packages/vue-router/src/ssr/defaultStreamHandler.tsx +++ b/packages/vue-router/src/ssr/defaultStreamHandler.tsx @@ -3,8 +3,8 @@ import { renderRouterToStream } from './renderRouterToStream' import { RouterServer } from './RouterServer' export const defaultStreamHandler = defineHandlerCallback( - ({ request, router, responseHeaders }) => - renderRouterToStream({ + async ({ request, router, responseHeaders }) => + await renderRouterToStream({ request, router, responseHeaders, diff --git a/packages/vue-router/src/ssr/renderRouterToStream.tsx b/packages/vue-router/src/ssr/renderRouterToStream.tsx index c48354546e..d352c52497 100644 --- a/packages/vue-router/src/ssr/renderRouterToStream.tsx +++ b/packages/vue-router/src/ssr/renderRouterToStream.tsx @@ -1,25 +1,66 @@ +import { ReadableStream as NodeReadableStream } from 'node:stream/web' import * as Vue from 'vue' -import { renderToString, renderToWebStream } from 'vue/server-renderer' +import { pipeToWebWritable, renderToString } from 'vue/server-renderer' import { isbot } from 'isbot' import { createSsrStreamResponse, - getSsrStatus, - transformHtmlStringWithRouter, transformReadableStreamWithRouter, - waitForRequest, } from '@tanstack/router-core/ssr/server' import type { AnyRouter } from '@tanstack/router-core' import type { Component } from 'vue' -const DOCTYPE = new TextEncoder().encode('') +const isAbortError = (request: Request, error: unknown) => + (request.signal.aborted && error === request.signal.reason) || + (error instanceof Error && error.name === 'AbortError') || + (error as any)?.code === 'ABORT_ERR' -/** The router transport needs `` as the outer root, not a fragment. */ -export function warnUnlessHtmlRoot(html: string) { - if (process.env.NODE_ENV !== 'production' && !html.startsWith(' as its outer element. A fragment or array root breaks streamed hydration scripts.', - ) +function prependDoctype( + readable: globalThis.ReadableStream, +): NodeReadableStream { + const encoder = new TextEncoder() + let sentDoctype = false + let reader: ReadableStreamDefaultReader | undefined + const releaseReader = () => { + try { + reader?.releaseLock() + } catch { + // ignore + } + reader = undefined } + + return new NodeReadableStream({ + start() { + reader = readable.getReader() + }, + async pull(controller) { + if (!sentDoctype) { + sentDoctype = true + controller.enqueue(encoder.encode('')) + return + } + try { + const { done, value } = await reader!.read() + if (done) { + controller.close() + releaseReader() + return + } + controller.enqueue(value) + } catch (err) { + controller.error(err) + releaseReader() + } + }, + async cancel(reason) { + try { + await reader?.cancel(reason) + } catch { + // ignore + } + releaseReader() + }, + }) } export const renderRouterToStream = async ({ @@ -33,47 +74,157 @@ export const renderRouterToStream = async ({ responseHeaders: Headers App: Component }) => { - const signal = request.signal - if (signal.aborted) { - router.serverSsr?.cleanup() - throw signal.reason - } + const app = Vue.createSSRApp(App, { router }) - try { - const app = Vue.createSSRApp(App, { router }) - - if (isbot(request.headers.get('User-Agent'))) { - let fullHtml = await waitForRequest(renderToString(app), signal) - warnUnlessHtmlRoot(fullHtml) - fullHtml = await transformHtmlStringWithRouter(router, fullHtml, { - signal, + if (isbot(request.headers.get('User-Agent'))) { + try { + let cleanupAbortListener: (() => void) | undefined + const abortPromise = new Promise((_, reject) => { + if (request.signal.aborted) { + reject(request.signal.reason) + return + } + const onRequestAbort = () => reject(request.signal.reason) + request.signal.addEventListener('abort', onRequestAbort, { once: true }) + cleanupAbortListener = () => { + request.signal.removeEventListener('abort', onRequestAbort) + } }) - return new Response(fullHtml, { - status: getSsrStatus(router), + + let fullHtml = await Promise.race([ + renderToString(app), + abortPromise, + ]).finally(() => cleanupAbortListener?.()) + + router.serverSsr!.setRenderFinished() + const injectedHtml = router.serverSsr!.takeBufferedHtml() + if (injectedHtml) { + fullHtml = fullHtml.replace(``, () => `${injectedHtml}`) + } + + const htmlOpenIndex = fullHtml.indexOf('') + + if (htmlOpenIndex !== -1 && htmlCloseIndex !== -1) { + fullHtml = fullHtml.slice(htmlOpenIndex, htmlCloseIndex + 7) + } else if (htmlOpenIndex !== -1) { + fullHtml = fullHtml.slice(htmlOpenIndex) + } + + return new Response(`${fullHtml}`, { + status: + router._serverResult?.type === 'render' + ? router._serverResult.status + : 200, headers: responseHeaders, }) + } finally { + router.serverSsr?.cleanup() + } + } + + const { writable, readable } = new TransformStream() + const innerWriter = writable.getWriter() + let writerDone = false + const releaseWriter = () => { + try { + innerWriter.releaseLock() + } catch { + // already released / errored + } + } + const abortVuePipe = (reason?: unknown) => { + if (writerDone) { + return } - const readable = renderToWebStream(app).pipeThrough( - new TransformStream({ - start(controller) { - controller.enqueue(DOCTYPE) - }, - }), - ) - const responseStream = transformReadableStreamWithRouter(router, readable, { - signal, - }) - - return createSsrStreamResponse( - router, - new Response(responseStream, { - status: getSsrStatus(router), - headers: responseHeaders, - }), - ) - } catch (error) { - router.serverSsr?.cleanup() - throw error + writerDone = true + void innerWriter + .abort(reason) + .catch(() => {}) + .finally(releaseWriter) } + const handleWriterError = (err: unknown) => { + if (isAbortError(request, err)) { + return + } + + throw err + } + const handleWriteError = (err: unknown) => { + if (writerDone || isAbortError(request, err)) { + return + } + + throw err + } + + const vueWritable = new WritableStream({ + write(chunk) { + if (writerDone) { + return + } + + return innerWriter.write(chunk).catch(handleWriteError) + }, + close() { + if (writerDone) { + return + } + + writerDone = true + return innerWriter.close().catch(handleWriterError).finally(releaseWriter) + }, + abort(reason) { + if (writerDone) { + return + } + + writerDone = true + return innerWriter + .abort(reason) + .catch(handleWriterError) + .finally(releaseWriter) + }, + }) + + // `pipeToWebWritable` returns void (see @vue/server-renderer). Pass a + // proxy writable so request aborts can abort the real TransformStream + // writer even while Vue holds a lock on the proxy writable. + try { + pipeToWebWritable(app, {}, vueWritable) + } catch (err) { + console.error('Error in Vue pipeToWebWritable:', err) + // Setup failed before any pipe was wired; abort writable so the + // readable side errors instead of hanging until the lifetime timeout. + abortVuePipe(err) + } + + if (request.signal.aborted) { + abortVuePipe(request.signal.reason) + } else { + const onRequestAbort = () => abortVuePipe(request.signal.reason) + request.signal.addEventListener('abort', onRequestAbort, { once: true }) + router.serverSsr?.onCleanup(() => { + request.signal.removeEventListener('abort', onRequestAbort) + }) + } + + const doctypedStream = prependDoctype(readable) + const responseStream = transformReadableStreamWithRouter( + router, + doctypedStream, + { signal: request.signal, onAbort: abortVuePipe }, + ) + + return createSsrStreamResponse( + router, + new Response(responseStream as any, { + status: + router._serverResult?.type === 'render' + ? router._serverResult.status + : 200, + headers: responseHeaders, + }), + ) } diff --git a/packages/vue-router/src/ssr/renderRouterToString.tsx b/packages/vue-router/src/ssr/renderRouterToString.tsx index 38681de5d8..723aa0b91e 100644 --- a/packages/vue-router/src/ssr/renderRouterToString.tsx +++ b/packages/vue-router/src/ssr/renderRouterToString.tsx @@ -1,7 +1,5 @@ import * as Vue from 'vue' import { renderToString as vueRenderToString } from 'vue/server-renderer' -import { renderSsrHtmlResponse } from '@tanstack/router-core/ssr/server' -import { warnUnlessHtmlRoot } from './renderRouterToStream' import type { AnyRouter } from '@tanstack/router-core' import type { Component } from 'vue' @@ -14,14 +12,31 @@ export const renderRouterToString = async ({ responseHeaders: Headers App: Component }) => { - return renderSsrHtmlResponse({ - router, - responseHeaders, - render: async () => { - const app = Vue.createSSRApp(App, { router }) - const rendered = await vueRenderToString(app) - warnUnlessHtmlRoot(rendered) - return rendered - }, - }) + try { + const app = Vue.createSSRApp(App, { router }) + + let html = await vueRenderToString(app) + router.serverSsr!.setRenderFinished() + + const injectedHtml = router.serverSsr!.takeBufferedHtml() + if (injectedHtml) { + html = html.replace(``, () => `${injectedHtml}`) + } + + return new Response(`${html}`, { + status: + router._serverResult?.type === 'render' + ? router._serverResult.status + : 200, + headers: responseHeaders, + }) + } catch (error) { + console.error('Render to string error:', error) + return new Response('Internal Server Error', { + status: 500, + headers: responseHeaders, + }) + } finally { + router.serverSsr?.cleanup() + } } diff --git a/packages/vue-router/src/useCanGoBack.ts b/packages/vue-router/src/useCanGoBack.ts index 007331fd5e..2149584979 100644 --- a/packages/vue-router/src/useCanGoBack.ts +++ b/packages/vue-router/src/useCanGoBack.ts @@ -1,9 +1,9 @@ -import { useSelector } from '@tanstack/vue-store' +import { useStore } from '@tanstack/vue-store' import { useRouter } from './useRouter' export function useCanGoBack() { const router = useRouter() - return useSelector( + return useStore( router.stores.location, (location) => location.state.__TSR_index !== 0, ) diff --git a/packages/vue-router/src/useLocation.tsx b/packages/vue-router/src/useLocation.tsx index 144ca8ced9..2d9e4314a2 100644 --- a/packages/vue-router/src/useLocation.tsx +++ b/packages/vue-router/src/useLocation.tsx @@ -1,4 +1,4 @@ -import { useSelector } from '@tanstack/vue-store' +import { useStore } from '@tanstack/vue-store' import { useRouter } from './useRouter' import type { AnyRouter, @@ -25,7 +25,7 @@ export function useLocation< opts?: UseLocationBaseOptions, ): Vue.Ref> { const router = useRouter() - return useSelector(router.stores.location, (location) => + return useStore(router.stores.location, (location) => opts?.select ? opts.select(location) : location, ) as Vue.Ref> } diff --git a/packages/vue-router/src/useMatch.tsx b/packages/vue-router/src/useMatch.tsx index 5bffc5fdcf..927962553d 100644 --- a/packages/vue-router/src/useMatch.tsx +++ b/packages/vue-router/src/useMatch.tsx @@ -1,7 +1,7 @@ import * as Vue from 'vue' import { invariant } from '@tanstack/router-core' +import { useStore } from '@tanstack/vue-store' import { isServer } from '@tanstack/router-core/isServer' -import { useSelector } from '@tanstack/vue-store' import { routeIdContext } from './matchContext' import { useRouter } from './useRouter' import type { @@ -120,13 +120,13 @@ export function useMatch< if (opts.from) { // routeId case: subscribe to the stable per-route presentation atom. const matchStore = router.stores.getMatchStore(opts.from) - match = useSelector(matchStore) + match = useStore(matchStore) } else { // Nearest-match case: use the routeId from context for stable lookup. // The routeId is provided by the nearest Match component and doesn't // change for the component's lifetime, so the store is stable. if (nearestRouteId) { - match = useSelector(router.stores.getMatchStore(nearestRouteId)) + match = useStore(router.stores.getMatchStore(nearestRouteId)) } else { // No route context — will fall through to error handling below match = Vue.ref(undefined) as Readonly> diff --git a/packages/vue-router/src/useRouterState.tsx b/packages/vue-router/src/useRouterState.tsx index 489b05ae91..7d3d536f57 100644 --- a/packages/vue-router/src/useRouterState.tsx +++ b/packages/vue-router/src/useRouterState.tsx @@ -1,6 +1,6 @@ import * as Vue from 'vue' import { isServer } from '@tanstack/router-core/isServer' -import { useSelector } from '@tanstack/vue-store' +import { useStore } from '@tanstack/vue-store' import { useRouter } from './useRouter' import type { AnyRouter, @@ -50,10 +50,8 @@ export function useRouterState< > } - return useSelector(router.stores.__store, (state) => { - if (opts?.select) { - return opts.select(state) - } + return useStore(router.stores.__store, (state) => { + if (opts?.select) return opts.select(state) return state }) as Vue.Ref> diff --git a/packages/vue-router/src/utils.ts b/packages/vue-router/src/utils.ts index 10b059c4a5..8787649d8b 100644 --- a/packages/vue-router/src/utils.ts +++ b/packages/vue-router/src/utils.ts @@ -33,7 +33,7 @@ export const usePrevious = (fn: () => boolean) => { * @param ref - The ref to observe * @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 = () => { @@ -50,40 +50,37 @@ export function useIntersectionObserver( ref: Vue.Ref, callback: (entry?: IntersectionObserverEntry) => void, disabled: () => boolean, - cleanupWhenDisabled?: () => boolean, -): void { +): Vue.Ref { const isIntersectionObserverAvailable = typeof IntersectionObserver === 'function' + const observerRef = Vue.ref(null) // Use watchEffect with cleanup to properly manage the observer lifecycle Vue.watchEffect((onCleanup) => { const r = ref.value if (disabled() || !r || !isIntersectionObserverAvailable) { - if (cleanupWhenDisabled?.() ?? true) { - onCleanup(() => callback()) - } + onCleanup(() => callback()) return } - let active = true const observer = new IntersectionObserver( (entries) => { - // Queued notifications can arrive after this effect has cleaned up. - if (active) { - callback(entries.pop()) - } + callback(entries.pop()) }, { 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/Match.test.tsx b/packages/vue-router/tests/Match.test.tsx deleted file mode 100644 index 0d2e7b6f15..0000000000 --- a/packages/vue-router/tests/Match.test.tsx +++ /dev/null @@ -1,107 +0,0 @@ -import * as Vue from 'vue' -import { renderToString } from 'vue/server-renderer' -import { afterEach, expect, test, vi } from 'vitest' -import { cleanup, fireEvent, render } from '@testing-library/vue' -import { - Outlet, - RouterProvider, - createMemoryHistory, - createRootRoute, - createRoute, - createRouter, -} from '../src' - -afterEach(cleanup) - -function createTestRouter( - scrollRestoration: boolean | (() => boolean), - isServer = false, -) { - const revision = Vue.ref(0) - const mounted = vi.fn() - const Child = Vue.defineComponent({ - setup() { - const count = Vue.ref(0) - Vue.onMounted(mounted) - return () => - }, - }) - const Shell = Vue.defineComponent({ - setup(_, { slots }) { - return () => ( -
- {slots.default?.()} -
- ) - }, - }) - const root = createRootRoute({ - shellComponent: Shell, - component: () => ( -
- -
- ), - }) - const child = createRoute({ - getParentRoute: () => root, - path: '/child', - component: Child, - }) - const router = createRouter({ - routeTree: root.addChildren([child]), - history: createMemoryHistory({ initialEntries: ['/child'] }), - isServer, - scrollRestoration, - ssr: { nonce: 'test-nonce' }, - }) - return { router, revision, mounted } -} - -test.each([false, true])( - 'preserves root child state through shell updates (scroll restoration: %s)', - async (scrollRestoration) => { - const { router, revision, mounted } = createTestRouter(scrollRestoration) - const app = render() - const button = await app.findByRole('button') - - await fireEvent.click(button) - revision.value++ - router.update({ scrollRestoration: !scrollRestoration }) - await router.invalidate() - await Vue.nextTick() - - expect(app.getByRole('button')).toBe(button) - expect(button).toHaveTextContent('1') - expect(mounted).toHaveBeenCalledOnce() - expect(app.getByTestId('shell')).toHaveAttribute('data-revision', '1') - }, -) - -test.each([ - ['disabled', false, false], - ['enabled', true, true], - ['skipped by selector', (): boolean => false, false], - ['enabled by selector', (): boolean => true, true], -] as const)( - 'renders root child content and the restoration script on the server (%s)', - async (_, scrollRestoration, hasScript) => { - const { router } = createTestRouter(scrollRestoration, true) - await router.load() - const html = await renderToString( - Vue.createSSRApp(() => ), - ) - const container = document.createElement('div') - container.innerHTML = html - - expect(container.querySelector('main > button')).toHaveTextContent('0') - const scripts = container.querySelectorAll('main > script') - expect(scripts).toHaveLength(hasScript ? 1 : 0) - if (hasScript) { - expect(scripts[0]).toHaveAttribute('nonce', 'test-nonce') - expect(scripts[0]?.textContent).toContain( - 'document.currentScript.remove()', - ) - } - }, -) diff --git a/packages/vue-router/tests/Matches.test.tsx b/packages/vue-router/tests/Matches.test.tsx index 6bd1f4be38..314cbfba2b 100644 --- a/packages/vue-router/tests/Matches.test.tsx +++ b/packages/vue-router/tests/Matches.test.tsx @@ -38,41 +38,38 @@ const invoicesRoute = createRoute({ component: () => , }) -const InvoicesIndex = Vue.defineComponent({ - setup() { - const matches = useMatches() - return () => { - const loaderDataMatches = matches.value.filter((match: any) => - isMatch(match, 'loaderData.0.id'), - ) +const InvoicesIndex = () => { + const matches = useMatches() - const contextMatches = matches.value.filter((match: any) => - isMatch(match, 'context.permissions'), - ) + const loaderDataMatches = matches.value.filter((match: any) => + isMatch(match, 'loaderData.0.id'), + ) - const incorrectMatches = matches.value.filter((match: any) => - isMatch(match, 'loaderData.6.id'), - ) + const contextMatches = matches.value.filter((match: any) => + isMatch(match, 'context.permissions'), + ) - return ( -
-
- Loader Matches -{' '} - {loaderDataMatches.map((match: any) => match.fullPath).join(',')} -
-
- Context Matches -{' '} - {contextMatches.map((match: any) => match.fullPath).join(',')} -
-
- Incorrect Matches -{' '} - {incorrectMatches.map((match: any) => match.fullPath).join(',')} -
-
- ) - } - }, -}) + const incorrectMatches = matches.value.filter((match: any) => + isMatch(match, 'loaderData.6.id'), + ) + + return ( +
+
+ Loader Matches -{' '} + {loaderDataMatches.map((match: any) => match.fullPath).join(',')} +
+
+ Context Matches -{' '} + {contextMatches.map((match: any) => match.fullPath).join(',')} +
+
+ Incorrect Matches -{' '} + {incorrectMatches.map((match: any) => match.fullPath).join(',')} +
+
+ ) +} const invoicesIndexRoute = createRoute({ getParentRoute: () => invoicesRoute, @@ -399,38 +396,36 @@ describe('matching on different param types', () => { async ({ name, path, params, matchParams, nav }) => { const rootRoute = createRootRoute() - const RouteComponent = Vue.defineComponent({ - setup() { - const routeParams = Route.useParams() - - const matchRoute = useMatchRoute() - - const matchRouteMatch = matchRoute({ - to: path, - }) - return () => ( -
-

{name}

-
- Params{' '} - - {JSON.stringify(routeParams.value)} - - Matches{' '} - - {JSON.stringify(matchRouteMatch.value)} - -
-
- ) - }, - }) const Route = createRoute({ getParentRoute: () => rootRoute, path, component: RouteComponent, }) + function RouteComponent() { + const routeParams = Route.useParams() + const matchRoute = useMatchRoute() + const matchRouteMatch = matchRoute({ + to: path, + }) + + return ( +
+

{name}

+
+ Params{' '} + + {JSON.stringify(routeParams.value)} + + Matches{' '} + + {JSON.stringify(matchRouteMatch.value)} + +
+
+ ) + } + const router = createRouter({ routeTree: rootRoute.addChildren([Route]), history: createMemoryHistory({ initialEntries: ['/'] }), diff --git a/packages/vue-router/tests/Scripts.test.tsx b/packages/vue-router/tests/Scripts.test.tsx index 7336b95f4f..8d6724076b 100644 --- a/packages/vue-router/tests/Scripts.test.tsx +++ b/packages/vue-router/tests/Scripts.test.tsx @@ -299,11 +299,6 @@ 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 () => { @@ -316,7 +311,6 @@ 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) @@ -403,7 +397,6 @@ 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) @@ -737,7 +730,7 @@ describe('ssr HeadContent', () => { ).toBe('.runtime{color:red}') }) - test('renders iife manifest preloads as low priority script links', async () => { + test('renders preload as script links for iife manifest preloads', async () => { const history = createTestBrowserHistory() const rootRoute = createRootRoute({ @@ -777,11 +770,6 @@ 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 fdd9fa4931..6a58ff0cd4 100644 --- a/packages/vue-router/tests/blocker.test.tsx +++ b/packages/vue-router/tests/blocker.test.tsx @@ -1,4 +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' @@ -29,12 +29,13 @@ interface BlockerTestOpts { async function setup({ blockerFn, disabled, ignoreBlocker }: BlockerTestOpts) { const _mockBlockerFn = vi.fn(blockerFn) const rootRoute = createRootRoute() - const Setup = defineComponent({ - setup() { + const indexRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/', + component: function Setup() { const navigate = useNavigate() - useBlocker({ disabled, shouldBlockFn: _mockBlockerFn }) - return () => ( + return ( <>

Index

@@ -49,12 +50,6 @@ async function setup({ blockerFn, disabled, ignoreBlocker }: BlockerTestOpts) { }, }) - const indexRoute = createRoute({ - getParentRoute: () => rootRoute, - path: '/', - component: Setup, - }) - const postsRoute = createRoute({ getParentRoute: () => rootRoute, path: '/posts', diff --git a/packages/vue-router/tests/errorComponent.test.tsx b/packages/vue-router/tests/errorComponent.test.tsx index c5f88afa62..9d25cc9c80 100644 --- a/packages/vue-router/tests/errorComponent.test.tsx +++ b/packages/vue-router/tests/errorComponent.test.tsx @@ -174,19 +174,6 @@ test('global catch boundary resets when a background child generation recovers', const refresh = createControlledPromise() let loaderCalls = 0 const rootRoute = createRootRoute({ component: Outlet }) - const ChildComponent = defineComponent({ - setup() { - const revision = childRoute.useLoaderData() - return () => { - if (revision.value === 1) { - throw new Error('stale child render failed') - } - - return
Recovered child revision {revision.value}
- } - }, - }) - const childRoute = createRoute({ getParentRoute: () => rootRoute, path: '/', @@ -194,7 +181,13 @@ test('global catch boundary resets when a background child generation recovers', staleReloadMode: 'background', handler: () => (++loaderCalls === 1 ? 1 : refresh), }, - component: ChildComponent, + component: () => { + const revision = childRoute.useLoaderData() + if (revision.value === 1) { + throw new Error('stale child render failed') + } + return
Recovered child revision {revision.value}
+ }, }) const router = createRouter({ routeTree: rootRoute.addChildren([childRoute]), @@ -231,19 +224,6 @@ test('ancestor route errorComponent resets when a background child generation re
Ancestor error: {getErrorMessage(error)}
), }) - const ChildComponent = defineComponent({ - setup() { - const revision = childRoute.useLoaderData() - return () => { - if (revision.value === 1) { - throw new Error('stale child render failed') - } - - return
Recovered child revision {revision.value}
- } - }, - }) - const childRoute = createRoute({ getParentRoute: () => rootRoute, path: '/', @@ -251,7 +231,13 @@ test('ancestor route errorComponent resets when a background child generation re staleReloadMode: 'background', handler: () => (++loaderCalls === 1 ? 1 : refresh), }, - component: ChildComponent, + component: () => { + const revision = childRoute.useLoaderData() + if (revision.value === 1) { + throw new Error('stale child render failed') + } + return
Recovered child revision {revision.value}
+ }, }) const router = createRouter({ routeTree: rootRoute.addChildren([childRoute]), diff --git a/packages/vue-router/tests/issue-7986-retained-pending.test.tsx b/packages/vue-router/tests/issue-7986-retained-pending.test.tsx index acbabfcb29..0cbfaddc27 100644 --- a/packages/vue-router/tests/issue-7986-retained-pending.test.tsx +++ b/packages/vue-router/tests/issue-7986-retained-pending.test.tsx @@ -1,7 +1,7 @@ import { cleanup, render, screen, waitFor } from '@testing-library/vue' import { afterEach, expect, test, vi } from 'vitest' import { createControlledPromise } from '@tanstack/router-core' -import { defineComponent, nextTick } from 'vue' +import { nextTick } from 'vue' import { Outlet, RouterProvider, @@ -68,18 +68,6 @@ function setup() { }, component: () => , }) - const Project = defineComponent({ - setup() { - const params = projectRoute.useParams() - - const search = projectRoute.useSearch() - return () => ( -
- project={params.value.projectId} tab={search.value.tab ?? 'default'} -
- ) - }, - }) const projectRoute = createRoute({ getParentRoute: () => layoutRoute, path: '/projects/$projectId', @@ -88,6 +76,16 @@ function setup() { component: Project, }) + function Project() { + const params = projectRoute.useParams() + const search = projectRoute.useSearch() + return ( +
+ project={params.value.projectId} tab={search.value.tab ?? 'default'} +
+ ) + } + const router = createRouter({ routeTree: rootRoute.addChildren([layoutRoute.addChildren([projectRoute])]), history: createMemoryHistory({ initialEntries: ['/projects/p1'] }), @@ -185,19 +183,6 @@ test('a blocking reload retains the exact successful match', async () => { let loaderCalls = 0 const rootRoute = createRootRoute({ component: () => }) - const PageComponent = defineComponent({ - setup() { - const loaderData = pageRoute.useLoaderData() - - const search = pageRoute.useSearch() - return () => ( -
- {loaderData.value} tab={search.value.tab ?? 'default'} -
- ) - }, - }) - const pageRoute = createRoute({ getParentRoute: () => rootRoute, path: '/page', @@ -216,7 +201,15 @@ test('a blocking reload retains the exact successful match', async () => { ) }, }, - component: PageComponent, + component: () => { + const loaderData = pageRoute.useLoaderData() + const search = pageRoute.useSearch() + return ( +
+ {loaderData.value} tab={search.value.tab ?? 'default'} +
+ ) + }, }) const router = createRouter({ routeTree: rootRoute.addChildren([pageRoute]), @@ -266,13 +259,6 @@ test('a cached success retries through pending UI when an error is mounted', asy let loaderCalls = 0 const rootRoute = createRootRoute({ component: () => }) - const PageComponent = defineComponent({ - setup() { - const loaderData = pageRoute.useLoaderData() - return () =>
{loaderData.value}
- }, - }) - const pageRoute = createRoute({ getParentRoute: () => rootRoute, path: '/page', @@ -291,7 +277,10 @@ test('a cached success retries through pending UI when an error is mounted', asy return retry.then(() => 'retried') }, }, - component: PageComponent, + component: () => { + const loaderData = pageRoute.useLoaderData() + return
{loaderData.value}
+ }, pendingComponent: () =>
Pending
, errorComponent: () =>
Failed
, }) @@ -331,13 +320,6 @@ test('a cache-only success retries through pending UI over mounted success', asy let loaderCalls = 0 const rootRoute = createRootRoute({ component: () => }) - const PageComponent = defineComponent({ - setup() { - const loaderData = pageRoute.useLoaderData() - return () =>
{loaderData.value}
- }, - }) - const pageRoute = createRoute({ getParentRoute: () => rootRoute, path: '/page', @@ -353,7 +335,10 @@ test('a cache-only success retries through pending UI over mounted success', asy return `generation ${generation}` }, }, - component: PageComponent, + component: () => { + const loaderData = pageRoute.useLoaderData() + return
{loaderData.value}
+ }, pendingComponent: () =>
Pending
, }) const router = createRouter({ @@ -407,13 +392,6 @@ test('a success hidden below an error boundary retries through pending UI', asyn component: () => , errorComponent: () =>
Parent failed
, }) - const ChildComponent = defineComponent({ - setup() { - const loaderData = childRoute.useLoaderData() - return () =>
{loaderData.value}
- }, - }) - const childRoute = createRoute({ getParentRoute: () => parentRoute, path: '/child', @@ -428,7 +406,10 @@ test('a success hidden below an error boundary retries through pending UI', asyn return 'initial child' }, }, - component: ChildComponent, + component: () => { + const loaderData = childRoute.useLoaderData() + return
{loaderData.value}
+ }, pendingComponent: () =>
Pending child
, }) const router = createRouter({ @@ -667,13 +648,6 @@ test('a superseding navigation replaces an unrelated pending presentation', asyn let pageLoads = 0 const rootRoute = createRootRoute({ component: () => }) - const PageComponent = defineComponent({ - setup() { - const loaderData = pageRoute.useLoaderData() - return () =>
{loaderData.value}
- }, - }) - const pageRoute = createRoute({ getParentRoute: () => rootRoute, path: '/page', @@ -688,7 +662,10 @@ test('a superseding navigation replaces an unrelated pending presentation', asyn return pageReload.then(() => 'reloaded page') }, }, - component: PageComponent, + component: () => { + const loaderData = pageRoute.useLoaderData() + return
{loaderData.value}
+ }, pendingComponent: () =>
Page pending
, }) const otherRoute = createRoute({ @@ -744,18 +721,6 @@ test('a retained root publishes fresh context with a child fallback', async () = const childReady = controlled() let retainedLoads = 0 - const RootComponent = defineComponent({ - setup() { - const context = rootRoute.useRouteContext() - return () => ( -
-
{context.value.user}
- -
- ) - }, - }) - const rootRoute = createRootRoute({ validateSearch: (search: Record): { user: string } => ({ user: typeof search.user === 'string' ? search.user : 'unknown', @@ -767,7 +732,15 @@ test('a retained root publishes fresh context with a child fallback', async () = } return { user: search.user } }, - component: RootComponent, + component: () => { + const context = rootRoute.useRouteContext() + return ( +
+
{context.value.user}
+ +
+ ) + }, }) const sourceRoute = createRoute({ getParentRoute: () => rootRoute, @@ -828,18 +801,6 @@ test('a retained prefix exposes one fresh context chain before descendant pendin beforeLoad: () => ({ rootReady: true }), component: () => , }) - const AComponent = defineComponent({ - setup() { - const context = aRoute.useRouteContext() - return () => ( -
-
{context.value.user}
- -
- ) - }, - }) - const aRoute = createRoute({ getParentRoute: () => rootRoute, path: 'a', @@ -853,7 +814,15 @@ test('a retained prefix exposes one fresh context chain before descendant pendin } return { user: search.user } }, - component: AComponent, + component: () => { + const context = aRoute.useRouteContext() + return ( +
+
{context.value.user}
+ +
+ ) + }, }) const bRoute = createRoute({ getParentRoute: () => aRoute, @@ -870,10 +839,12 @@ test('a retained prefix exposes one fresh context chain before descendant pendin path: 'd', component: () =>
Source
, }) - const EComponent = defineComponent({ - setup() { + const eRoute = createRoute({ + getParentRoute: () => aRoute, + path: 'e', + component: () => { const context = eRoute.useRouteContext() - return () => ( + return (
{context.value.user}
@@ -881,21 +852,6 @@ test('a retained prefix exposes one fresh context chain before descendant pendin ) }, }) - - const eRoute = createRoute({ - getParentRoute: () => aRoute, - path: 'e', - component: EComponent, - }) - const FPendingComponent = defineComponent({ - setup() { - const context = fRoute.useRouteContext() - return () => ( -
F pending for {context.value.user}
- ) - }, - }) - const fRoute = createRoute({ getParentRoute: () => eRoute, path: 'f', @@ -903,7 +859,12 @@ test('a retained prefix exposes one fresh context chain before descendant pendin pendingStarted.resolve() await pendingReady }, - pendingComponent: FPendingComponent, + pendingComponent: () => { + const context = fRoute.useRouteContext() + return ( +
F pending for {context.value.user}
+ ) + }, component: () => , }) const gRoute = createRoute({ @@ -970,17 +931,15 @@ test.each([false, true])( const rootRoute = createRootRoute({ component: () => }) const Parent = Object.assign( - defineComponent({ - setup() { - const loaderData = parentRoute.useLoaderData() - return () => ( -
- {loaderData.value} - -
- ) - }, - }), + () => { + const loaderData = parentRoute.useLoaderData() + return ( +
+ {loaderData.value} + +
+ ) + }, { preload: () => (++parentPreloads === 1 ? undefined : parentComponent), }, diff --git a/packages/vue-router/tests/issue-8115-context.test.tsx b/packages/vue-router/tests/issue-8115-context.test.tsx index a139155572..6ba16737a7 100644 --- a/packages/vue-router/tests/issue-8115-context.test.tsx +++ b/packages/vue-router/tests/issue-8115-context.test.tsx @@ -51,10 +51,20 @@ test('invalidate merges fresh parent beforeLoad context with cached child contex }, component: Outlet, }) - const ChildComponent = Vue.defineComponent({ - setup() { + const childRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/', + context: ({ context }) => { + childContextCalls++ + return { + childSnapshotOfParent: context.parentGeneration, + collision: `child-snapshot-${context.parentGeneration}`, + } + }, + component: () => { const context = childRoute.useRouteContext() - return () => ( + + return (
{context.value.parentGeneration} @@ -67,19 +77,6 @@ test('invalidate merges fresh parent beforeLoad context with cached child contex ) }, }) - - const childRoute = createRoute({ - getParentRoute: () => rootRoute, - path: '/', - context: ({ context }) => { - childContextCalls++ - return { - childSnapshotOfParent: context.parentGeneration, - collision: `child-snapshot-${context.parentGeneration}`, - } - }, - component: ChildComponent, - }) const router = createRouter({ routeTree: rootRoute.addChildren([childRoute]), history: createMemoryHistory({ initialEntries: ['/'] }), @@ -119,31 +116,6 @@ test('a same-id child beforeLoad error observes fresh inherited context', async beforeLoad: () => ({ generation: ++parentGeneration }), component: Outlet, }) - const ChildComponent = Vue.defineComponent({ - setup() { - const context = childRoute.useRouteContext() - return () => ( -
{context.value.generation}
- ) - }, - }) - - const ChildErrorComponent = Vue.defineComponent({ - props: ['error'], - setup(props) { - const context = childRoute.useRouteContext() - - return () => { - renderedError = props.error - return ( -
- {context.value.generation} -
- ) - } - }, - }) - const childRoute = createRoute({ getParentRoute: () => parentRoute, path: '/child', @@ -153,8 +125,22 @@ test('a same-id child beforeLoad error observes fresh inherited context', async throw childError } }, - component: ChildComponent, - errorComponent: ChildErrorComponent, + component: () => { + const context = childRoute.useRouteContext() + return ( +
{context.value.generation}
+ ) + }, + errorComponent: ({ error }) => { + renderedError = error + const context = childRoute.useRouteContext() + + return ( +
+ {context.value.generation} +
+ ) + }, }) const router = createRouter({ routeTree: rootRoute.addChildren([parentRoute.addChildren([childRoute])]), @@ -197,15 +183,6 @@ test('a same-match reload merges new provider context with cached route context' collision: 'provider:B', } const rootRoute = createRootRouteWithContext()() - const IndexComponent = Vue.defineComponent({ - setup() { - const context = indexRoute.useRouteContext() - return () => ( -
{JSON.stringify(context.value)}
- ) - }, - }) - const indexRoute = createRoute({ getParentRoute: () => rootRoute, path: '/', @@ -213,7 +190,12 @@ test('a same-match reload merges new provider context with cached route context' derivedFromProvider: `derived:${context.providerValue}`, collision: `route-cached:${context.providerValue}`, }), - component: IndexComponent, + component: () => { + const context = indexRoute.useRouteContext() + return ( +
{JSON.stringify(context.value)}
+ ) + }, }) const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute]), @@ -272,20 +254,6 @@ test('navigation merges fresh parent context with cached child preload context', }, component: Outlet, }) - const ChildComponent = Vue.defineComponent({ - setup() { - const context = childRoute.useRouteContext() - return () => ( -
- {JSON.stringify({ - parentValue: context.value.parentValue, - childValue: context.value.childValue, - })} -
- ) - }, - }) - const childRoute = createRoute({ getParentRoute: () => parentRoute, path: '/child', @@ -300,7 +268,17 @@ test('navigation merges fresh parent context with cached child preload context', return 'child data' }, preloadStaleTime: Infinity, - component: ChildComponent, + component: () => { + const context = childRoute.useRouteContext() + return ( +
+ {JSON.stringify({ + parentValue: context.value.parentValue, + childValue: context.value.childValue, + })} +
+ ) + }, }) const router = createRouter({ routeTree: rootRoute.addChildren([ @@ -343,18 +321,6 @@ test('a cached child context contribution is merged with fresh parent context', context: ({ deps }) => ({ parentVersion: `version-${deps.version}` }), component: Outlet, }) - const ChildComponent = Vue.defineComponent({ - setup() { - const context = childRoute.useRouteContext() - return () => ( -
- Parent: {context.value.parentVersion}; cached child:{' '} - {context.value.childSnapshot} -
- ) - }, - }) - const childRoute = createRoute({ getParentRoute: () => parentRoute, path: '/child', @@ -362,7 +328,15 @@ test('a cached child context contribution is merged with fresh parent context', context: ({ context }) => ({ childSnapshot: `derived-from-${context.parentVersion}`, }), - component: ChildComponent, + component: () => { + const context = childRoute.useRouteContext() + return ( +
+ Parent: {context.value.parentVersion}; cached child:{' '} + {context.value.childSnapshot} +
+ ) + }, }) const router = createRouter({ routeTree: rootRoute.addChildren([parentRoute.addChildren([childRoute])]), @@ -425,25 +399,6 @@ test('#8115: hydration does not render a successful route with missing context w ), }) - const IndexComponent = Vue.defineComponent({ - setup() { - const context = indexRoute.useRouteContext({ - select: (routeContext): { locale?: string } => routeContext, - }) - return () => { - if (!serverPhase) { - clientSuccessRenderValues.push(context.value.locale) - } - - return ( -
- Locale: {context.value.locale ?? 'missing'} -
- ) - } - }, - }) - const indexRoute = createRoute({ getParentRoute: () => rootRoute, path: '/', @@ -454,7 +409,19 @@ test('#8115: hydration does not render a successful route with missing context w clientContextAttempts++ throw contextError }, - component: IndexComponent, + component: () => { + const context = indexRoute.useRouteContext({ + select: (routeContext): { locale?: string } => routeContext, + }) + if (!serverPhase) { + clientSuccessRenderValues.push(context.value.locale) + } + return ( +
+ Locale: {context.value.locale ?? 'missing'} +
+ ) + }, errorComponent: ({ error }) => (
{error instanceof Error ? error.message : String(error)} @@ -577,10 +544,13 @@ test('a same-id child retry presents one coherent beforeLoad context generation' let childLoads = 0 const rootRoute = createRootRoute({ component: Outlet }) - const ParentComponent = Vue.defineComponent({ - setup() { + const parentRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/parent', + beforeLoad: () => ({ generation: ++parentGeneration }), + component: () => { const context = parentRoute.useRouteContext() - return () => ( + return (
Parent generation {context.value.generation} @@ -590,35 +560,6 @@ test('a same-id child retry presents one coherent beforeLoad context generation' ) }, }) - - const parentRoute = createRoute({ - getParentRoute: () => rootRoute, - path: '/parent', - beforeLoad: () => ({ generation: ++parentGeneration }), - component: ParentComponent, - }) - const ChildPendingComponent = Vue.defineComponent({ - setup() { - const context = childRoute.useRouteContext() - return () => ( -
- Child generation {context.value.inheritedGeneration} -
- ) - }, - }) - - const ChildComponent = Vue.defineComponent({ - setup() { - const context = childRoute.useRouteContext() - return () => ( -
- Child generation {context.value.inheritedGeneration} -
- ) - }, - }) - const childRoute = createRoute({ getParentRoute: () => parentRoute, path: '/child', @@ -633,8 +574,22 @@ test('a same-id child retry presents one coherent beforeLoad context generation' }, pendingMs: 0, pendingMinMs: 0, - pendingComponent: ChildPendingComponent, - component: ChildComponent, + pendingComponent: () => { + const context = childRoute.useRouteContext() + return ( +
+ Child generation {context.value.inheritedGeneration} +
+ ) + }, + component: () => { + const context = childRoute.useRouteContext() + return ( +
+ Child generation {context.value.inheritedGeneration} +
+ ) + }, }) const router = createRouter({ routeTree: rootRoute.addChildren([parentRoute.addChildren([childRoute])]), @@ -699,16 +654,19 @@ test('a same-id navigation merges new inherited context with cached route contex inheritedRevision: location.state.issue8115Revision, }), }) - const IndexComponent = Vue.defineComponent({ - setup() { + const indexRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/', + context: ({ location }) => ({ + selfRevision: location.state.issue8115Revision, + }), + component: () => { const location = useLocation() - const context = indexRoute.useRouteContext() - const matchId = indexRoute.useMatch({ select: (match) => match.id }) - const navigate = indexRoute.useNavigate() - return () => ( + + return ( <> {matchId.value} @@ -730,15 +688,6 @@ test('a same-id navigation merges new inherited context with cached route contex ) }, }) - - const indexRoute = createRoute({ - getParentRoute: () => rootRoute, - path: '/', - context: ({ location }) => ({ - selfRevision: location.state.issue8115Revision, - }), - component: IndexComponent, - }) const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute]), history, @@ -768,27 +717,20 @@ test('#8115: a successful root never renders without its context while a child i }) const rootRenderValues: Array = [] - const RootComponent = Vue.defineComponent({ - setup() { - const context = rootRoute.useRouteContext() - return () => { - const locale = context.value.locale - - rootRenderValues.push(locale) - - return ( -
-

Locale: {locale ?? 'missing'}

- -
- ) - } - }, - }) - const rootRoute = createRootRoute({ context: () => ({ locale: 'en' }), - component: RootComponent, + component: () => { + const context = rootRoute.useRouteContext() + const locale = context.value.locale + rootRenderValues.push(locale) + + return ( +
+

Locale: {locale ?? 'missing'}

+ +
+ ) + }, }) const childRoute = createRoute({ getParentRoute: () => rootRoute, @@ -829,14 +771,19 @@ test('a same-id search navigation merges fresh inherited context with cached rou context: ({ deps }) => ({ inheritedRevision: deps.revision }), component: Outlet, }) - const ChildComponent = Vue.defineComponent({ - setup() { + const childRoute = createRoute({ + getParentRoute: () => parentRoute, + path: '/child', + loaderDeps: () => ({}), + context: ({ context, location }) => ({ + cachedSelfRevision: `${context.inheritedRevision}:${String((location.search as Record).revision)}`, + }), + component: () => { const context = childRoute.useRouteContext() - const search = childRoute.useSearch() - const matchId = childRoute.useMatch({ select: (match) => match.id }) - return () => ( + + return ( <>
{matchId.value}
{search.value.revision}
@@ -850,16 +797,6 @@ test('a same-id search navigation merges fresh inherited context with cached rou ) }, }) - - const childRoute = createRoute({ - getParentRoute: () => parentRoute, - path: '/child', - loaderDeps: () => ({}), - context: ({ context, location }) => ({ - cachedSelfRevision: `${context.inheritedRevision}:${String((location.search as Record).revision)}`, - }), - component: ChildComponent, - }) const router = createRouter({ routeTree: rootRoute.addChildren([parentRoute.addChildren([childRoute])]), history: createMemoryHistory({ diff --git a/packages/vue-router/tests/jest-dom.setup.ts b/packages/vue-router/tests/jest-dom.setup.ts deleted file mode 100644 index 8f7cbf15be..0000000000 --- a/packages/vue-router/tests/jest-dom.setup.ts +++ /dev/null @@ -1,18 +0,0 @@ -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 deleted file mode 100644 index 71b917bebf..0000000000 --- a/packages/vue-router/tests/link-departing-scope.test.tsx +++ /dev/null @@ -1,1127 +0,0 @@ -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 deleted file mode 100644 index 2615f07c58..0000000000 --- a/packages/vue-router/tests/link-destination.test.tsx +++ /dev/null @@ -1,236 +0,0 @@ -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-style-ssr.test.tsx b/packages/vue-router/tests/link-style-ssr.test.tsx deleted file mode 100644 index 79af1f2164..0000000000 --- a/packages/vue-router/tests/link-style-ssr.test.tsx +++ /dev/null @@ -1,82 +0,0 @@ -import * as Vue from 'vue' -import { renderToString } from 'vue/server-renderer' -import { expect, test, vi } from 'vitest' -import { - Link, - RouterProvider, - createMemoryHistory, - createRootRoute, - createRoute, - createRouter, -} from '../src' - -test('preserves selected state props and styling during SSR', async () => { - const active = vi.fn(() => ({ - class: ['selected', [{ 'active-object': true, hidden: false }]], - style: { color: 'blue' }, - title: 'selected', - })) - const unused = vi.fn(() => ({ class: 'unused' })) - const root = createRootRoute({ - component: () => - Vue.h(Vue.Fragment, [ - Vue.h( - Link, - { - to: '/', - class: 'base', - style: { color: 'red', marginTop: '2px' }, - activeProps: active, - inactiveProps: unused, - }, - () => 'Active', - ), - Vue.h( - Link, - { - to: '/other', - activeProps: unused, - inactiveProps: { class: { idle: true }, 'data-state': 'idle' }, - }, - () => 'Inactive', - ), - Vue.h(Link, { to: '/' }, () => 'Default'), - Vue.h(Link, { to: '/', activeProps: {} }, () => 'Empty'), - ]), - }) - const history = createMemoryHistory({ initialEntries: ['/'] }) - const router = createRouter({ - routeTree: root.addChildren([ - createRoute({ getParentRoute: () => root, path: '/' }), - createRoute({ getParentRoute: () => root, path: '/other' }), - ]), - history, - isServer: true, - }) - try { - await router.load() - const html = await renderToString( - Vue.createSSRApp(() => Vue.h(RouterProvider, { router })), - ) - const container = document.createElement('div') - container.innerHTML = html - const links = container.querySelectorAll('a') - expect(links).toHaveLength(4) - expect([...links[0]!.classList]).toEqual([ - 'base', - 'selected', - 'active-object', - ]) - expect(links[0]!.style.color).toBe('blue') - expect(links[0]!.style.marginTop).toBe('2px') - expect(links[0]!.getAttribute('title')).toBe('selected') - expect(links[1]!.className).toBe('idle') - expect(links[1]!.getAttribute('data-state')).toBe('idle') - expect(links[2]!.className).toBe('active') - expect(links[3]!.className).toBe('') - expect(active).toHaveBeenCalledWith() - expect(unused).not.toHaveBeenCalled() - } finally { - history.destroy() - } -}) diff --git a/packages/vue-router/tests/link-style.test.tsx b/packages/vue-router/tests/link-style.test.tsx deleted file mode 100644 index d2c4e7891a..0000000000 --- a/packages/vue-router/tests/link-style.test.tsx +++ /dev/null @@ -1,242 +0,0 @@ -import * as Vue from 'vue' -import { afterEach, expect, test, vi } from 'vitest' -import { cleanup, render, screen, waitFor } from '@testing-library/vue' -import { - Link, - Outlet, - RouterProvider, - createMemoryHistory, - createRootRoute, - createRoute, - createRouter, - useLinkProps, -} from '../src' - -const disposers: Array<() => void> = [] -afterEach(() => { - cleanup() - for (const dispose of disposers.splice(0)) { - dispose() - } -}) - -function renderLinks(Links: Vue.Component) { - const history = createMemoryHistory({ initialEntries: ['/target'] }) - disposers.push(history.destroy) - const root = createRootRoute({ - component: () => Vue.h(Vue.Fragment, [Vue.h(Links), Vue.h(Outlet)]), - }) - const router = createRouter({ - routeTree: root.addChildren([ - createRoute({ getParentRoute: () => root, path: '/' }), - createRoute({ getParentRoute: () => root, path: '/target' }), - ]), - history, - scrollRestoration: false, - defaultPreload: false, - }) - render(Vue.h(RouterProvider, { router })) - return router -} - -test('preserves object and nested-array class bindings across state updates', async () => { - const activeClass = Vue.reactive({ selected: true, removed: false }) - const inactiveClass = Vue.reactive({ idle: true }) - const router = renderLinks(() => - Vue.h( - Link, - { - to: '/target', - class: ['base', { decorated: true }], - activeProps: () => ({ - class: ['active-state', [undefined, activeClass, ['nested']]], - }), - inactiveProps: { class: inactiveClass }, - }, - () => 'Class bindings', - ), - ) - const link = await screen.findByRole('link', { name: 'Class bindings' }) - expect([...link.classList]).toEqual([ - 'base', - 'decorated', - 'active-state', - 'selected', - 'nested', - ]) - activeClass.selected = false - activeClass.removed = true - await waitFor(() => { - expect(link).not.toHaveClass('selected') - expect(link).toHaveClass('removed', 'nested') - }) - await router.navigate({ to: '/' }) - await waitFor(() => { - expect([...link.classList]).toEqual(['base', 'decorated', 'idle']) - }) - inactiveClass.idle = false - await waitFor(() => - expect([...link.classList]).toEqual(['base', 'decorated']), - ) -}) - -test.each([false, true])( - 'useLinkProps retains class values rather than strings (with base: %s)', - async (withBase) => { - const baseClass = ['base', { decorated: true }] - const stateClass = { selected: true } - let binding: unknown - const HookLink = Vue.defineComponent({ - setup() { - const props = useLinkProps({ - to: '/target', - class: withBase ? baseClass : undefined, - activeProps: { class: stateClass }, - }) - return () => { - const resolved = Vue.unref(props) - binding = resolved.class - return Vue.h('a', { ...resolved }, 'Hook classes') - } - }, - }) - renderLinks(HookLink) - await screen.findByRole('link', { name: 'Hook classes' }) - if (withBase) { - expect(binding).toEqual([baseClass, stateClass]) - } else { - expect(binding).toBe(stateClass) - } - }, -) - -test('omits the class binding when neither source provides a class', async () => { - renderLinks(() => - Vue.h(Link, { to: '/target', activeProps: {} }, () => 'No classes'), - ) - const link = await screen.findByRole('link', { name: 'No classes' }) - expect(link).not.toHaveAttribute('class') -}) - -test('tracks additions to an initially empty state-only style proxy', async () => { - const style = Vue.reactive({}) - renderLinks(() => - Vue.h( - Link, - { to: '/target', activeProps: () => ({ style }) }, - () => 'Reactive', - ), - ) - const link = await screen.findByRole('link', { name: 'Reactive' }) - expect(link.style.color).toBe('') - style.color = 'red' - await waitFor(() => expect(link.style.color).toBe('red')) - delete style.color - await waitFor(() => expect(link.style.color).toBe('')) -}) - -test('merges only the selected state and tracks reactive style properties', async () => { - const base = Vue.reactive({ color: 'red', marginTop: '2px' }) - const stateStyle = Vue.reactive({ backgroundColor: 'white' }) - const stateClass = Vue.ref('selected') - const active = vi.fn(() => ({ - class: stateClass.value, - style: stateStyle, - title: 'selected', - href: '/state-href', - })) - const inactive = vi.fn(() => ({ - class: 'idle', - style: { color: 'gray' }, - title: 'idle', - })) - const router = renderLinks(() => - Vue.h( - Link, - { - to: '/target', - class: ['base', { decorated: true }], - style: base, - activeProps: active, - inactiveProps: inactive, - }, - () => 'Styled', - ), - ) - const link = await screen.findByRole('link', { name: 'Styled' }) - expect(link).toHaveClass('base', 'decorated', 'selected') - expect(link.style).toMatchObject({ - color: 'red', - marginTop: '2px', - backgroundColor: 'white', - }) - expect(link).toHaveAttribute('href', '/target') - expect(inactive).not.toHaveBeenCalled() - - base.color = 'blue' - stateStyle.backgroundColor = 'black' - stateClass.value = 'updated' - await waitFor(() => { - expect(link).toHaveClass('base', 'decorated', 'updated') - expect(link.style).toMatchObject({ - color: 'blue', - backgroundColor: 'black', - }) - }) - - await router.navigate({ to: '/' }) - await waitFor(() => { - expect(link).toHaveClass('base', 'idle') - expect(link).toHaveAttribute('title', 'idle') - expect(link).toHaveAttribute('href', '/target') - expect(link.style).toMatchObject({ color: 'gray', marginTop: '2px' }) - expect(link.style.backgroundColor).toBe('') - }) - active.mockClear() - inactive.mockClear() - base.marginTop = '3px' - await waitFor(() => expect(link.style).toMatchObject({ marginTop: '3px' })) - expect(active).not.toHaveBeenCalled() - expect(inactive).toHaveBeenCalled() - - await router.navigate({ to: '/target' }) - await waitFor(() => { - expect(link).toHaveClass('base', 'updated') - expect(link.style).toMatchObject({ - color: 'blue', - backgroundColor: 'black', - }) - }) -}) - -test('switches between default and custom state props without stale attributes', async () => { - const custom = Vue.ref(false) - const router = renderLinks(() => - Vue.h( - Link, - { - to: '/target', - activeProps: custom.value - ? { title: 'custom', style: { color: 'red' } } - : undefined, - }, - () => 'Defaults', - ), - ) - const link = await screen.findByRole('link', { name: 'Defaults' }) - expect(link).toHaveClass('active') - custom.value = true - await waitFor(() => { - expect(link).not.toHaveClass('active') - expect(link).toHaveAttribute('title', 'custom') - expect(link.style).toMatchObject({ color: 'red' }) - }) - custom.value = false - await waitFor(() => { - expect(link).toHaveClass('active') - expect(link).not.toHaveAttribute('title') - expect(link.style.color).toBe('') - }) - await router.navigate({ to: '/' }) - await waitFor(() => expect(link).not.toHaveClass('active')) -}) diff --git a/packages/vue-router/tests/link.bench.tsx b/packages/vue-router/tests/link.bench.tsx index 5a5b5f8752..8a30d80a2d 100644 --- a/packages/vue-router/tests/link.bench.tsx +++ b/packages/vue-router/tests/link.bench.tsx @@ -1,8 +1,7 @@ /** @jsxImportSource vue */ import { render } from '@testing-library/vue' -import { describe, test } from 'vitest' -import { getRouteSegments } from '@tanstack/router-core' +import { bench, describe } from 'vitest' import * as Vue from 'vue' import { Link, @@ -38,12 +37,10 @@ const createRouterRenderer = (routesCount: number) => (children: Vue.VNode) => { const InterpolatePathLink = Vue.defineComponent({ props: ['to', 'params'], setup(props, { slots }) { - const router = useRouter() - const href = interpolatePath( - props.to, - getRouteSegments(router.routesByPath[props.to])!, - props.params, - ) + const href = interpolatePath({ + path: props.to, + params: props.params, + }).interpolatedPath return () => Vue.h('a', { href }, slots.default?.()) }, @@ -83,8 +80,9 @@ describe.each([ ])('$name', ({ numberOfRoutes, numberOfLinks, matchedParamId }) => { const renderRouter = createRouterRenderer(numberOfRoutes) - test('hardcoded href', async ({ bench }) => { - await bench('hardcoded href', () => { + bench( + 'hardcoded href', + () => { const links = Vue.h( 'div', null, @@ -95,13 +93,13 @@ describe.each([ const router = renderRouter(links) render(Vue.h(RouterProvider, { router })) - }).run({ - warmupIterations: 1, - }) - }) + }, + { warmupIterations: 1 }, + ) - test('interpolate path', async ({ bench }) => { - await bench('interpolate path', () => { + bench( + 'interpolate path', + () => { const links = Vue.h( 'div', null, @@ -120,13 +118,13 @@ describe.each([ const router = renderRouter(links) render(Vue.h(RouterProvider, { router })) - }).run({ - warmupIterations: 1, - }) - }) + }, + { warmupIterations: 1 }, + ) - test('build location', async ({ bench }) => { - await bench('build location', () => { + bench( + 'build location', + () => { const links = Vue.h( 'div', null, @@ -145,13 +143,13 @@ describe.each([ const router = renderRouter(links) render(Vue.h(RouterProvider, { router })) - }).run({ - warmupIterations: 1, - }) - }) + }, + { warmupIterations: 1 }, + ) - test('link to absolute path', async ({ bench }) => { - await bench('link to absolute path', () => { + bench( + 'link to absolute path', + () => { const links = Vue.h( 'div', null, @@ -172,13 +170,13 @@ describe.each([ const router = renderRouter(links) render(Vue.h(RouterProvider, { router })) - }).run({ - warmupIterations: 1, - }) - }) + }, + { warmupIterations: 1 }, + ) - test('link to relative path', async ({ bench }) => { - await bench('link to relative path', () => { + bench( + 'link to relative path', + () => { const links = Vue.h( 'div', null, @@ -201,13 +199,13 @@ describe.each([ const router = renderRouter(links) render(Vue.h(RouterProvider, { router })) - }).run({ - warmupIterations: 1, - }) - }) + }, + { warmupIterations: 1 }, + ) - test('link to current path', async ({ bench }) => { - await bench('link to current path', () => { + bench( + 'link to current path', + () => { const links = Vue.h( 'div', null, @@ -228,8 +226,7 @@ describe.each([ const router = renderRouter(links) render(Vue.h(RouterProvider, { router })) - }).run({ - warmupIterations: 1, - }) - }) + }, + { warmupIterations: 1 }, + ) }) diff --git a/packages/vue-router/tests/link.test.tsx b/packages/vue-router/tests/link.test.tsx index bae8cf04f9..31ea10f05d 100644 --- a/packages/vue-router/tests/link.test.tsx +++ b/packages/vue-router/tests/link.test.tsx @@ -582,26 +582,24 @@ describe('Link', () => { const decorated = Vue.ref(false) const disabled = Vue.ref(false) - const RootComponent = Vue.defineComponent({ - setup() { - return () => - Vue.h( - Link as any, - { - to: to.value, - target: target.value, - disabled: disabled.value, - ...(decorated.value - ? { class: 'decorated', 'aria-label': 'Updated link' } - : {}), - }, - { default: () => 'Dynamic link' }, - ) - }, - }) - const rootRoute = createRootRoute({ - component: RootComponent, + component: Vue.defineComponent({ + setup() { + return () => + Vue.h( + Link as any, + { + to: to.value, + target: target.value, + disabled: disabled.value, + ...(decorated.value + ? { class: 'decorated', 'aria-label': 'Updated link' } + : {}), + }, + { default: () => 'Dynamic link' }, + ) + }, + }), }) const postsRoute = createRoute({ getParentRoute: () => rootRoute, @@ -683,18 +681,16 @@ describe('Link', () => { test('tracks router location after an external link becomes internal', async () => { const to = Vue.ref('https://example.com') - const RootComponent = Vue.defineComponent({ - setup() { - return () => ( - - Initially external - - ) - }, - }) - const rootRoute = createRootRoute({ - component: RootComponent, + component: Vue.defineComponent({ + setup() { + return () => ( + + Initially external + + ) + }, + }), }) const postsRoute = createRoute({ getParentRoute: () => rootRoute, @@ -734,23 +730,21 @@ describe('Link', () => { >(firstMouseEnter) const disabled = Vue.ref(false) - const RootComponent = Vue.defineComponent({ - setup() { - return () => ( - - Dynamic handlers - - ) - }, - }) - const rootRoute = createRootRoute({ - component: RootComponent, + component: Vue.defineComponent({ + setup() { + return () => ( + + Dynamic handlers + + ) + }, + }), }) const postsRoute = createRoute({ getParentRoute: () => rootRoute, @@ -1127,48 +1121,35 @@ describe('Link', () => { const postLoader = createControlledPromise() let postLoadCount = 0 - const RootComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => { - const nextPostId = params.value.postId === '1' ? '2' : '1' - - return ( - <> - - Current post - - - Switch post - - - - ) - } - }, - }) - const rootRoute = createRootRoute({ - component: RootComponent, - }) - - const PostComponent = Vue.defineComponent({ - setup() { + component: () => { const params = useParams({ strict: false }) - return () =>

{`Post ${params.value.postId}`}

+ const nextPostId = params.value.postId === '1' ? '2' : '1' + + return ( + <> + + Current post + + + Switch post + + + + ) }, }) @@ -1179,7 +1160,10 @@ describe('Link', () => { postLoadCount += 1 return postLoadCount === 1 ? Promise.resolve() : postLoader.promise }, - component: PostComponent, + component: () => { + const params = useParams({ strict: false }) + return

{`Post ${params.value.postId}`}

+ }, }) const router = createRouter({ @@ -1216,57 +1200,44 @@ describe('Link', () => { const postsLoader = createControlledPromise() let postsLoadCount = 0 - const RootComponent = Vue.defineComponent({ - setup() { - const search = useSearch({ strict: false }) - return () => { - const nextPage = Number(search.value.page ?? 1) === 1 ? 2 : 1 - - return ( - <> - - Static search - - - Current search - - - Switch search - - - - ) - } - }, - }) - const rootRoute = createRootRoute({ - component: RootComponent, - }) - - const PostsComponent = Vue.defineComponent({ - setup() { + component: () => { const search = useSearch({ strict: false }) - return () =>

{`Posts ${search.value.page}`}

+ const nextPage = Number(search.value.page ?? 1) === 1 ? 2 : 1 + + return ( + <> + + Static search + + + Current search + + + Switch search + + + + ) }, }) @@ -1281,7 +1252,10 @@ describe('Link', () => { postsLoadCount += 1 return postsLoadCount === 1 ? Promise.resolve() : postsLoader.promise }, - component: PostsComponent, + component: () => { + const search = useSearch({ strict: false }) + return

{`Posts ${search.value.page}`}

+ }, }) const router = createRouter({ @@ -1547,13 +1521,10 @@ describe('Link', () => { expect(indexLink).not.toHaveAttribute('data-status', 'active') expect(indexLink).toHaveAttribute('href', '/') - // 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') + expect(postsLink).toHaveAttribute('data-status', 'active') + expect(postsLink).toHaveAttribute('aria-current', 'page') + expect(postsLink).toHaveClass('active') + expect(postsLink).toHaveAttribute('href', '/posts') }) test('when navigating to /posts with a base url', async () => { @@ -1609,13 +1580,10 @@ describe('Link', () => { expect(indexLink).not.toHaveAttribute('data-status', 'active') expect(indexLink).toHaveAttribute('href', '/app/') - // 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') + expect(postsLink).toHaveAttribute('data-status', 'active') + expect(postsLink).toHaveAttribute('aria-current', 'page') + expect(postsLink).toHaveClass('active') + expect(postsLink).toHaveAttribute('href', '/app/posts') }) test('when navigating to /posts with search', async () => { @@ -1635,17 +1603,15 @@ describe('Link', () => { }, }) - const PostsComponent = Vue.defineComponent({ - setup() { - const search = useSearch({ strict: false }) - return () => ( - <> -

Posts

- Page: {search.value.page} - - ) - }, - }) + const PostsComponent = () => { + const search = useSearch({ strict: false }) + return ( + <> +

Posts

+ Page: {search.value.page} + + ) + } const postsRoute = createRoute({ getParentRoute: () => rootRoute, @@ -1721,20 +1687,18 @@ describe('Link', () => { }, }) - const PostsComponent = Vue.defineComponent({ - setup() { - const search = useSearch({ strict: false }) - return () => ( - <> -

Posts

- Page: {search.value.page} - - Filter: {search.value.filter} - - - ) - }, - }) + const PostsComponent = () => { + const search = useSearch({ strict: false }) + return ( + <> +

Posts

+ Page: {search.value.page} + + Filter: {search.value.filter} + + + ) + } const postsRoute = createRoute({ getParentRoute: () => rootRoute, @@ -1840,20 +1804,18 @@ describe('Link', () => { }, }) - const PostsComponent = Vue.defineComponent({ - setup() { - const search = useSearch({ strict: false }) - return () => ( - <> -

Posts

- Page: {search.value.page} - - Filter: {search.value.filter} - - - ) - }, - }) + const PostsComponent = () => { + const search = useSearch({ strict: false }) + return ( + <> +

Posts

+ Page: {search.value.page} + + Filter: {search.value.filter} + + + ) + } const postsRoute = createRoute({ getParentRoute: () => rootRoute, @@ -1942,17 +1904,15 @@ describe('Link', () => { }, }) - const PostsComponent = Vue.defineComponent({ - setup() { - const search = useSearch({ strict: false }) - return () => ( - <> -

Posts

- Page: {search.value.page} - - ) - }, - }) + const PostsComponent = () => { + const search = useSearch({ strict: false }) + return ( + <> +

Posts

+ Page: {search.value.page} + + ) + } const ErrorComponent = () => { return

Oops, something went wrong

@@ -2015,17 +1975,15 @@ describe('Link', () => { }, }) - const PostsComponent = Vue.defineComponent({ - setup() { - const data = useLoaderData({ strict: false }) - return () => ( - <> -

Posts

- Page: {data.value.pageDoubled} - - ) - }, - }) + const PostsComponent = () => { + const data = useLoaderData({ strict: false }) + return ( + <> +

Posts

+ Page: {data.value.pageDoubled} + + ) + } const postsRoute = createRoute({ getParentRoute: () => rootRoute, @@ -2080,17 +2038,15 @@ describe('Link', () => { }, }) - const PostsComponent = Vue.defineComponent({ - setup() { - const loader = useLoaderData({ strict: false }) - return () => ( - <> -

Posts

- Page: {loader.value.pageDoubled} - - ) - }, - }) + const PostsComponent = () => { + const loader = useLoaderData({ strict: false }) + return ( + <> +

Posts

+ Page: {loader.value.pageDoubled} + + ) + } const postsRoute = createRoute({ getParentRoute: () => rootRoute, @@ -2273,18 +2229,16 @@ describe('Link', () => { }, }) - const PostsComponent = Vue.defineComponent({ - setup() { - const context = useRouteContext({ strict: false }) - return () => ( - <> -

Posts

- UserId: {context.value.userId} - Username: {context.value.username} - - ) - }, - }) + const PostsComponent = () => { + const context = useRouteContext({ strict: false }) + return ( + <> +

Posts

+ UserId: {context.value.userId} + Username: {context.value.username} + + ) + } const postsRoute = createRoute({ getParentRoute: () => rootRoute, @@ -2536,12 +2490,10 @@ describe('Link', () => { component: PostsComponent, }) - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => Params: {params.value.postId} - }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return Params: {params.value.postId} + } const postRoute = createRoute({ getParentRoute: () => postsRoute, @@ -2573,12 +2525,14 @@ describe('Link', () => { test('keeps a relative link active when changing inherited params (issue #5655)', async () => { const rootRoute = createRootRoute() - const PostComponent = Vue.defineComponent({ - setup() { + const postRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/post/$postId', + component: () => { const params = useParams({ strict: false }) - const postId = Vue.computed(() => params.value.postId) - return () => ( + + return ( <> { }, }) - const postRoute = createRoute({ - getParentRoute: () => rootRoute, - path: '/post/$postId', - component: PostComponent, - }) - - const Step1Component = Vue.defineComponent({ - setup() { + const step1Route = createRoute({ + getParentRoute: () => postRoute, + path: 'step1', + component: () => { const params = useParams({ strict: false }) - const postId = Vue.computed(() => params.value.postId) - const otherPostId = Vue.computed(() => postId.value === '1' ? '2' : '1', ) - return () => ( + + return ( <> {`Post ${postId.value} step1`} { }, }) - const step1Route = createRoute({ + const step2Route = createRoute({ getParentRoute: () => postRoute, - path: 'step1', - component: Step1Component, - }) - - const Step2Component = Vue.defineComponent({ - setup() { + path: 'step2', + component: () => { const params = useParams({ strict: false }) - const postId = Vue.computed(() => params.value.postId) - const otherPostId = Vue.computed(() => postId.value === '1' ? '2' : '1', ) - return () => ( + + return ( <> {`Post ${postId.value} step2`} { }, }) - const step2Route = createRoute({ - getParentRoute: () => postRoute, - path: 'step2', - component: Step2Component, - }) - const router = createRouter({ routeTree: rootRoute.addChildren([ postRoute.addChildren([step1Route, step2Route]), @@ -2750,17 +2688,15 @@ describe('Link', () => { component: PostsIndexComponent, }) - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => ( - <> - Params: {params.value.postId} - Index - - ) - }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return ( + <> + Params: {params.value.postId} + Index + + ) + } const postRoute = createRoute({ getParentRoute: () => postsRoute, @@ -2866,16 +2802,14 @@ describe('Link', () => { component: PostsIndexComponent, }) - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => ( - <> - Params: {params.value.postId} - - ) - }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return ( + <> + Params: {params.value.postId} + + ) + } const postRoute = createRoute({ getParentRoute: () => postsRoute, @@ -2979,17 +2913,15 @@ describe('Link', () => { component: PostsIndexComponent, }) - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => ( - <> - Params: {params.value.postId} - Index - - ) - }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return ( + <> + Params: {params.value.postId} + Index + + ) + } const postRoute = createRoute({ getParentRoute: () => postsRoute, @@ -3078,17 +3010,15 @@ describe('Link', () => { component: PostsComponent, }) - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => ( - <> - Params: {params.value.postId} - - - ) - }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return ( + <> + Params: {params.value.postId} + + + ) + } const postRoute = createRoute({ getParentRoute: () => postsRoute, @@ -3217,17 +3147,15 @@ describe('Link', () => { component: PostsComponent, }) - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => ( - <> - Params: {params.value.postId} - - - ) - }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return ( + <> + Params: {params.value.postId} + + + ) + } const postRoute = createRoute({ getParentRoute: () => postsRoute, @@ -3414,31 +3342,27 @@ describe('Link', () => { component: UsersComponent, }) - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => ( - <> - - Params: {params.value.postId} - - - ) - }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return ( + <> + + Params: {params.value.postId} + + + ) + } - const UserComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => ( - <> - - Params: {params.value.userId} - - - ) - }, - }) + const UserComponent = () => { + const params = useParams({ strict: false }) + return ( + <> + + Params: {params.value.userId} + + + ) + } const postRoute = createRoute({ getParentRoute: () => postsRoute, path: '$postid', @@ -3560,17 +3484,15 @@ describe('Link', () => { component: PostsComponent, }) - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => ( - <> - Params: {params.value.postId} - - - ) - }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return ( + <> + Params: {params.value.postId} + + + ) + } const postRoute = createRoute({ getParentRoute: () => postsRoute, @@ -3699,17 +3621,15 @@ describe('Link', () => { component: PostsComponent, }) - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => ( - <> - Params: {params.value.postId} - - - ) - }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return ( + <> + Params: {params.value.postId} + + + ) + } const postRoute = createRoute({ getParentRoute: () => postsRoute, @@ -3828,17 +3748,15 @@ describe('Link', () => { validateSearch: () => ({ page: 2 }), }) - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => ( - <> - Params: {params.value.postId} - - - ) - }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return ( + <> + Params: {params.value.postId} + + + ) + } const postRoute = createRoute({ getParentRoute: () => postsRoute, @@ -3975,17 +3893,15 @@ describe('Link', () => { component: PostsComponent, }) - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => ( - <> - Params: {params.value.postId} - - - ) - }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return ( + <> + Params: {params.value.postId} + + + ) + } const postRoute = createRoute({ getParentRoute: () => postsRoute, @@ -4111,17 +4027,15 @@ describe('Link', () => { component: PostsComponent, }) - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => ( - <> - Params: {params.value.postId} - - - ) - }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return ( + <> + Params: {params.value.postId} + + + ) + } const postRoute = createRoute({ getParentRoute: () => postsRoute, @@ -4257,17 +4171,15 @@ describe('Link', () => { component: PostsComponent, }) - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => ( - <> - Params: {params.value.postId} - - - ) - }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return ( + <> + Params: {params.value.postId} + + + ) + } const postRoute = createRoute({ getParentRoute: () => postsRoute, @@ -4317,12 +4229,10 @@ describe('Link', () => { ), }) - const InvoiceComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => invoiceId: {params.value.invoiceId} - }, - }) + const InvoiceComponent = () => { + const params = useParams({ strict: false }) + return invoiceId: {params.value.invoiceId} + } const invoiceRoute = createRoute({ getParentRoute: () => invoicesRoute, @@ -4388,17 +4298,15 @@ describe('Link', () => { component: PostsComponent, }) - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => ( - <> - Params: {params.value.postId} - - - ) - }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return ( + <> + Params: {params.value.postId} + + + ) + } const postRoute = createRoute({ getParentRoute: () => postsRoute, @@ -4484,17 +4392,15 @@ describe('Link', () => { component: PostsComponent, }) - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => ( - <> - Params: {params.value.postId} - - - ) - }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return ( + <> + Params: {params.value.postId} + + + ) + } const postRoute = createRoute({ getParentRoute: () => postsRoute, @@ -4571,17 +4477,15 @@ describe('Link', () => { component: PostsComponent, }) - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => ( - <> - Params: {params.value.postId} - - - ) - }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return ( + <> + Params: {params.value.postId} + + + ) + } const search = vi.fn((prev) => ({ page: prev.postPage })) @@ -4701,17 +4605,15 @@ describe('Link', () => { component: PostsComponent, }) - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => ( - <> - Params: {params.value.postId} - - - ) - }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return ( + <> + Params: {params.value.postId} + + + ) + } const search = vi.fn((prev) => ({ page: prev.postPage })) @@ -4803,17 +4705,15 @@ describe('Link', () => { component: PostsComponent, }) - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => ( - <> - Params: {params.value.postId} - - - ) - }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return ( + <> + Params: {params.value.postId} + + + ) + } const search = vi.fn((prev) => ({ page: prev.postPage })) @@ -4905,17 +4805,15 @@ describe('Link', () => { component: PostsComponent, }) - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => ( - <> - Params: {params.value.postId} - - - ) - }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return ( + <> + Params: {params.value.postId} + + + ) + } const search = vi.fn((prev) => ({ page: prev.postPage })) @@ -5008,17 +4906,15 @@ describe('Link', () => { component: PostsComponent, }) - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => ( - <> - Params: {params.value.postId} - - - ) - }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return ( + <> + Params: {params.value.postId} + + + ) + } const search = vi.fn((prev) => ({ page: prev.postPage })) @@ -5260,12 +5156,10 @@ describe('Link', () => { let parseParams: any let stringifyParams: any - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () =>
Post: {params.value.postId}
- }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return
Post: {params.value.postId}
+ } const postRoute = createRoute({ getParentRoute: () => rootRoute, @@ -5324,12 +5218,10 @@ describe('Link', () => { let parseParams: any let stringifyParams: any - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () =>
Post: {params.value.postId}
- }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return
Post: {params.value.postId}
+ } const postRoute = createRoute({ getParentRoute: () => rootRoute, @@ -5407,12 +5299,10 @@ describe('Link', () => { } } - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () =>
Post: {params.value.postId}
- }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return
Post: {params.value.postId}
+ } const postRoute = createRoute({ getParentRoute: () => rootRoute, @@ -5551,123 +5441,6 @@ describe('Link', () => { expect(ioDisconnectMock).not.toHaveBeenCalled() // it should not disconnect again }) - test.each([undefined, false, true])( - 'disabled observers honor the cleanup condition (%s)', - async (cleanupWhenDisabled) => { - const callback = vi.fn() - const TestComponent = Vue.defineComponent({ - setup() { - const element = Vue.ref(null) - useIntersectionObserver( - element, - callback, - () => true, - cleanupWhenDisabled === undefined - ? undefined - : () => cleanupWhenDisabled, - ) - return () =>
- }, - }) - const view = render() - await Vue.nextTick() - callback.mockClear() - view.unmount() - if (cleanupWhenDisabled === false) { - expect(callback).not.toHaveBeenCalled() - } else { - expect(callback).toHaveBeenCalledWith() - } - }, - ) - - test.each(['intent', 'viewport'] as const)( - 'preserves %s timer cleanup across mode changes and unmount', - async (mode) => { - const preload = Vue.ref() - const RouteComponent = Vue.defineComponent({ - setup() { - return () => ( - - Preload Link - - ) - }, - }) - const rootRoute = createRootRoute() - const indexRoute = createRoute({ - getParentRoute: () => rootRoute, - path: '/', - component: RouteComponent, - }) - const aboutRoute = createRoute({ - getParentRoute: () => rootRoute, - path: '/about', - }) - const router = createRouter({ - routeTree: rootRoute.addChildren([indexRoute, aboutRoute]), - history, - }) - const preloadRouteSpy = vi.spyOn(router, 'preloadRoute') - const view = render() - const link = await screen.findByRole('link', { name: 'Preload Link' }) - const notify = (callback: IntersectionObserverCallback) => { - callback( - [ - { - isIntersecting: true, - target: link, - } as unknown as IntersectionObserverEntry, - ], - {} as IntersectionObserver, - ) - } - const trigger = async () => { - if (mode === 'intent') { - await fireEvent.mouseEnter(link) - } else { - notify(ioCallback) - } - } - vi.useFakeTimers() - - preload.value = mode - await Vue.nextTick() - const oldObserver = mode === 'viewport' ? ioCallback : undefined - await trigger() - await vi.advanceTimersByTimeAsync(49) - preload.value = false - await Vue.nextTick() - if (oldObserver) { - notify(oldObserver) - } - await vi.advanceTimersByTimeAsync(50) - expect(preloadRouteSpy).not.toHaveBeenCalled() - - preload.value = mode - await Vue.nextTick() - if (oldObserver) { - // The mode matches again, but the previous observer is still obsolete. - notify(oldObserver) - } - await vi.advanceTimersByTimeAsync(50) - expect(preloadRouteSpy).not.toHaveBeenCalled() - await trigger() - await vi.advanceTimersByTimeAsync(50) - expect(preloadRouteSpy).toHaveBeenCalledOnce() - - preloadRouteSpy.mockClear() - await trigger() - const lastObserver = mode === 'viewport' ? ioCallback : undefined - view.unmount() - if (lastObserver) { - notify(lastObserver) - } - await vi.advanceTimersByTimeAsync(50) - expect(preloadRouteSpy).not.toHaveBeenCalled() - }, - ) - test('Link.preload="viewport" should respect preloadDelay', async () => { const rootRoute = createRootRoute() const indexRoute = createRoute({ @@ -5895,18 +5668,16 @@ describe('Link', () => { test('Link.preload="render" preloads each reactive destination', async () => { const to = Vue.ref('/posts') - const RootComponent = Vue.defineComponent({ - setup() { - return () => ( - - Dynamic render preload - - ) - }, - }) - const rootRoute = createRootRoute({ - component: RootComponent, + component: Vue.defineComponent({ + setup() { + return () => ( + + Dynamic render preload + + ) + }, + }), }) const postsRoute = createRoute({ getParentRoute: () => rootRoute, @@ -5938,23 +5709,21 @@ describe('Link', () => { test('cancels stale delayed preloads after link inputs change', async () => { const to = Vue.ref('/posts') const disabled = Vue.ref(false) - const RootComponent = Vue.defineComponent({ - setup() { - return () => ( - - Dynamic intent preload - - ) - }, - }) - const rootRoute = createRootRoute({ - component: RootComponent, + component: Vue.defineComponent({ + setup() { + return () => ( + + Dynamic intent preload + + ) + }, + }), }) const postsRoute = createRoute({ getParentRoute: () => rootRoute, @@ -6234,16 +6003,14 @@ describe('Link', () => { loader: postsLoaderFn, }) - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => ( - <> - Params: {params.value.postId} - - ) - }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return ( + <> + Params: {params.value.postId} + + ) + } const postBeforeLoadFn = vi.fn() const postLoaderFn = vi.fn() @@ -6671,10 +6438,12 @@ describe('search middleware', () => { ], }, }) - const IndexComponent = Vue.defineComponent({ - setup() { + const indexRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/', + component: () => { const search = indexRoute.useSearch() - return () => ( + return ( <>

Index

{search.value.root ?? '$undefined'}
@@ -6693,12 +6462,6 @@ describe('search middleware', () => { }, }) - const indexRoute = createRoute({ - getParentRoute: () => rootRoute, - path: '/', - component: IndexComponent, - }) - const PostsComponent = () => { return ( <> @@ -6780,21 +6543,6 @@ describe('search middleware', () => { }, }) - const PostsComponent = Vue.defineComponent({ - setup() { - const search = postsRoute.useSearch() - return () => ( - <> -

Posts

-
{search.value.foo}
- - new - - - ) - }, - }) - const postsRoute = createRoute({ getParentRoute: () => rootRoute, path: 'posts', @@ -6809,7 +6557,18 @@ describe('search middleware', () => { ], }, - component: PostsComponent, + component: () => { + const search = postsRoute.useSearch() + return ( + <> +

Posts

+
{search.value.foo}
+ + new + + + ) + }, }) const postsNewRoute = createRoute({ @@ -6902,12 +6661,10 @@ describe('search middleware', () => { component: PostsComponent, }) - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => Params: {params.value.postId} - }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return Params: {params.value.postId} + } const postRoute = createRoute({ getParentRoute: () => postsRoute, @@ -7317,12 +7074,14 @@ describe('splat routes with empty splat', () => { async (trailingSlash) => { const tail = trailingSlash === 'always' ? '/' : '' - // The links stay mounted across the navigation so they can turn active. - const rootRoute = createRootRoute({ + const rootRoute = createRootRoute() + const indexRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/', component: () => { return ( <> - +

Index Route

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

Index Route

- }, - }) const splatRoute = createRoute({ getParentRoute: () => rootRoute, @@ -7644,18 +7396,16 @@ describe('relative links to current route', () => { component: PostsComponent, }) - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => ( - <> - - Params: {params.value.postId} - - - ) - }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return ( + <> + + Params: {params.value.postId} + + + ) + } const postRoute = createRoute({ getParentRoute: () => postsRoute, @@ -8079,17 +7829,15 @@ describe('when on /posts/$postId and navigating to ../ with default `from` /post // postsRouteApi.Link is not available in Vue, so we use Link with from prop instead // const postsRouteApi = getRouteApi('/_layout/posts') - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => ( - <> - Params: {params.value.postId} - - - ) - }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return ( + <> + Params: {params.value.postId} + + + ) + } const postRoute = createRoute({ getParentRoute: () => postsRoute, @@ -8355,28 +8103,27 @@ describe('encoded and unicode paths', () => { }, }) - const PathRouteComponent = Vue.defineComponent({ - setup() { - const params = pathRoute.useParams() - return () => ( -
-

Path Route

-

- params:{' '} - - {JSON.stringify(params.value)} - -

-
- ) - }, - }) const pathRoute = createRoute({ getParentRoute: () => rootRoute, path, component: PathRouteComponent, }) + function PathRouteComponent() { + const params = pathRoute.useParams() + return ( +
+

Path Route

+

+ params:{' '} + + {JSON.stringify(params.value)} + +

+
+ ) + } + const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute, pathRoute]), history, diff --git a/packages/vue-router/tests/loaders.test.tsx b/packages/vue-router/tests/loaders.test.tsx index f8b94245a8..99ef9ef5d1 100644 --- a/packages/vue-router/tests/loaders.test.tsx +++ b/packages/vue-router/tests/loaders.test.tsx @@ -1,4 +1,3 @@ -import { defineComponent } from 'vue' import { cleanup, fireEvent, @@ -206,17 +205,13 @@ test('reproducer for #2053', async () => { }, }) - const FooComponent = defineComponent({ - setup() { - const params = fooRoute.useParams() - return () =>
fooId: {params.value.fooId}
- }, - }) - const fooRoute = createRoute({ getParentRoute: () => rootRoute, path: '/foo/$fooId', - component: FooComponent, + component: () => { + const params = fooRoute.useParams() + return
fooId: {params.value.fooId}
+ }, }) window.history.replaceState(null, 'root', '/foo/3ΚΑΠΠΑ') @@ -293,22 +288,15 @@ test('#7673: aborted loader does not render the route component with undefined l const routeComponentRendered = vi.fn() const renderedError = vi.fn() const rootRoute = createRootRoute({}) - const IndexComponent = defineComponent({ - setup() { - const data = indexRoute.useLoaderData() - return () => { - routeComponentRendered() - - return
{data.value.value}
- } - }, - }) - const indexRoute = createRoute({ getParentRoute: () => rootRoute, path: '/', loader: (): Promise<{ value: string }> => Promise.reject(abortError), - component: IndexComponent, + component: () => { + routeComponentRendered() + const data = indexRoute.useLoaderData() + return
{data.value.value}
+ }, errorComponent: ({ error }) => { renderedError(error) return
indexErrorComponent
@@ -380,20 +368,6 @@ test('reproducer #4245', async () => { const LOADER_WAIT_TIME = 500 const rootRoute = createRootRoute({}) - const IndexComponent = defineComponent({ - setup() { - const data = indexRoute.useLoaderData() - return () => ( -
- - foo - - {data.value} -
- ) - }, - }) - const indexRoute = createRoute({ getParentRoute: () => rootRoute, path: '/', @@ -402,7 +376,17 @@ test('reproducer #4245', async () => { return 'index' }, - component: IndexComponent, + component: () => { + const data = indexRoute.useLoaderData() + return ( +
+ + foo + + {data.value} +
+ ) + }, }) const fooRoute = createRoute({ @@ -499,30 +483,6 @@ test('reproducer #4546', async () => { }) let counter = 0 - const Header = defineComponent({ - setup() { - const router = useRouter() - - const ctx = appRoute.useRouteContext() - return () => ( -
- Header Counter:{' '} -

{ctx.value.counter}

- -
- ) - }, - }) const appRoute = createRoute({ getParentRoute: () => rootRoute, id: '_app', @@ -542,12 +502,42 @@ test('reproducer #4546', async () => { }, }) - const IndexComponent = defineComponent({ - setup() { - const data = indexRoute.useLoaderData() + function Header() { + const router = useRouter() + const ctx = appRoute.useRouteContext() + return ( +
+ Header Counter:

{ctx.value.counter}

+ +
+ ) + } + + const indexRoute = createRoute({ + getParentRoute: () => appRoute, + path: '/', + loader: ({ context }) => { + return { + counter: context.counter, + } + }, + + component: () => { + const data = indexRoute.useLoaderData() const ctx = indexRoute.useRouteContext() - return () => ( + + return (
{ ) }, }) - - const indexRoute = createRoute({ + const idRoute = createRoute({ getParentRoute: () => appRoute, - path: '/', + path: '$id', loader: ({ context }) => { return { counter: context.counter, } }, - component: IndexComponent, - }) - const IdComponent = defineComponent({ - setup() { + component: () => { const data = idRoute.useLoaderData() - const ctx = idRoute.useRouteContext() - return () => ( + + return (
{ }, }) - const idRoute = createRoute({ - getParentRoute: () => appRoute, - path: '$id', - loader: ({ context }) => { - return { - counter: context.counter, - } - }, - - component: IdComponent, - }) - const routeTree = rootRoute.addChildren([ appRoute.addChildren([indexRoute, idRoute]), ]) diff --git a/packages/vue-router/tests/not-found.test.tsx b/packages/vue-router/tests/not-found.test.tsx index cefc7becda..3cb4a78ec3 100644 --- a/packages/vue-router/tests/not-found.test.tsx +++ b/packages/vue-router/tests/not-found.test.tsx @@ -1,4 +1,3 @@ -import { defineComponent } from 'vue' import { afterEach, beforeEach, expect, test } from 'vitest' import { cleanup, render, screen } from '@testing-library/vue' @@ -371,23 +370,19 @@ test('beforeLoad notFound with routeId targets parent boundary and preserves par ), }) - const ParentNotFoundComponent = defineComponent({ - setup() { - const loaderData = parentRoute.useLoaderData() - return () => ( - - {loaderData.value.message} - - ) - }, - }) - const parentRoute = createRoute({ getParentRoute: () => rootRoute, path: '/parent', loader: () => ({ message: 'ready' }), component: () => , - notFoundComponent: ParentNotFoundComponent, + notFoundComponent: () => { + const loaderData = parentRoute.useLoaderData() + return ( + + {loaderData.value.message} + + ) + }, }) const childRoute = createRoute({ diff --git a/packages/vue-router/tests/optional-path-params.test.tsx b/packages/vue-router/tests/optional-path-params.test.tsx index 52dcd9ddb4..ca98aef616 100644 --- a/packages/vue-router/tests/optional-path-params.test.tsx +++ b/packages/vue-router/tests/optional-path-params.test.tsx @@ -1,4 +1,3 @@ -import { defineComponent } from 'vue' import { afterEach, describe, expect, it, vi } from 'vitest' import { cleanup, @@ -27,10 +26,12 @@ describe('Solid Router - Optional Path Parameters', () => { describe('Route matching with optional parameters', () => { it('should match route with no optional parameters', async () => { const rootRoute = createRootRoute() - const PostsComponent = defineComponent({ - setup() { + const postsRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/posts/{-$category}/{-$slug}', + component: () => { const params = postsRoute.useParams() - return () => ( + return (

Posts

{JSON.stringify(params.value)}
@@ -38,12 +39,6 @@ describe('Solid Router - Optional Path Parameters', () => { ) }, }) - - const postsRoute = createRoute({ - getParentRoute: () => rootRoute, - path: '/posts/{-$category}/{-$slug}', - component: PostsComponent, - }) window.history.replaceState({}, '', '/posts') const router = createRouter({ @@ -59,10 +54,12 @@ describe('Solid Router - Optional Path Parameters', () => { it('should match route with one optional parameter', async () => { const rootRoute = createRootRoute() - const PostsComponent = defineComponent({ - setup() { + const postsRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/posts/{-$category}/{-$slug}', + component: () => { const params = postsRoute.useParams() - return () => ( + return (

Posts

{JSON.stringify(params.value)}
@@ -70,12 +67,6 @@ describe('Solid Router - Optional Path Parameters', () => { ) }, }) - - const postsRoute = createRoute({ - getParentRoute: () => rootRoute, - path: '/posts/{-$category}/{-$slug}', - component: PostsComponent, - }) window.history.replaceState({}, '', '/posts/tech') const router = createRouter({ @@ -93,10 +84,12 @@ describe('Solid Router - Optional Path Parameters', () => { it('should match route with all optional parameters', async () => { const rootRoute = createRootRoute() - const PostsComponent = defineComponent({ - setup() { + const postsRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/posts/{-$category}/{-$slug}', + component: () => { const params = postsRoute.useParams() - return () => ( + return (

Posts

{JSON.stringify(params.value)}
@@ -104,12 +97,6 @@ describe('Solid Router - Optional Path Parameters', () => { ) }, }) - - const postsRoute = createRoute({ - getParentRoute: () => rootRoute, - path: '/posts/{-$category}/{-$slug}', - component: PostsComponent, - }) window.history.replaceState({}, '', '/posts/tech/hello-world') const router = createRouter({ @@ -136,10 +123,12 @@ describe('Solid Router - Optional Path Parameters', () => { 'should handle mixed required and optional parameters: $path', async ({ path, expectedParams }) => { const rootRoute = createRootRoute() - const UsersComponent = defineComponent({ - setup() { + const usersRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/users/$id/{-$tab}', + component: () => { const params = usersRoute.useParams() - return () => ( + return (

User Profile

{JSON.stringify(params.value)}
@@ -147,12 +136,6 @@ describe('Solid Router - Optional Path Parameters', () => { ) }, }) - - const usersRoute = createRoute({ - getParentRoute: () => rootRoute, - path: '/users/$id/{-$tab}', - component: UsersComponent, - }) window.history.replaceState({}, '', path) const router = createRouter({ @@ -212,10 +195,12 @@ describe('Solid Router - Optional Path Parameters', () => { }, }) - const IndexComponent = defineComponent({ - setup() { + const indexRoute = createRoute({ + getParentRoute: () => localeRoute, + path: '/', + component: () => { const context = indexRoute.useRouteContext() - return () => ( + return (

{context.value.content.title}

@@ -226,12 +211,6 @@ describe('Solid Router - Optional Path Parameters', () => { }, }) - const indexRoute = createRoute({ - getParentRoute: () => localeRoute, - path: '/', - component: IndexComponent, - }) - window.history.replaceState({}, '', path) const router = createRouter({ @@ -498,10 +477,12 @@ describe('Solid Router - Optional Path Parameters', () => { ), }) - const PostsComponent = defineComponent({ - setup() { + const postsRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/posts/{-$category}/{-$slug}', + component: () => { const params = postsRoute.useParams() - return () => ( + return (

Posts

{JSON.stringify(params.value)}
@@ -510,12 +491,6 @@ describe('Solid Router - Optional Path Parameters', () => { }, }) - const postsRoute = createRoute({ - getParentRoute: () => rootRoute, - path: '/posts/{-$category}/{-$slug}', - component: PostsComponent, - }) - const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute, postsRoute]), }) @@ -581,10 +556,12 @@ describe('Solid Router - Optional Path Parameters', () => { ), }) - const FilesComponent = defineComponent({ - setup() { + const filesRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/files/prefix{-$name}.txt', + component: () => { const params = filesRoute.useParams() - return () => ( + return (

Files

{JSON.stringify(params.value)}
@@ -593,12 +570,6 @@ describe('Solid Router - Optional Path Parameters', () => { }, }) - const filesRoute = createRoute({ - getParentRoute: () => rootRoute, - path: '/files/prefix{-$name}.txt', - component: FilesComponent, - }) - const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute, filesRoute]), }) @@ -616,57 +587,55 @@ describe('Solid Router - Optional Path Parameters', () => { describe('useNavigate with optional parameters', () => { it('should navigate with optional parameters programmatically', async () => { const rootRoute = createRootRoute() - const Component = defineComponent({ - setup() { - const navigate = useNavigate() - - const params = postsRoute.useParams() - return () => ( -
-
{JSON.stringify(params.value)}
- - - -
- ) - }, - }) const postsRoute = createRoute({ getParentRoute: () => rootRoute, path: '/posts/{-$category}/{-$slug}', component: Component, }) + function Component() { + const navigate = useNavigate() + const params = postsRoute.useParams() + + return ( +
+
{JSON.stringify(params.value)}
+ + + +
+ ) + } // Start at a specific post window.history.replaceState({}, '', '/posts/tech/hello-world') @@ -698,39 +667,37 @@ describe('Solid Router - Optional Path Parameters', () => { it('should handle relative navigation with optional parameters', async () => { const rootRoute = createRootRoute() - const Component = defineComponent({ - setup() { - const navigate = useNavigate() - - const params = postsRoute.useParams() - return () => ( -
-

Posts

-
{JSON.stringify(params.value)}
- - -
- ) - }, - }) const postsRoute = createRoute({ getParentRoute: () => rootRoute, path: '/posts/{-$category}', component: Component, }) + function Component() { + const navigate = useNavigate() + const params = postsRoute.useParams() + + return ( +
+

Posts

+
{JSON.stringify(params.value)}
+ + +
+ ) + } window.history.replaceState({}, '', '/posts') const router = createRouter({ @@ -812,10 +779,12 @@ describe('Solid Router - Optional Path Parameters', () => { 'should handle nested routes with optional parameters: $path', async ({ path, expected }) => { const rootRoute = createRootRoute() - const PostsComponent = defineComponent({ - setup() { + const postsRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/posts/{-$category}', + component: () => { const params = postsRoute.useParams() - return () => ( + return (

Posts Layout

@@ -827,16 +796,12 @@ describe('Solid Router - Optional Path Parameters', () => { }, }) - const postsRoute = createRoute({ - getParentRoute: () => rootRoute, - path: '/posts/{-$category}', - component: PostsComponent, - }) - - const PostComponent = defineComponent({ - setup() { + const postRoute = createRoute({ + getParentRoute: () => postsRoute, + path: '/{-$slug}', + component: () => { const params = postRoute.useParams() - return () => ( + return (

Post Detail

@@ -847,12 +812,6 @@ describe('Solid Router - Optional Path Parameters', () => { }, }) - const postRoute = createRoute({ - getParentRoute: () => postsRoute, - path: '/{-$slug}', - component: PostComponent, - }) - window.history.replaceState({}, '', path) const router = createRouter({ @@ -876,20 +835,6 @@ describe('Solid Router - Optional Path Parameters', () => { it('should work with search parameters', async () => { const rootRoute = createRootRoute() - const Component = defineComponent({ - setup() { - const params = postsRoute.useParams() - - const search = postsRoute.useSearch() - return () => ( -
-

Posts

-
{JSON.stringify(params.value)}
-
{JSON.stringify(search.value)}
-
- ) - }, - }) const postsRoute = createRoute({ getParentRoute: () => rootRoute, path: '/posts/{-$category}', @@ -900,6 +845,18 @@ describe('Solid Router - Optional Path Parameters', () => { component: Component, }) + function Component() { + const params = postsRoute.useParams() + const search = postsRoute.useSearch() + return ( +
+

Posts

+
{JSON.stringify(params.value)}
+
{JSON.stringify(search.value)}
+
+ ) + } + window.history.replaceState({}, '', '/posts/tech?page=2&sort=title') const router = createRouter({ routeTree: rootRoute.addChildren([postsRoute]), @@ -932,10 +889,12 @@ describe('Solid Router - Optional Path Parameters', () => { 'should handle multiple consecutive optional parameters: $path', async ({ path, expectedParams }) => { const rootRoute = createRootRoute() - const DateComponent = defineComponent({ - setup() { + const dateRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/{-$year}/{-$month}/{-$day}', + component: () => { const params = dateRoute.useParams() - return () => ( + return (

Date Route

{JSON.stringify(params.value)}
@@ -944,12 +903,6 @@ describe('Solid Router - Optional Path Parameters', () => { }, }) - const dateRoute = createRoute({ - getParentRoute: () => rootRoute, - path: '/{-$year}/{-$month}/{-$day}', - component: DateComponent, - }) - window.history.replaceState({}, '', path) const router = createRouter({ @@ -997,10 +950,12 @@ describe('Solid Router - Optional Path Parameters', () => { 'should handle routes with required param after optional param: $path', async ({ path, expected }) => { const rootRoute = createRootRoute() - const RoomsComponent = defineComponent({ - setup() { + const roomsRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/{-$locale}/$rooms', + component: () => { const params = roomsRoute.useParams() - return () => ( + return (

Rooms

@@ -1015,12 +970,6 @@ describe('Solid Router - Optional Path Parameters', () => { }, }) - const roomsRoute = createRoute({ - getParentRoute: () => rootRoute, - path: '/{-$locale}/$rooms', - component: RoomsComponent, - }) - window.history.replaceState({}, '', path) const router = createRouter({ @@ -1047,12 +996,14 @@ describe('Solid Router - Optional Path Parameters', () => { }) const rootRoute = createRootRoute() - const PostsComponent = defineComponent({ - setup() { + const postsRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/posts/{-$category}', + loader: mockLoader, + component: () => { const data = postsRoute.useLoaderData() - const params = postsRoute.useParams() - return () => ( + return (

Posts

{JSON.stringify(params.value)}
@@ -1061,13 +1012,6 @@ describe('Solid Router - Optional Path Parameters', () => { ) }, }) - - const postsRoute = createRoute({ - getParentRoute: () => rootRoute, - path: '/posts/{-$category}', - loader: mockLoader, - component: PostsComponent, - }) window.history.replaceState({}, '', '/posts') const router = createRouter({ @@ -1104,10 +1048,13 @@ describe('Solid Router - Optional Path Parameters', () => { }) const rootRoute = createRootRoute() - const PostsComponent = defineComponent({ - setup() { + const postsRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/posts/{-$category}', + beforeLoad: mockBeforeLoad, + component: () => { const params = postsRoute.useParams() - return () => ( + return (

Posts

{JSON.stringify(params.value)}
@@ -1115,13 +1062,6 @@ describe('Solid Router - Optional Path Parameters', () => { ) }, }) - - const postsRoute = createRoute({ - getParentRoute: () => rootRoute, - path: '/posts/{-$category}', - beforeLoad: mockBeforeLoad, - component: PostsComponent, - }) window.history.replaceState({}, '', '/posts/tech') const router = createRouter({ diff --git a/packages/vue-router/tests/public-presentation-lane-contract.test.tsx b/packages/vue-router/tests/public-presentation-lane-contract.test.tsx index 0dd4069b96..9a539139b0 100644 --- a/packages/vue-router/tests/public-presentation-lane-contract.test.tsx +++ b/packages/vue-router/tests/public-presentation-lane-contract.test.tsx @@ -25,13 +25,6 @@ describe('public presentation lane contracts', () => { let attempt = 0 const rootRoute = createRootRoute({ component: () => }) - const PageComponent = defineComponent({ - setup() { - const loaderData = pageRoute.useLoaderData() - return () =>
{loaderData.value}
- }, - }) - const pageRoute = createRoute({ getParentRoute: () => rootRoute, path: '/page', @@ -46,7 +39,10 @@ describe('public presentation lane contracts', () => { return retry }, errorComponent: () =>
Page failed
, - component: PageComponent, + component: () => { + const loaderData = pageRoute.useLoaderData() + return
{loaderData.value}
+ }, }) const router = createRouter({ routeTree: rootRoute.addChildren([pageRoute]), @@ -85,13 +81,6 @@ describe('public presentation lane contracts', () => { path: '/', component: () =>
Home
, }) - const PageComponent = defineComponent({ - setup() { - const search = pageRoute.useSearch() - return () =>
Page revision {search.value.revision}
- }, - }) - const pageRoute = createRoute({ getParentRoute: () => rootRoute, path: '/page', @@ -103,7 +92,10 @@ describe('public presentation lane contracts', () => { pendingComponent: () =>
Loading page
, beforeLoad: ({ search }) => search.revision === 1 ? firstGate : secondGate, - component: PageComponent, + component: () => { + const search = pageRoute.useSearch() + return
Page revision {search.value.revision}
+ }, }) const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute, pageRoute]), @@ -201,13 +193,6 @@ describe('public presentation lane contracts', () => { }, component: () => , }) - const ChildComponent = defineComponent({ - setup() { - const search = childRoute.useSearch() - return () =>
Child revision {search.value.revision}
- }, - }) - const childRoute = createRoute({ getParentRoute: () => parentRoute, path: '/child', @@ -224,7 +209,10 @@ describe('public presentation lane contracts', () => { return undefined }, }, - component: ChildComponent, + component: () => { + const search = childRoute.useSearch() + return
Child revision {search.value.revision}
+ }, }) const router = createRouter({ routeTree: rootRoute.addChildren([parentRoute.addChildren([childRoute])]), @@ -294,18 +282,6 @@ describe('public presentation lane contracts', () => { const secondPageStarted = createControlledPromise() const secondPage = createControlledPromise() - const RootComponent = defineComponent({ - setup() { - const context = rootRoute.useRouteContext() - return () => ( -
-
Root revision {context.value.rootRevision}
- -
- ) - }, - }) - const rootRoute = createRootRoute({ validateSearch: (search: Record) => ({ revision: Number(search.revision) || 0, @@ -317,20 +293,21 @@ describe('public presentation lane contracts', () => { } return { rootRevision: search.revision } }, - component: RootComponent, + component: () => { + const context = rootRoute.useRouteContext() + return ( +
+
Root revision {context.value.rootRevision}
+ +
+ ) + }, }) const indexRoute = createRoute({ getParentRoute: () => rootRoute, path: '/', component: () =>
Home
, }) - const PageComponent = defineComponent({ - setup() { - const search = pageRoute.useSearch() - return () =>
Page revision {search.value.revision}
- }, - }) - const pageRoute = createRoute({ getParentRoute: () => rootRoute, path: '/page', @@ -344,7 +321,10 @@ describe('public presentation lane contracts', () => { secondPageStarted.resolve() return secondPage }, - component: PageComponent, + component: () => { + const search = pageRoute.useSearch() + return
Page revision {search.value.revision}
+ }, }) const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute, pageRoute]), diff --git a/packages/vue-router/tests/renderRouterToStream.test.tsx b/packages/vue-router/tests/renderRouterToStream.test.tsx index 656e8a54b5..60bfa9a8af 100644 --- a/packages/vue-router/tests/renderRouterToStream.test.tsx +++ b/packages/vue-router/tests/renderRouterToStream.test.tsx @@ -4,30 +4,12 @@ import { normalizeSsrResponse, } from '@tanstack/router-core/ssr/server' import { createMemoryHistory, createRootRoute, createRouter } from '../src' -import type { RouterManagedTag } from '@tanstack/router-core' -import type * as RouterSsrServer from '@tanstack/router-core/ssr/server' import type * as VueServerRenderer from 'vue/server-renderer' const rendererMocks = vi.hoisted(() => ({ - renderToWebStream: vi.fn(), + pipeToWebWritable: vi.fn(), renderToString: vi.fn(), })) -const routerTransformMocks = vi.hoisted(() => ({ - readableOptions: vi.fn(), -})) - -vi.mock('@tanstack/router-core/ssr/server', async (importOriginal) => { - const actual = await importOriginal() - return { - ...actual, - transformReadableStreamWithRouter: ( - ...args: Parameters - ) => { - routerTransformMocks.readableOptions(args[2]) - return actual.transformReadableStreamWithRouter(...args) - }, - } -}) vi.mock('vue/server-renderer', async () => { const actual = await vi.importActual( @@ -35,15 +17,11 @@ vi.mock('vue/server-renderer', async () => { ) return { ...actual, - renderToWebStream: rendererMocks.renderToWebStream, + pipeToWebWritable: rendererMocks.pipeToWebWritable, renderToString: rendererMocks.renderToString, } }) -const actualVueServerRenderer = await vi.importActual( - 'vue/server-renderer', -) - // Imported after mock so the wrapper picks up the mocked binding. const { renderRouterToStream } = await import('../src/ssr/renderRouterToStream') @@ -54,9 +32,8 @@ function unwrapResponse( } afterEach(() => { - rendererMocks.renderToWebStream.mockReset() + rendererMocks.pipeToWebWritable.mockReset() rendererMocks.renderToString.mockReset() - routerTransformMocks.readableOptions.mockReset() vi.restoreAllMocks() }) @@ -84,40 +61,14 @@ function drainBody(response: Response) { })().catch(() => true) } -function createManualVueStream() { - let controller!: ReadableStreamDefaultController - const cancel = vi.fn() - const stream = new ReadableStream({ - start(nextController) { - controller = nextController - }, - cancel, - }) - return { stream, controller, cancel } -} - -function renderScript(tag: RouterManagedTag) { - const attrs = tag.attrs ?? {} - const id = attrs.id ? ` id="${attrs.id}"` : '' - const nonce = attrs.nonce ? ` nonce="${attrs.nonce}"` : '' - const streamPart = - 'data-tsr-stream-part' in attrs ? ' data-tsr-stream-part=""' : '' - return `${tag.children ?? ''}` -} - describe('renderRouterToStream - sync setup failures', () => { - test('bot string response preserves hydration scripts and cleans up', async () => { + test('bot string response injects final scripts and cleans up', async () => { + rendererMocks.renderToString.mockResolvedValueOnce( + '
bot
', + ) const router = await buildRouter() await router.serverSsr!.dehydrate() const cleanup = vi.spyOn(router.serverSsr!, 'cleanup') - const initialScripts = router.serverSsr!.takeInitialHydrationScriptTags()! - expect(initialScripts.boundary.attrs).not.toHaveProperty('id') - const renderedScripts = [...initialScripts.before, initialScripts.boundary] - .map(renderScript) - .join('') - rendererMocks.renderToString.mockResolvedValueOnce( - `
bot
${renderedScripts}`, - ) const response = unwrapResponse( await renderRouterToStream({ @@ -132,279 +83,83 @@ describe('renderRouterToStream - sync setup failures', () => { const html = await response.text() expect(html).toContain('$_TSR.e()') - expect(html).toContain(initialScripts.boundary.children) expect(html.indexOf('$_TSR.e()')).toBeLessThan(html.indexOf('')) expect(cleanup).toHaveBeenCalledOnce() expect(router.serverSsr).toBeUndefined() }) - test('request abort stops a bot wait and removes its temporary listener', async () => { - rendererMocks.renderToString.mockImplementationOnce( - () => new Promise(() => {}), - ) - const router = await buildRouter() - const cleanup = vi.spyOn(router.serverSsr!, 'cleanup') - const abortController = new AbortController() - const request = new Request('http://localhost/', { - headers: { 'User-Agent': 'Googlebot' }, - signal: abortController.signal, + test('pipeToWebWritable sync throw terminates response stream', async () => { + rendererMocks.pipeToWebWritable.mockImplementationOnce(() => { + throw new Error('forced-sync-setup-throw') }) - const addEventListener = vi.spyOn(request.signal, 'addEventListener') - const reason = new Error('bot-request-gone') - - const responsePromise = renderRouterToStream({ - request, - router, - responseHeaders: new Headers(), - App: { template: '
' } as any, - }) - await Promise.resolve() - abortController.abort(reason) - - await expect(responsePromise).rejects.toBe(reason) - // The shared abort waiter registers once; `{ once: true }` retires it. - expect( - addEventListener.mock.calls.filter(([type]) => type === 'abort'), - ).toHaveLength(1) - expect(cleanup).toHaveBeenCalledOnce() - expect(router.serverSsr).toBeUndefined() - }) - - test('an already-aborted bot request does not start string rendering', async () => { - const router = await buildRouter() - const cleanup = vi.spyOn(router.serverSsr!, 'cleanup') - const abortController = new AbortController() - const reason = new Error('bot-already-gone') - abortController.abort(reason) - - await expect( - renderRouterToStream({ - request: new Request('http://localhost/', { - headers: { 'User-Agent': 'Googlebot' }, - signal: abortController.signal, - }), - router, - responseHeaders: new Headers(), - App: { template: '
' } as any, - }), - ).rejects.toBe(reason) - - expect(rendererMocks.renderToString).not.toHaveBeenCalled() - expect(cleanup).toHaveBeenCalledOnce() - expect(router.serverSsr).toBeUndefined() - }) - - test('prepends one doctype without wrapping the renderer stream', async () => { - const router = await buildRouter() - await router.serverSsr!.dehydrate() - const initialScripts = router.serverSsr!.takeInitialHydrationScriptTags()! - const renderedScripts = [...initialScripts.before, initialScripts.boundary] - .map(renderScript) - .join('') - const appHtml = `
app
${renderedScripts}` - rendererMocks.renderToWebStream.mockReturnValueOnce( - new ReadableStream({ - start(controller) { - controller.enqueue(new TextEncoder().encode(appHtml)) - controller.close() - }, - }), - ) - - const response = unwrapResponse( - await renderRouterToStream({ - request: new Request('http://localhost/'), - router, - responseHeaders: new Headers(), - App: { template: '
' } as any, - }), - ) - const html = await response.text() - - expect(html).toBe(`${appHtml}`) - expect(html.match(//g)).toHaveLength(1) - expect(router.serverSsr).toBeUndefined() - }) - - test('already-aborted requests do not start the Vue producer', async () => { - const router = await buildRouter() - const cleanup = vi.spyOn(router.serverSsr!, 'cleanup') - const abortController = new AbortController() - const reason = new Error('already-gone') - abortController.abort(reason) - - await expect( - renderRouterToStream({ - request: new Request('http://localhost/', { - signal: abortController.signal, - }), - router, - responseHeaders: new Headers(), - App: { template: '
' } as any, - }), - ).rejects.toBe(reason) - - expect(rendererMocks.renderToWebStream).not.toHaveBeenCalled() - expect(cleanup).toHaveBeenCalledOnce() - expect(router.serverSsr).toBeUndefined() - }) - - test('an abort during producer setup rejects before a response', async () => { - const abortController = new AbortController() - const reason = new Error('reentrant-abort') - rendererMocks.renderToWebStream.mockImplementationOnce( - actualVueServerRenderer.renderToWebStream, - ) const router = await buildRouter() - await expect( - renderRouterToStream({ - request: new Request('http://localhost/', { - signal: abortController.signal, - }), - router, - responseHeaders: new Headers(), - App: { - setup() { - abortController.abort(reason) - return () => null - }, - }, - }), - ).rejects.toBe(reason) - - expect(router.serverSsr).toBeUndefined() - }) - - test('real synchronous renderer failure rejects before creating a response', async () => { - const setupError = new Error('real-vue-setup-failure') - rendererMocks.renderToWebStream.mockImplementationOnce( - actualVueServerRenderer.renderToWebStream, - ) - const router = await buildRouter() - const cleanup = vi.spyOn(router.serverSsr!, 'cleanup') - const originalServerSsr = router.serverSsr! - - const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) - const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}) - try { - await expect( - renderRouterToStream({ - request: new Request('http://localhost/'), - router, - responseHeaders: new Headers(), - App: { - setup() { - throw setupError - }, - }, - }), - ).rejects.toBe(setupError) - - expect(routerTransformMocks.readableOptions).not.toHaveBeenCalled() - expect(cleanup).toHaveBeenCalledOnce() - expect(router.serverSsr).toBeUndefined() - } finally { - errorSpy.mockRestore() - warnSpy.mockRestore() - originalServerSsr.cleanup() - } - }) - - test('request abort drops later Vue writes and terminates the response', async () => { - const vue = createManualVueStream() - rendererMocks.renderToWebStream.mockReturnValueOnce(vue.stream) - - const router = await buildRouter() - const abortController = new AbortController() - const request = new Request('http://localhost/', { - signal: abortController.signal, - }) - const addEventListener = vi.spyOn(request.signal, 'addEventListener') const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) try { const response = unwrapResponse( await renderRouterToStream({ - request, + request: new Request('http://localhost/'), router, responseHeaders: new Headers(), App: { template: '
' } as any, }), ) - expect( - addEventListener.mock.calls.filter(([type]) => type === 'abort'), - ).toHaveLength(1) - const reason = new Error('client-gone') - abortController.abort(reason) - expect(response.body).not.toBeNull() + const terminated = await Promise.race([ + drainBody(response), + new Promise((resolve) => setTimeout(() => resolve(false), 2000)), + ]) - expect(await drainBody(response)).toBe(true) - expect(vue.cancel).toHaveBeenCalledWith(reason) - expect(() => - vue.controller.enqueue(new TextEncoder().encode('
')), - ).toThrow() + expect(terminated).toBe(true) } finally { errorSpy.mockRestore() router.serverSsr?.cleanup() } }) - test('downstream cancellation stops Vue writes and cleans up once', async () => { - const vue = createManualVueStream() - rendererMocks.renderToWebStream.mockReturnValueOnce(vue.stream) - - const router = await buildRouter() - const cleanup = vi.spyOn(router.serverSsr!, 'cleanup') - const response = unwrapResponse( - await renderRouterToStream({ - request: new Request('http://localhost/'), - router, - responseHeaders: new Headers(), - App: { template: '
' } as any, - }), + test('request abort drops later Vue writes and terminates the response', async () => { + let vueWriter: WritableStreamDefaultWriter | undefined + rendererMocks.pipeToWebWritable.mockImplementationOnce( + ( + _app: unknown, + _context: unknown, + writable: WritableStream, + ) => { + vueWriter = writable.getWriter() + }, ) - await response.body!.cancel('consumer-gone') - expect(vue.cancel).toHaveBeenCalledWith('consumer-gone') - expect(() => - vue.controller.enqueue(new TextEncoder().encode('
')), - ).toThrow() - expect(cleanup).toHaveBeenCalledOnce() - expect(router.serverSsr).toBeUndefined() - }) - - test('a renderer buffer failure errors the response body', async () => { - const renderError = new Error('vue-buffer-failed') - rendererMocks.renderToWebStream.mockImplementationOnce( - actualVueServerRenderer.renderToWebStream, - ) const router = await buildRouter() - const cleanup = vi.spyOn(router.serverSsr!, 'cleanup') - router.serverSsr!.disableHydration() + const abortController = new AbortController() const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) - const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}) try { const response = unwrapResponse( await renderRouterToStream({ - request: new Request('http://localhost/'), + request: new Request('http://localhost/', { + signal: abortController.signal, + }), router, responseHeaders: new Headers(), - App: { - ssrRender(_context: unknown, push: (value: unknown) => void) { - push('partial') - push(Promise.reject(renderError)) - }, - } as any, + App: { template: '
' } as any, }), ) - await expect(response.text()).rejects.toBe(renderError) - expect(cleanup).toHaveBeenCalledOnce() - expect(router.serverSsr).toBeUndefined() + expect(vueWriter).toBeDefined() + abortController.abort(new Error('client-gone')) + + await expect( + vueWriter!.write(new TextEncoder().encode('
')), + ).resolves.toBeUndefined() + expect(response.body).not.toBeNull() + + const terminated = await Promise.race([ + drainBody(response), + new Promise((resolve) => setTimeout(() => resolve(false), 2000)), + ]) + + expect(terminated).toBe(true) } finally { errorSpy.mockRestore() - warnSpy.mockRestore() router.serverSsr?.cleanup() } }) diff --git a/packages/vue-router/tests/route.test.tsx b/packages/vue-router/tests/route.test.tsx index 6547de6634..70930e7ad4 100644 --- a/packages/vue-router/tests/route.test.tsx +++ b/packages/vue-router/tests/route.test.tsx @@ -1,4 +1,3 @@ -import { defineComponent } from 'vue' import { cleanup, render, screen } from '@testing-library/vue' import { afterEach, beforeEach, describe, expect, it, test, vi } from 'vitest' @@ -208,25 +207,17 @@ describe('onEnter event', () => { describe('useLoaderDeps', () => { test('returns a Ref', async () => { const rootRoute = createRootRoute() - const IndexComponent = defineComponent({ - setup() { - const deps = indexRoute.useLoaderDeps() - return () => { - // deps should be a Vue ref, so we access .value to get the value - expect(typeof deps).toBe('object') - - expect(deps.value).toEqual({ testDep: 'value' }) - - return
Index
- } - }, - }) - const indexRoute = createRoute({ getParentRoute: () => rootRoute, path: '/', loaderDeps: ({ search }) => ({ testDep: 'value' }), - component: IndexComponent, + component: () => { + const deps = indexRoute.useLoaderDeps() + // deps should be a Vue ref, so we access .value to get the value + expect(typeof deps).toBe('object') + expect(deps.value).toEqual({ testDep: 'value' }) + return
Index
+ }, }) const routeTree = rootRoute.addChildren([indexRoute]) const router = createRouter({ routeTree, history }) @@ -237,27 +228,18 @@ describe('useLoaderDeps', () => { test('returns a Ref via Route API', async () => { const rootRoute = createRootRoute() - const IndexComponent = defineComponent({ - setup() { - const api = getRouteApi('/') - - const deps = api.useLoaderDeps() - return () => { - // deps should be a Vue ref, so we access .value to get the value - expect(typeof deps).toBe('object') - - expect(deps.value).toEqual({ testDep: 'api-value' }) - - return
Index with API
- } - }, - }) - const indexRoute = createRoute({ getParentRoute: () => rootRoute, path: '/', loaderDeps: ({ search }) => ({ testDep: 'api-value' }), - component: IndexComponent, + component: () => { + const api = getRouteApi('/') + const deps = api.useLoaderDeps() + // deps should be a Vue ref, so we access .value to get the value + expect(typeof deps).toBe('object') + expect(deps.value).toEqual({ testDep: 'api-value' }) + return
Index with API
+ }, }) const routeTree = rootRoute.addChildren([indexRoute]) const router = createRouter({ routeTree, history }) diff --git a/packages/vue-router/tests/routeContext.test.tsx b/packages/vue-router/tests/routeContext.test.tsx index 8e37527844..53db6aa42f 100644 --- a/packages/vue-router/tests/routeContext.test.tsx +++ b/packages/vue-router/tests/routeContext.test.tsx @@ -1,4 +1,3 @@ -import { defineComponent } from 'vue' import { cleanup, fireEvent, render, screen } from '@testing-library/vue' import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest' import { z } from 'zod' @@ -72,12 +71,20 @@ describe('context function', () => { ) }, }) - const DetailComponent = defineComponent({ - setup() { + const detailRoute = createRoute({ + getParentRoute: () => rootRoute, + path: '/detail/$id', + params: { + parse: (p) => z.object({ id: z.coerce.number() }).parse(p), + stringify: (p) => ({ id: `${p.id}` }), + }, + context: (args) => { + mockContextFn(args.params) + }, + component: () => { const id = detailRoute.useParams({ select: (params) => params.id }) - const navigate = detailRoute.useNavigate() - return () => ( + return (

Detail page: {id.value}

- - - ) - }, - }) + useBlocker({ shouldBlockFn: () => false }) + + return ( + <> +

Index

+ + + + ) + } const indexRoute = createRoute({ getParentRoute: () => rootRoute, @@ -76,20 +76,19 @@ describe('useBlocker', () => { test('does not block navigation when disabled', async () => { const rootRoute = createRootRoute() - const IndexComponent = Vue.defineComponent({ - setup() { - const navigate = useNavigate() + const IndexComponent = () => { + const navigate = useNavigate() - useBlocker({ shouldBlockFn: () => true, disabled: true }) - return () => ( - <> -

Index

- - - - ) - }, - }) + useBlocker({ shouldBlockFn: () => true, disabled: true }) + + return ( + <> +

Index

+ + + + ) + } const indexRoute = createRoute({ getParentRoute: () => rootRoute, @@ -129,20 +128,19 @@ describe('useBlocker', () => { test('blocks navigation when enabled', async () => { const rootRoute = createRootRoute() - const IndexComponent = Vue.defineComponent({ - setup() { - const navigate = useNavigate() + const IndexComponent = () => { + const navigate = useNavigate() - useBlocker({ shouldBlockFn: () => true }) - return () => ( - <> -

Index

- - - - ) - }, - }) + useBlocker({ shouldBlockFn: () => true }) + + return ( + <> +

Index

+ + + + ) + } const indexRoute = createRoute({ getParentRoute: () => rootRoute, @@ -184,22 +182,21 @@ describe('useBlocker', () => { const shouldBlockFn = vi.fn().mockReturnValue(true) - const IndexComponent = Vue.defineComponent({ - setup() { - const navigate = useNavigate() + const IndexComponent = () => { + const navigate = useNavigate() - useBlocker({ shouldBlockFn }) - return () => ( - <> -

Index

- - - - ) - }, - }) + useBlocker({ shouldBlockFn }) + + return ( + <> +

Index

+ + + + ) + } const indexRoute = createRoute({ getParentRoute: () => rootRoute, @@ -259,30 +256,29 @@ describe('useBlocker', () => { const shouldBlockFn = vi.fn().mockReturnValue(true) - const IndexComponent = Vue.defineComponent({ - setup() { - const navigate = useNavigate() + const IndexComponent = () => { + const navigate = useNavigate() - useBlocker({ shouldBlockFn }) - return () => ( - <> -

Index

- - - - ) - }, - }) + useBlocker({ shouldBlockFn }) + + return ( + <> +

Index

+ + + + ) + } const indexRoute = createRoute({ getParentRoute: () => rootRoute, @@ -344,30 +340,29 @@ describe('useBlocker', () => { test('conditionally blocking navigation works', async () => { const rootRoute = createRootRoute() - const IndexComponent = Vue.defineComponent({ - setup() { - const navigate = useNavigate() + const IndexComponent = () => { + const navigate = useNavigate() - useBlocker({ - shouldBlockFn: ({ next }) => { - if (next.fullPath === '/posts') { - return true - } - return false - }, - }) - return () => ( - <> -

Index

- - - - - ) - }, - }) + useBlocker({ + shouldBlockFn: ({ next }) => { + if (next.fullPath === '/posts') { + return true + } + return false + }, + }) + + return ( + <> +

Index

+ + + + + ) + } const indexRoute = createRoute({ getParentRoute: () => rootRoute, @@ -500,12 +495,13 @@ describe('useBlocker', () => { }) test('should allow navigation from 404 page when blocker is active', async () => { - const NotFoundComponent = Vue.defineComponent({ - setup() { + const rootRoute = createRootRoute({ + notFoundComponent: function NotFoundComponent() { const navigate = useNavigate() useBlocker({ shouldBlockFn: () => true }) - return () => ( + + return ( <>

Not Found

@@ -517,10 +513,6 @@ describe('useBlocker', () => { }, }) - const rootRoute = createRootRoute({ - notFoundComponent: NotFoundComponent, - }) - const indexRoute = createRoute({ getParentRoute: () => rootRoute, path: '/', @@ -570,12 +562,13 @@ describe('useBlocker', () => { }) test('should handle blocker navigation from 404 to another 404', async () => { - const NotFoundComponent = Vue.defineComponent({ - setup() { + const rootRoute = createRootRoute({ + notFoundComponent: function NotFoundComponent() { const navigate = useNavigate() useBlocker({ shouldBlockFn: () => true }) - return () => ( + + return ( <>

Not Found

- Home - About - - - ) - } - }, - }) + return ( + <> + + Home + About + + + ) + } const rootRoute = createRootRoute({ component: RootComponent, diff --git a/packages/vue-router/tests/useMatch.test.tsx b/packages/vue-router/tests/useMatch.test.tsx index 54306dea88..7a73cdbea7 100644 --- a/packages/vue-router/tests/useMatch.test.tsx +++ b/packages/vue-router/tests/useMatch.test.tsx @@ -17,7 +17,7 @@ import { createRouter, useMatch, } from '../src' -import type { AnyRoute, RouterHistory } from '../src' +import type { RouteComponent, RouterHistory } from '../src' afterEach(() => { window.history.replaceState(null, 'root', '/') @@ -29,7 +29,7 @@ describe('useMatch', () => { RootComponent, history, }: { - RootComponent: NonNullable + RootComponent: RouteComponent history?: RouterHistory }) { const rootRoute = createRootRoute({ @@ -64,18 +64,12 @@ describe('useMatch', () => { test.each([true, false, undefined])( 'returns the match if shouldThrow = %s', async (shouldThrow) => { - const RootComponent = Vue.defineComponent({ - setup() { - const match = useMatch({ from: '/posts', shouldThrow }) - return () => { - expect(match.value).toBeDefined() - - expect(match.value!.routeId).toBe('/posts') - - return - } - }, - }) + function RootComponent() { + const match = useMatch({ from: '/posts', shouldThrow }) + expect(match.value).toBeDefined() + expect(match.value!.routeId).toBe('/posts') + return + } setup({ RootComponent, @@ -205,14 +199,12 @@ describe('useMatch', () => { loader: ({ deps }) => deps.revision, component: ItemComponent, }) - const OtherComponent = Vue.defineComponent({ - setup: () => () =>
Other route
, - }) - const otherRoute = createRoute({ getParentRoute: () => rootRoute, path: '/other', - component: OtherComponent, + component: Vue.defineComponent({ + setup: () => () =>
Other route
, + }), }) const router = createRouter({ routeTree: rootRoute.addChildren([itemRoute, otherRoute]), @@ -246,23 +238,21 @@ describe('useMatch', () => { test('an outgoing component never observes its own match disappear', async () => { const observedRouteIds: Array = [] const rootRoute = createRootRoute({ component: () => }) - const FirstComponent = Vue.defineComponent({ - setup() { - const match = useMatch({ - from: '/first', - shouldThrow: false, - }) - Vue.watchEffect(() => observedRouteIds.push(match.value?.routeId), { - flush: 'sync', - }) - return () =>
First route
- }, - }) - const firstRoute = createRoute({ getParentRoute: () => rootRoute, path: '/first', - component: FirstComponent, + component: Vue.defineComponent({ + setup() { + const match = useMatch({ + from: '/first', + shouldThrow: false, + }) + Vue.watchEffect(() => observedRouteIds.push(match.value?.routeId), { + flush: 'sync', + }) + return () =>
First route
+ }, + }), }) const nextRoute = createRoute({ getParentRoute: () => rootRoute, @@ -287,13 +277,10 @@ describe('useMatch', () => { test.each([undefined, true])( 'throws if shouldThrow = %s', async (shouldThrow) => { - const RootComponent = Vue.defineComponent({ - setup() { - useMatch({ from: '/posts', shouldThrow }) - return () => - }, - }) - + function RootComponent() { + useMatch({ from: '/posts', shouldThrow }) + return + } setup({ RootComponent }) const postsError = await screen.findByText( 'Invariant failed: Could not find an active match from "/posts"', @@ -304,17 +291,11 @@ describe('useMatch', () => { describe('returns undefined if shouldThrow = false', () => { test('without select function', async () => { - const RootComponent = Vue.defineComponent({ - setup() { - const match = useMatch({ from: 'posts', shouldThrow: false }) - return () => { - expect(match.value).toBeUndefined() - - return - } - }, - }) - + function RootComponent() { + const match = useMatch({ from: 'posts', shouldThrow: false }) + expect(match.value).toBeUndefined() + return + } setup({ RootComponent }) expect( await waitFor(() => screen.findByText('IndexTitle')), @@ -322,21 +303,11 @@ describe('useMatch', () => { }) test('with select function', async () => { const select = vi.fn() - const RootComponent = Vue.defineComponent({ - setup() { - const match = useMatch({ - from: 'posts', - shouldThrow: false, - select, - }) - return () => { - expect(match.value).toBeUndefined() - - return - } - }, - }) - + function RootComponent() { + const match = useMatch({ from: 'posts', shouldThrow: false, select }) + expect(match.value).toBeUndefined() + return + } setup({ RootComponent }) const indexTitle = await screen.findByText('IndexTitle') expect(indexTitle).toBeInTheDocument() diff --git a/packages/vue-router/tests/useNavigate.test.tsx b/packages/vue-router/tests/useNavigate.test.tsx index 7ffdb64c32..e71151863f 100644 --- a/packages/vue-router/tests/useNavigate.test.tsx +++ b/packages/vue-router/tests/useNavigate.test.tsx @@ -1,4 +1,5 @@ import * as Vue from 'vue' +import '@testing-library/jest-dom/vitest' import { afterEach, beforeEach, describe, expect, test } from 'vitest' import { cleanup, @@ -152,19 +153,16 @@ test('when navigating from /posts to ./$postId', async () => { component: PostsIndexComponent, }) - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - - const navigate = useNavigate() - return () => ( - <> - Params: {params.value.postId} - - - ) - }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + const navigate = useNavigate() + return ( + <> + Params: {params.value.postId} + + + ) + } const postRoute = createRoute({ getParentRoute: () => postsRoute, @@ -265,19 +263,16 @@ test('when navigating from /posts to ../posts/$postId', async () => { component: PostsIndexComponent, }) - const PostComponent = Vue.defineComponent({ - setup() { - const navigate = useNavigate() - - const params = useParams({ strict: false }) - return () => ( - <> - Params: {params.value.postId} - - - ) - }, - }) + const PostComponent = () => { + const navigate = useNavigate() + const params = useParams({ strict: false }) + return ( + <> + Params: {params.value.postId} + + + ) + } const postRoute = createRoute({ getParentRoute: () => postsRoute, @@ -366,17 +361,15 @@ test('when navigating from /posts/$postId to /posts/$postId/info and the current component: PostsComponent, }) - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => ( - <> - Params: {params.value.postId} - - - ) - }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return ( + <> + Params: {params.value.postId} + + + ) + } const postRoute = createRoute({ getParentRoute: () => postsRoute, @@ -513,17 +506,15 @@ test('when navigating from /posts/$postId to ./info and the current route is /po component: PostsComponent, }) - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => ( - <> - Params: {params.value.postId} - - - ) - }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return ( + <> + Params: {params.value.postId} + + + ) + } const postRoute = createRoute({ getParentRoute: () => postsRoute, @@ -658,17 +649,15 @@ test('when navigating from /posts/$postId to ../$postId and the current route is component: PostsComponent, }) - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => ( - <> - Params: {params.value.postId} - - - ) - }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return ( + <> + Params: {params.value.postId} + + + ) + } const postRoute = createRoute({ getParentRoute: () => postsRoute, @@ -801,17 +790,15 @@ test('when navigating from /posts/$postId with an index to ../$postId and the cu component: PostsComponent, }) - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => ( - <> - Params: {params.value.postId} - - - ) - }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return ( + <> + Params: {params.value.postId} + + + ) + } const postRoute = createRoute({ getParentRoute: () => postsRoute, @@ -954,17 +941,15 @@ test('when navigating from /invoices to ./invoiceId and the current route is /po component: PostsComponent, }) - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => ( - <> - Params: {params.value.postId} - - - ) - }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return ( + <> + Params: {params.value.postId} + + + ) + } const postRoute = createRoute({ getParentRoute: () => postsRoute, @@ -1030,16 +1015,14 @@ test('when navigating from /invoices to ./invoiceId and the current route is /po ), }) - const InvoiceComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => ( - <> - invoiceId: {params.value.invoiceId} - - ) - }, - }) + const InvoiceComponent = () => { + const params = useParams({ strict: false }) + return ( + <> + invoiceId: {params.value.invoiceId} + + ) + } const invoiceRoute = createRoute({ getParentRoute: () => invoicesRoute, @@ -1116,17 +1099,15 @@ test('when navigating to /posts/$postId/info which is masked as /posts/$postId', component: PostsComponent, }) - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => ( - <> - Params: {params.value.postId} - - - ) - }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return ( + <> + Params: {params.value.postId} + + + ) + } const postRoute = createRoute({ getParentRoute: () => postsRoute, @@ -1221,17 +1202,15 @@ test('when navigating to /posts/$postId/info which is imperatively masked as /po component: PostsComponent, }) - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => ( - <> - Params: {params.value.postId} - - - ) - }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return ( + <> + Params: {params.value.postId} + + + ) + } const postRoute = createRoute({ getParentRoute: () => postsRoute, @@ -1278,35 +1257,33 @@ test('when navigating to /posts/$postId/info which is imperatively masked as /po test('when setting search params with 2 parallel navigate calls', async () => { const rootRoute = createRootRoute() - const IndexComponent = Vue.defineComponent({ - setup() { - const navigate = useNavigate() + const IndexComponent = () => { + const navigate = useNavigate() + const search = indexRoute.useSearch() - const search = indexRoute.useSearch() - return () => ( - <> -

Index

-
{search.value.param1}
-
{search.value.param2}
- - - ) - }, - }) + navigate({ + to: '/', + search: (prev: any) => ({ ...prev, param2: 'bar' }), + }) + }} + > + search + + + ) + } const indexRoute = createRoute({ getParentRoute: () => rootRoute, @@ -1421,17 +1398,15 @@ describe('when on /posts/$postId and navigating to ../ with default `from` /post component: PostsComponent, }) - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => ( - <> - Params: {params.value.postId} - - - ) - }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return ( + <> + Params: {params.value.postId} + + + ) + } const postRoute = createRoute({ getParentRoute: () => postsRoute, @@ -1941,18 +1916,16 @@ describe('relative navigate to current route', () => { component: PostsComponent, }) - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => ( - <> - - Params: {params.value.postId} - - - ) - }, - }) + const PostComponent = () => { + const params = useParams({ strict: false }) + return ( + <> + + Params: {params.value.postId} + + + ) + } const postRoute = createRoute({ getParentRoute: () => postsRoute, @@ -2074,53 +2047,45 @@ describe('relative navigate to current route', () => { return [currentOpen, setModal] as const } - const DetailComponent = Vue.defineComponent({ - props: { - id: { type: String, required: true }, - }, - setup(props) { - const params = useParams({ strict: false }) - const [currentTest, setTest] = useModal('test') + function DetailComponent(props: { id: string }) { + const params = useParams({ strict: false }) + const [currentTest, setTest] = useModal('test') - return () => ( - <> -
- Post Path "/{params.value.postId}/detail-{props.id}"! -
- {currentTest.value ? ( - - ) : ( - - )} - - ) - }, - }) - - const PostComponent = Vue.defineComponent({ - setup() { - const params = useParams({ strict: false }) - return () => ( -
-
- Post "{params.value.postId}"! -
- - + return ( + <> +
+ Post Path "/{params.value.postId}/detail-{props.id}"!
- ) - }, - }) + {currentTest.value ? ( + + ) : ( + + )} + + ) + } + + const PostComponent = () => { + const params = useParams({ strict: false }) + + return ( +
+
Post "{params.value.postId}"!
+ + +
+ ) + } const postRoute = createRoute({ getParentRoute: () => postsRoute, @@ -2754,28 +2719,27 @@ describe('encoded and unicode paths', () => { ) } - const PathRouteComponent = Vue.defineComponent({ - setup() { - const params = pathRoute.useParams() - return () => ( -
-

Path Route

-

- params:{' '} - - {JSON.stringify(params.value)} - -

-
- ) - }, - }) const pathRoute = createRoute({ getParentRoute: () => rootRoute, path, component: PathRouteComponent, }) + function PathRouteComponent() { + const params = pathRoute.useParams() + return ( +
+

Path Route

+

+ params:{' '} + + {JSON.stringify(params.value)} + +

+
+ ) + } + const router = createRouter({ routeTree: rootRoute.addChildren([indexRoute, pathRoute]), history, diff --git a/packages/vue-router/tests/useParams.test.tsx b/packages/vue-router/tests/useParams.test.tsx index 75fe4c4014..0d65361056 100644 --- a/packages/vue-router/tests/useParams.test.tsx +++ b/packages/vue-router/tests/useParams.test.tsx @@ -1,4 +1,3 @@ -import { defineComponent } from 'vue' import { expect, test, vi } from 'vitest' import { fireEvent, render, screen, waitFor } from '@testing-library/vue' import { @@ -34,30 +33,6 @@ test('useParams must return parsed result if applicable.', async () => { component: PostsComponent, }) - const PostCategoryComponent = defineComponent({ - setup() { - const data = postCategoryRoute.useLoaderData() - return () => ( -
-

Post Categories

- {data.value.posts.map((post: (typeof posts)[number]) => { - const id = post.id === 1 ? 'one' : 'two' - return ( - - {post.title} - - ) - })} - -
- ) - }, - }) const postCategoryRoute = createRoute({ getParentRoute: () => postsRoute, path: 'category_{$category}', @@ -93,42 +68,6 @@ test('useParams must return parsed result if applicable.', async () => { }), }) - const PostComponent = defineComponent({ - setup() { - const params = useParams({ from: postRoute.fullPath }) - - const data = postRoute.useLoaderData() - return () => ( -
-

Post Route

-
- Category_Param:{' '} - - {params.value.category} - -
-
- PostId_Param:{' '} - {params.value.postId} -
-
- PostId:{' '} - {data.value.post.id} -
-
- Title:{' '} - {data.value.post.title} -
-
- Category:{' '} - - {data.value.post.category} - -
-
- ) - }, - }) const postRoute = createRoute({ getParentRoute: () => postCategoryRoute, path: '$postId', @@ -170,6 +109,65 @@ test('useParams must return parsed result if applicable.', async () => { ) } + function PostCategoryComponent() { + const data = postCategoryRoute.useLoaderData() + + return ( +
+

Post Categories

+ {data.value.posts.map((post: (typeof posts)[number]) => { + const id = post.id === 1 ? 'one' : 'two' + return ( + + {post.title} + + ) + })} + +
+ ) + } + + function PostComponent() { + const params = useParams({ from: postRoute.fullPath }) + + const data = postRoute.useLoaderData() + + return ( +
+

Post Route

+
+ Category_Param:{' '} + + {params.value.category} + +
+
+ PostId_Param:{' '} + {params.value.postId} +
+
+ PostId: {data.value.post.id} +
+
+ Title:{' '} + {data.value.post.title} +
+
+ Category:{' '} + + {data.value.post.category} + +
+
+ ) + } + window.history.replaceState({}, '', '/posts') const router = createRouter({ diff --git a/packages/vue-router/vite.config.ts b/packages/vue-router/vite.config.ts index 13928e0a1a..88949476fa 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/jest-dom.setup.ts', './tests/setupTests.tsx'], + setupFiles: ['./tests/setupTests.tsx'], }, }) diff --git a/packages/vue-start-client/CHANGELOG.md b/packages/vue-start-client/CHANGELOG.md index 334da56ce7..cd9f7c17a2 100644 --- a/packages/vue-start-client/CHANGELOG.md +++ b/packages/vue-start-client/CHANGELOG.md @@ -1,111 +1,5 @@ # @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 - -- Updated dependencies [[`f5ffd38`](https://github.com/TanStack/router/commit/f5ffd3884ba26778a2a8ce53b379a5bded231676), [`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f), [`0c1b5e3`](https://github.com/TanStack/router/commit/0c1b5e38de71b7e81bbf1fd81c73ee0cd68ffe47), [`3cdd1af`](https://github.com/TanStack/router/commit/3cdd1af04b3e2d6f777797ee7bddf285318dd9d2), [`76a7c0b`](https://github.com/TanStack/router/commit/76a7c0bfadb42d5f7fe7b9e1748acc7333178c91)]: - - @tanstack/vue-router@1.170.36 - - @tanstack/router-core@1.171.33 - - @tanstack/start-client-core@1.170.33 - -## 1.167.38 - -### Patch Changes - -- Updated dependencies [[`cecae54`](https://github.com/TanStack/router/commit/cecae5440b8edaea77c5448fe3d74bbd20fe10a4), [`0103578`](https://github.com/TanStack/router/commit/01035782e53af9b929c784b94ddd64b95efb89c7), [`ce10dcd`](https://github.com/TanStack/router/commit/ce10dcd4d9d3d23738744e453205aad5c6dbd716), [`84936cc`](https://github.com/TanStack/router/commit/84936cc04530bba11059c57b293a794922bbc5aa), [`bbd2336`](https://github.com/TanStack/router/commit/bbd2336b8446de3f7dd85070895e7cf43980183e)]: - - @tanstack/router-core@1.171.32 - - @tanstack/start-client-core@1.170.32 - - @tanstack/vue-router@1.170.35 - -## 1.167.37 - -### Patch Changes - -- Updated dependencies [[`bc80866`](https://github.com/TanStack/router/commit/bc80866f6d6eb3e6f152ee3682eb783c96403e83), [`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a0b2ad9`](https://github.com/TanStack/router/commit/a0b2ad99aee64af08d16b0e4ff26b3ba42a99f0a), [`1ca361b`](https://github.com/TanStack/router/commit/1ca361ba52a627d2f76ab33323bd83d1d0aa65a3)]: - - @tanstack/router-core@1.171.31 - - @tanstack/vue-router@1.170.34 - - @tanstack/start-client-core@1.170.31 - -## 1.167.36 - -### Patch Changes - -- Updated dependencies [[`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`cb8749e`](https://github.com/TanStack/router/commit/cb8749e9fcd32d2290bf6c957b2701c3c0a14da5), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5), [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef)]: - - @tanstack/router-core@1.171.30 - - @tanstack/vue-router@1.170.33 - - @tanstack/start-client-core@1.170.30 - -## 1.167.35 - -### Patch Changes - -- Updated dependencies [[`8c43c71`](https://github.com/TanStack/router/commit/8c43c712523fc63dc3a814f3a19617e270ce8ed1)]: - - @tanstack/vue-router@1.170.32 - -## 1.167.34 - -### Patch Changes - -- Updated dependencies [[`f9836f1`](https://github.com/TanStack/router/commit/f9836f16f0e25b0a8495f5e01e3f303b1cbc8725), [`9c1871c`](https://github.com/TanStack/router/commit/9c1871ccc88bc1157186b8b460941a304ec740b8), [`9871c06`](https://github.com/TanStack/router/commit/9871c0625806001d6bf373524821a00303438a91), [`0654c0a`](https://github.com/TanStack/router/commit/0654c0a1a427db24d9af13c1d6ad1217a588c0c9)]: - - @tanstack/router-core@1.171.29 - - @tanstack/vue-router@1.170.31 - - @tanstack/start-client-core@1.170.29 - ## 1.167.33 ### Patch Changes diff --git a/packages/vue-start-client/package.json b/packages/vue-start-client/package.json index 74b8016924..d41f6fd304 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.45", + "version": "1.167.33", "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 0963c82fe8..bfe3799b5a 100644 --- a/packages/vue-start-server/CHANGELOG.md +++ b/packages/vue-start-server/CHANGELOG.md @@ -1,145 +1,5 @@ # @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 - -- Updated dependencies [[`f5ffd38`](https://github.com/TanStack/router/commit/f5ffd3884ba26778a2a8ce53b379a5bded231676), [`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f), [`e81845f`](https://github.com/TanStack/router/commit/e81845ff1e4fc66d4e4a87f086be65906f7adb94), [`0c1b5e3`](https://github.com/TanStack/router/commit/0c1b5e38de71b7e81bbf1fd81c73ee0cd68ffe47), [`3cdd1af`](https://github.com/TanStack/router/commit/3cdd1af04b3e2d6f777797ee7bddf285318dd9d2)]: - - @tanstack/vue-router@1.170.36 - - @tanstack/router-core@1.171.33 - - @tanstack/start-server-core@1.169.38 - -## 1.167.42 - -### Patch Changes - -- Updated dependencies [[`cecae54`](https://github.com/TanStack/router/commit/cecae5440b8edaea77c5448fe3d74bbd20fe10a4), [`0103578`](https://github.com/TanStack/router/commit/01035782e53af9b929c784b94ddd64b95efb89c7), [`ce10dcd`](https://github.com/TanStack/router/commit/ce10dcd4d9d3d23738744e453205aad5c6dbd716), [`84936cc`](https://github.com/TanStack/router/commit/84936cc04530bba11059c57b293a794922bbc5aa), [`bbd2336`](https://github.com/TanStack/router/commit/bbd2336b8446de3f7dd85070895e7cf43980183e)]: - - @tanstack/router-core@1.171.32 - - @tanstack/start-server-core@1.169.37 - - @tanstack/vue-router@1.170.35 - -## 1.167.41 - -### Patch Changes - -- [#8204](https://github.com/TanStack/router/pull/8204) [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26) - Stream large deferred SSR hydration payloads through a backpressure-aware router transport, fail known setup errors before response creation, and close cancelled or expired transforms safely. - - Start now cancels discarded middleware and HEAD response bodies, including plain streams and derived branches. - - Server-function raw streams share one ordered response. Arbitrary or sequential consumption can require potentially unbounded buffering of unread data on the client. Cancelling one raw stream discards it locally, while aborting the whole call cancels the response and server work. Consume streams concurrently, cancel unused streams promptly, or use separate calls when independent backpressure is required. A raw stream that exceeds its unread-byte limit now fails alone; sibling streams and the JSON result keep flowing. - - The JSON wire shape of a `RawStream` server-function argument changed. Clients and servers must run matching versions for requests that pass a `RawStream`. - - The frame-protocol constants (`FRAME_TYPE_*`, `MAX_FRAME_PAYLOAD_SIZE`, `MAX_FRAMED_STREAMS`) moved from the `@tanstack/start-client-core` root to the `@tanstack/start-client-core/client-rpc` subpath. - - Router requests whose `Accept` header allows neither `text/html` nor `*/*` now receive `406 Not Acceptable` instead of `500`. - - Framework adapters share the body `` composition (`getSsrBodyScriptParts`, `composeSsrBodyScripts`) and the eager HTML response wrapper (`renderSsrHtmlResponse`) from `@tanstack/router-core`. - - Solid SSR now emits one document type and renders late lazy errors through route boundaries. A Solid `` without a `fallback` no longer holds the streamed shell; it renders inside the nearest `` boundary like React and Vue, and now renders falsy resolved values. - - Static server functions decode cached `RawStream` values with the client deserializer plugins. - - SSR Query integrations now keep request cleanup and stream ownership aligned with the router lifecycle. - -- Updated dependencies [[`bc80866`](https://github.com/TanStack/router/commit/bc80866f6d6eb3e6f152ee3682eb783c96403e83), [`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a0b2ad9`](https://github.com/TanStack/router/commit/a0b2ad99aee64af08d16b0e4ff26b3ba42a99f0a), [`1ca361b`](https://github.com/TanStack/router/commit/1ca361ba52a627d2f76ab33323bd83d1d0aa65a3)]: - - @tanstack/router-core@1.171.31 - - @tanstack/vue-router@1.170.34 - - @tanstack/start-server-core@1.169.36 - -## 1.167.40 - -### Patch Changes - -- Updated dependencies [[`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`b747fb8`](https://github.com/TanStack/router/commit/b747fb8891b3347b1ffdfe0fa81e7d15049cb776), [`6cfb1e8`](https://github.com/TanStack/router/commit/6cfb1e8b564be282584765352250bf61747895ed), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`cb8749e`](https://github.com/TanStack/router/commit/cb8749e9fcd32d2290bf6c957b2701c3c0a14da5), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`873c830`](https://github.com/TanStack/router/commit/873c830ccb2610a864ee697250e10fcc99772ffa), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`f151ab0`](https://github.com/TanStack/router/commit/f151ab018eede64ae849b77e68f3cdf31cb95cc5), [`bc57fa3`](https://github.com/TanStack/router/commit/bc57fa3f12450cf34c731450947c7c8f1ea05e58), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`d76a332`](https://github.com/TanStack/router/commit/d76a33284bc0668f7af4c972a6d32bd0f42b22a6), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`7e349c3`](https://github.com/TanStack/router/commit/7e349c3071ef7a346698d320fc0989998ad55734), [`9448caa`](https://github.com/TanStack/router/commit/9448caa03a89076b9770631c356c0cc502802c09), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`700a714`](https://github.com/TanStack/router/commit/700a714c5fb64199b4edfaa3273d230c9894e274), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef)]: - - @tanstack/router-core@1.171.30 - - @tanstack/vue-router@1.170.33 - - @tanstack/start-server-core@1.169.35 - -## 1.167.39 - -### Patch Changes - -- Updated dependencies [[`8c43c71`](https://github.com/TanStack/router/commit/8c43c712523fc63dc3a814f3a19617e270ce8ed1), [`d914b08`](https://github.com/TanStack/router/commit/d914b085bb4bf29ec18a531201e377c10681b661)]: - - @tanstack/vue-router@1.170.32 - - @tanstack/start-server-core@1.169.34 - -## 1.167.38 - -### Patch Changes - -- Updated dependencies [[`f9836f1`](https://github.com/TanStack/router/commit/f9836f16f0e25b0a8495f5e01e3f303b1cbc8725), [`9c1871c`](https://github.com/TanStack/router/commit/9c1871ccc88bc1157186b8b460941a304ec740b8), [`9871c06`](https://github.com/TanStack/router/commit/9871c0625806001d6bf373524821a00303438a91), [`0654c0a`](https://github.com/TanStack/router/commit/0654c0a1a427db24d9af13c1d6ad1217a588c0c9)]: - - @tanstack/router-core@1.171.29 - - @tanstack/vue-router@1.170.31 - - @tanstack/start-server-core@1.169.33 - ## 1.167.37 ### Patch Changes diff --git a/packages/vue-start-server/package.json b/packages/vue-start-server/package.json index 4fc4c1c9fd..b87417269d 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.50", + "version": "1.167.37", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/vue-start-server/src/defaultStreamHandler.tsx b/packages/vue-start-server/src/defaultStreamHandler.tsx index c02aeb8c6c..2eb8c09f82 100644 --- a/packages/vue-start-server/src/defaultStreamHandler.tsx +++ b/packages/vue-start-server/src/defaultStreamHandler.tsx @@ -5,8 +5,8 @@ import { import { StartServer } from './StartServer' export const defaultStreamHandler = defineHandlerCallback( - ({ request, router, responseHeaders }) => - renderRouterToStream({ + async ({ request, router, responseHeaders }) => + await renderRouterToStream({ request, router, responseHeaders, diff --git a/packages/vue-start/CHANGELOG.md b/packages/vue-start/CHANGELOG.md index 2e781d8694..7329cfa21c 100644 --- a/packages/vue-start/CHANGELOG.md +++ b/packages/vue-start/CHANGELOG.md @@ -1,207 +1,5 @@ # @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 - -- Updated dependencies [[`f5ffd38`](https://github.com/TanStack/router/commit/f5ffd3884ba26778a2a8ce53b379a5bded231676), [`488d046`](https://github.com/TanStack/router/commit/488d046a907d330429e2c807ef95326dad87480f), [`e81845f`](https://github.com/TanStack/router/commit/e81845ff1e4fc66d4e4a87f086be65906f7adb94), [`76a7c0b`](https://github.com/TanStack/router/commit/76a7c0bfadb42d5f7fe7b9e1748acc7333178c91)]: - - @tanstack/vue-router@1.170.36 - - @tanstack/start-client-core@1.170.33 - - @tanstack/start-server-core@1.169.38 - - @tanstack/start-plugin-core@1.171.48 - - @tanstack/vue-start-client@1.167.39 - - @tanstack/vue-start-server@1.167.43 - -## 1.168.54 - -### Patch Changes - -- Updated dependencies [[`222300b`](https://github.com/TanStack/router/commit/222300b82fe6f2a5e7e7f460ae21a2e35c6230d7)]: - - @tanstack/start-plugin-core@1.171.47 - -## 1.168.53 - -### Patch Changes - -- Updated dependencies []: - - @tanstack/start-client-core@1.170.32 - - @tanstack/start-plugin-core@1.171.46 - - @tanstack/start-server-core@1.169.37 - - @tanstack/vue-router@1.170.35 - - @tanstack/vue-start-client@1.167.38 - - @tanstack/vue-start-server@1.167.42 - -## 1.168.52 - -### Patch Changes - -- Updated dependencies [[`e561fa1`](https://github.com/TanStack/router/commit/e561fa1d7118e3d29267cc3b6ce1130d6581f387), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26), [`a1c8d1a`](https://github.com/TanStack/router/commit/a1c8d1aa759c227eae9601a030321ac4c53c24bd), [`cbbfbe3`](https://github.com/TanStack/router/commit/cbbfbe37ab1dbe328c343cb437c5660769cc9f26)]: - - @tanstack/vue-router@1.170.34 - - @tanstack/start-plugin-core@1.171.45 - - @tanstack/start-client-core@1.170.31 - - @tanstack/start-server-core@1.169.36 - - @tanstack/vue-start-server@1.167.41 - - @tanstack/vue-start-client@1.167.37 - -## 1.168.51 - -### Patch Changes - -- Updated dependencies [[`ab99818`](https://github.com/TanStack/router/commit/ab99818225835a1553a9f3513cd2093ff1b257be)]: - - @tanstack/start-plugin-core@1.171.44 - -## 1.168.50 - -### Patch Changes - -- Updated dependencies [[`cb8749e`](https://github.com/TanStack/router/commit/cb8749e9fcd32d2290bf6c957b2701c3c0a14da5), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8), [`634da91`](https://github.com/TanStack/router/commit/634da9176e16fa8aa49af459bbb054fcae7d85ef), [`e9396c9`](https://github.com/TanStack/router/commit/e9396c928945d1dd6fd3f3bd8052143794f688b5), [`9872d2a`](https://github.com/TanStack/router/commit/9872d2ac39fc05f4ef6566c0b421f71ceb115244), [`9b2adaf`](https://github.com/TanStack/router/commit/9b2adaf8c3fca905f156c42f6a4fe17a787afcc8)]: - - @tanstack/vue-router@1.170.33 - - @tanstack/start-server-core@1.169.35 - - @tanstack/start-client-core@1.170.30 - - @tanstack/start-plugin-core@1.171.43 - - @tanstack/vue-start-client@1.167.36 - - @tanstack/vue-start-server@1.167.40 - -## 1.168.49 - -### Patch Changes - -- Updated dependencies [[`8c43c71`](https://github.com/TanStack/router/commit/8c43c712523fc63dc3a814f3a19617e270ce8ed1), [`d914b08`](https://github.com/TanStack/router/commit/d914b085bb4bf29ec18a531201e377c10681b661)]: - - @tanstack/vue-router@1.170.32 - - @tanstack/start-server-core@1.169.34 - - @tanstack/vue-start-client@1.167.35 - - @tanstack/vue-start-server@1.167.39 - - @tanstack/start-plugin-core@1.171.42 - -## 1.168.48 - -### Patch Changes - -- Updated dependencies [[`49bcd4d`](https://github.com/TanStack/router/commit/49bcd4db743dba4a783d5533a42a0f97a5721292), [`9c1871c`](https://github.com/TanStack/router/commit/9c1871ccc88bc1157186b8b460941a304ec740b8), [`919c397`](https://github.com/TanStack/router/commit/919c3971493374cccc963e75b9b2a4e98ebf878a)]: - - @tanstack/start-plugin-core@1.171.41 - - @tanstack/vue-router@1.170.31 - - @tanstack/start-server-core@1.169.33 - - @tanstack/start-client-core@1.170.29 - - @tanstack/vue-start-client@1.167.34 - - @tanstack/vue-start-server@1.167.38 - ## 1.168.47 ### Patch Changes diff --git a/packages/vue-start/package.json b/packages/vue-start/package.json index bf6b79e636..7981a757f8 100644 --- a/packages/vue-start/package.json +++ b/packages/vue-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/vue-start", - "version": "1.169.6", + "version": "1.168.47", "description": "Modern and scalable routing for Vue applications", "author": "Tanner Linsley", "license": "MIT", @@ -135,8 +135,8 @@ "rimraf": "catalog:" }, "peerDependencies": { - "@rsbuild/core": "^2.0.5", - "vite": ">=8.0.0", + "@rsbuild/core": "^2.0.0", + "vite": ">=7.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 3a32dc169a..fde7f32ace 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 `@tanstack/start-client-core#start-core` first for foundational concepts. +This skill builds on start-core. Read [start-core](../../../start-client-core/skills/start-core/SKILL.md) 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`) are imported from `@tanstack/vue-start/server`. +Server utilities (`getRequest`, `getRequestHeader`, `setResponseHeader`, `setCookie`, `getCookie`, `useSession`) are imported from `@tanstack/vue-start/server`. ## Full Project Setup @@ -151,23 +151,20 @@ function RootComponent() { ```tsx import { createFileRoute } from '@tanstack/vue-router' import { createServerFn } from '@tanstack/vue-start' -import { defineComponent } from 'vue' const getGreeting = createServerFn({ method: 'GET' }).handler(async () => { return 'Hello from TanStack Start!' }) -const HomePage = defineComponent({ - setup() { - const greeting = Route.useLoaderData() - return () =>

{greeting.value}

- }, -}) - export const Route = createFileRoute('/')({ loader: () => getGreeting(), component: HomePage, }) + +function HomePage() { + const greeting = Route.useLoaderData() + return

{greeting.value}

+} ``` ## useServerFn Composable @@ -303,6 +300,6 @@ function RootComponent() { ## Cross-References -- `@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 +- [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 diff --git a/packages/vue-start/src/default-entry/server.ts b/packages/vue-start/src/default-entry/server.ts index c716a7ac14..5729a469d3 100644 --- a/packages/vue-start/src/default-entry/server.ts +++ b/packages/vue-start/src/default-entry/server.ts @@ -1,7 +1,6 @@ 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' @@ -11,8 +10,12 @@ 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 } -// Bind the shared request context and fallback error handling to Vue's Register. -export const createServerEntry: (entry: ServerEntry) => ServerEntry = - createCoreServerEntry +export function createServerEntry(entry: ServerEntry): ServerEntry { + return { + async fetch(...args) { + return await entry.fetch(...args) + }, + } +} export default createServerEntry({ fetch }) diff --git a/packages/vue-start/src/plugin/vite.ts b/packages/vue-start/src/plugin/vite.ts index d257ce7256..4af970a088 100644 --- a/packages/vue-start/src/plugin/vite.ts +++ b/packages/vue-start/src/plugin/vite.ts @@ -39,14 +39,6 @@ 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 36abe0f239..d59ec207fc 100644 --- a/packages/zod-adapter/tests/index.test.tsx +++ b/packages/zod-adapter/tests/index.test.tsx @@ -9,6 +9,7 @@ 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 deleted file mode 100644 index 8f7cbf15be..0000000000 --- a/packages/zod-adapter/tests/jest-dom.setup.ts +++ /dev/null @@ -1,18 +0,0 @@ -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 8d553e0a59..8c8c0c519f 100644 --- a/packages/zod-adapter/vite.config.ts +++ b/packages/zod-adapter/vite.config.ts @@ -9,7 +9,6 @@ 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 4328f4fab6..36d3141698 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,161 +1,3 @@ ---- -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: @@ -177,26 +19,26 @@ catalogs: specifier: ^1.26.2 version: 1.26.2 '@rsbuild/core': - specifier: ^2.3.1 - version: 2.3.1 + specifier: ^2.1.0 + version: 2.1.1 '@tanstack/vite-config': specifier: 0.5.2 version: 0.5.2 '@testing-library/jest-dom': - specifier: ^7.0.1 - version: 7.0.1 + specifier: ^6.6.3 + version: 6.6.3 '@testing-library/react': specifier: ^16.2.0 version: 16.3.0 '@vitejs/plugin-react': - specifier: ^6.0.1 - version: 6.0.1 + specifier: ^4.3.4 + version: 4.7.0 '@vitejs/plugin-vue-jsx': specifier: ^4.1.2 version: 4.2.0 '@vitest/ui': - specifier: ^5.0.4 - version: 5.0.4 + specifier: ^4.1.4 + version: 4.1.4 chokidar: specifier: ^5.0.0 version: 5.0.0 @@ -231,8 +73,8 @@ catalogs: specifier: 2.11.10 version: 2.11.10 vitest: - specifier: ^5.0.4 - version: 5.0.4 + specifier: ^4.1.4 + version: 4.1.4 vue: specifier: ^3.5.25 version: 3.5.25 @@ -244,14 +86,14 @@ overrides: '@types/babel__traverse': ^7.28.0 vite-plugin-dts: 4.2.3 solid-js: 1.9.12 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 eslint: ^9.22.0 - vite: ^8.3.4 + vite: ^8.0.14 '@types/node': 25.0.9 - '@playwright/test': ^1.63.0 + '@playwright/test': ^1.61.0 '@tanstack/query-core': ^5.102.0 '@tanstack/react-query': ^5.102.0 '@tanstack/solid-query': ^5.102.0 @@ -294,6 +136,7 @@ overrides: '@tanstack/eslint-plugin-router': workspace:* '@tanstack/router-utils': workspace:* '@tanstack/start-static-server-functions': workspace:* + '@tanstack/nitro-v2-vite-plugin': workspace:* importers: @@ -306,17 +149,17 @@ importers: specifier: ^2.30.0 version: 2.30.0(@types/node@25.0.9) '@nx/devkit': - 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))) + specifier: 22.7.5 + version: 22.7.5(nx@22.7.5(@swc-node/register@1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)(@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))(debug@4.4.3(supports-color@10.2.2))) '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@swc-node/register': specifier: ^1.11.1 - 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) + version: 1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)(@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/typescript6@6.0.2)(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2))(supports-color@10.2.2) + 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@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) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -328,13 +171,13 @@ importers: 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(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2)) + 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@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))(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: 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)) + specifier: 22.7.5 + version: 22.7.5(@swc-node/register@1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)(@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))(debug@4.4.3(supports-color@10.2.2)) prettier: specifier: ^3.8.0 version: 3.8.1 @@ -357,14 +200,14 @@ importers: specifier: npm:typescript@5.9 version: typescript@5.9.3 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.9) + version: 5.102.0(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../packages/react-router @@ -387,11 +230,11 @@ importers: specifier: workspace:* version: link:../../packages/vue-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) solid-js: specifier: 1.9.12 version: 1.9.12 @@ -400,11 +243,11 @@ importers: version: 3.5.25(@typescript/typescript6@6.0.2) devDependencies: '@rsbuild/core': - specifier: ^2.3.1 - version: 2.3.1 + specifier: ^2.1.0 + version: 2.1.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)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.1.1(@swc/helpers@0.5.23)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../packages/router-plugin @@ -419,22 +262,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.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)) + 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)) '@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)) + 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)) '@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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) benchmarks/client-nav: dependencies: @@ -454,11 +297,11 @@ importers: specifier: workspace:* version: link:../../packages/vue-router react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) solid-js: specifier: 1.9.12 version: 1.9.12 @@ -467,8 +310,8 @@ importers: version: 3.5.25(@typescript/typescript6@6.0.2) devDependencies: '@codspeed/vitest-plugin': - 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) + specifier: ^5.5.0 + version: 5.5.0(debug@4.4.3(supports-color@10.2.2))(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) '@platformatic/flame': specifier: ^1.6.0 version: 1.6.0 @@ -477,7 +320,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.9(react@19.2.9))(react@19.2.9) + 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) '@types/jsdom': specifier: 28.0.0 version: 28.0.0 @@ -492,13 +335,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.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)) + 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)) '@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)) + 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)) '@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)) + 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)) jsdom: specifier: ^29.1.1 version: 29.1.1(@noble/hashes@2.0.1) @@ -506,14 +349,14 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) vitest: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.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)) benchmarks/memory/client: dependencies: @@ -530,11 +373,11 @@ importers: specifier: workspace:* version: link:../../../packages/vue-router react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) solid-js: specifier: 1.9.12 version: 1.9.12 @@ -543,8 +386,8 @@ importers: version: 3.5.25(@typescript/typescript6@6.0.2) devDependencies: '@codspeed/vitest-plugin': - 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) + specifier: ^5.5.0 + version: 5.5.0(debug@4.4.3(supports-color@10.2.2))(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) '@datadog/pprof': specifier: ^5.13.2 version: 5.13.2 @@ -553,7 +396,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.9(react@19.2.9))(react@19.2.9) + 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) '@types/jsdom': specifier: 28.0.0 version: 28.0.0 @@ -568,13 +411,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.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)) + 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)) '@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)) + 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)) '@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)) + 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)) jsdom: specifier: 29.1.1 version: 29.1.1(@noble/hashes@2.0.1) @@ -582,14 +425,14 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) vitest: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.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)) benchmarks/memory/server: dependencies: @@ -612,11 +455,11 @@ importers: specifier: workspace:* version: link:../../../packages/vue-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) solid-js: specifier: 1.9.12 version: 1.9.12 @@ -625,8 +468,8 @@ importers: version: 3.5.25(@typescript/typescript6@6.0.2) devDependencies: '@codspeed/vitest-plugin': - 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) + specifier: ^5.5.0 + version: 5.5.0(debug@4.4.3(supports-color@10.2.2))(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) '@datadog/pprof': specifier: ^5.13.2 version: 5.13.2 @@ -641,10 +484,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.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)) + 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)) '@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)) + 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)) jsdom: specifier: 29.1.1 version: 29.1.1(@noble/hashes@2.0.1) @@ -652,14 +495,14 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) vitest: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.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)) benchmarks/ssr: dependencies: @@ -682,11 +525,11 @@ importers: specifier: workspace:* version: link:../../packages/vue-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) solid-js: specifier: 1.9.12 version: 1.9.12 @@ -695,8 +538,8 @@ importers: version: 3.5.25(@typescript/typescript6@6.0.2) devDependencies: '@codspeed/vitest-plugin': - 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) + specifier: ^5.5.0 + version: 5.5.0(debug@4.4.3(supports-color@10.2.2))(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) '@types/react': specifier: ^19.2.8 version: 19.2.9 @@ -705,49 +548,43 @@ 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.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)) + 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)) '@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)) + 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)) jsdom: specifier: 29.1.1 version: 29.1.1(@noble/hashes@2.0.1) seroval: - specifier: ^1.6.7 - version: 1.6.7 + specifier: ^1.6.2 + version: 1.6.2 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) vitest: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.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)) e2e/e2e-utils: devDependencies: - '@msw/playwright': - specifier: 0.6.7 - version: 0.6.7(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2)) - msw: - specifier: 2.15.0 - version: 2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2) + get-port-please: + specifier: ^3.2.0 + version: 3.2.0 rimraf: specifier: 'catalog:' version: 6.1.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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@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: 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)) + 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)) e2e/eslint-plugin-start: devDependencies: @@ -773,14 +610,14 @@ importers: specifier: ^9.22.0 version: 9.22.0(jiti@2.7.0)(supports-color@10.2.2) react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 typescript: specifier: ^5.7.2 version: 5.9.2 vitest: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.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)) e2e/react-router/basepath-file-based: dependencies: @@ -794,15 +631,15 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -814,16 +651,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -831,24 +668,21 @@ importers: specifier: workspace:^ version: link:../../../packages/react-router-devtools react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) 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 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -860,10 +694,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/basic-esbuild-file-based: dependencies: @@ -877,11 +711,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -890,8 +724,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -909,7 +743,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -920,11 +754,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -936,8 +770,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -949,19 +783,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.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)) + 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)) combinate: specifier: ^1.1.11 version: 1.1.11 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -972,11 +806,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -988,8 +822,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1001,22 +835,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.9) + version: 5.102.0(react@19.2.3) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.9))(react@19.2.9) + version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.3))(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -1024,11 +858,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-devtools react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -1037,8 +871,8 @@ importers: version: 4.2.2 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1050,22 +884,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.9) + version: 5.102.0(react@19.2.3) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.9))(react@19.2.9) + version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.3))(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -1076,11 +910,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -1092,8 +926,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1105,16 +939,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -1123,13 +957,13 @@ importers: version: link:../../../packages/react-router-devtools '@tanstack/react-virtual': specifier: ^3.13.0 - version: 3.13.0(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + version: 3.13.0(react-dom@19.2.3(react@19.2.3))(react@19.2.3) react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -1138,8 +972,8 @@ importers: version: 4.2.2 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1151,19 +985,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.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)) + 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)) typescript: specifier: ~5.9.0 version: 5.9.3 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -1177,11 +1011,11 @@ importers: specifier: workspace:* version: link:../../../packages/virtual-file-routes react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -1193,8 +1027,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1206,16 +1040,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -1229,11 +1063,11 @@ importers: specifier: workspace:* version: link:../../../packages/virtual-file-routes react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -1245,8 +1079,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1258,10 +1092,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/escaped-special-strings: dependencies: @@ -1272,15 +1106,15 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1292,16 +1126,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -1312,11 +1146,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-cli react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -1325,8 +1159,8 @@ importers: version: 4.2.2 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1338,25 +1172,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -1365,8 +1199,8 @@ importers: specifier: ^2.4.0 version: 2.4.0(babel-plugin-macros@3.1.0) '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1387,13 +1221,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/issue-4759: dependencies: @@ -1401,15 +1235,15 @@ importers: specifier: workspace:* version: link:../../../packages/react-router react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1421,10 +1255,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/issue-7120: dependencies: @@ -1435,15 +1269,15 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1455,16 +1289,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.9) + version: 5.102.0(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -1472,15 +1306,15 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1492,16 +1326,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -1509,11 +1343,11 @@ importers: specifier: workspace:^ version: link:../../../packages/react-router-devtools react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -1522,8 +1356,8 @@ importers: version: 4.2.2 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1538,10 +1372,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/match-params: dependencies: @@ -1549,15 +1383,15 @@ importers: specifier: workspace:* version: link:../../../packages/react-router react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1568,8 +1402,8 @@ importers: specifier: ^19.2.3 version: 19.2.3(@types/react@19.2.9) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/react-compiler: dependencies: @@ -1577,21 +1411,21 @@ importers: specifier: workspace:* version: link:../../../packages/react-router react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@babel/core': specifier: ^7.29.0 version: 7.29.0(supports-color@10.2.2) '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@rolldown/plugin-babel': specifier: ^0.2.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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1603,13 +1437,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.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)) + 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)) babel-plugin-react-compiler: specifier: ^1.0.0 version: 1.0.0 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-router/rspack-basic-file-based: dependencies: @@ -1620,24 +1454,24 @@ importers: specifier: workspace:^ version: link:../../../packages/react-router-devtools react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: 'catalog:' version: 0.5.1 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@rsbuild/core': - specifier: ^2.3.1 - version: 2.3.1 + specifier: ^2.1.0 + version: 2.1.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)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.1.1(@swc/helpers@0.5.23)) '@tailwindcss/postcss': specifier: ^4.2.2 version: 4.2.2 @@ -1675,24 +1509,24 @@ importers: specifier: workspace:^ version: link:../../../packages/react-router-devtools react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: 'catalog:' version: 0.5.1 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@rsbuild/core': - specifier: ^2.3.1 - version: 2.3.1 + specifier: ^2.1.0 + version: 2.1.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)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.1.1(@swc/helpers@0.5.23)) '@tailwindcss/postcss': specifier: ^4.2.2 version: 4.2.2 @@ -1728,7 +1562,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -1739,11 +1573,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -1755,8 +1589,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1768,16 +1602,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.9) + version: 10.32.0(react@19.2.3) '@sentry/tracing': specifier: ^7.120.4 version: 7.120.4 @@ -1786,7 +1620,7 @@ importers: version: 4.6.1(supports-color@10.2.2) '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -1794,11 +1628,11 @@ importers: specifier: workspace:^ version: link:../../../packages/react-router-devtools react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -1807,8 +1641,8 @@ importers: version: 4.2.2 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1820,16 +1654,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -1840,11 +1674,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -1856,8 +1690,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1872,13 +1706,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/basic: dependencies: @@ -1897,18 +1731,15 @@ 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.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -1917,20 +1748,20 @@ importers: version: 3.6.0 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@rsbuild/core': - specifier: ^2.3.1 - version: 2.3.1 + specifier: ^2.1.0 + version: 2.1.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)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.1.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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -1951,13 +1782,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.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)) + 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)) combinate: specifier: ^1.1.11 version: 1.1.11 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -1965,8 +1796,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) zod: specifier: ^4.4.3 version: 4.4.3 @@ -1981,7 +1812,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.9(react@19.2.9))(react@19.2.9)) + 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)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -1991,15 +1822,12 @@ 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.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -2008,11 +1836,11 @@ importers: version: 3.6.0 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2030,13 +1858,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.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)) + 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)) 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.9(react@19.2.9))(react@19.2.9) + 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) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -2044,8 +1872,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/basic-cloudflare: dependencies: @@ -2059,21 +1887,21 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@cloudflare/vite-plugin': specifier: ^1.29.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) + 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) '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2091,7 +1919,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.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)) + 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)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -2099,8 +1927,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) wrangler: specifier: ^4.74.0 version: 4.75.0 @@ -2109,10 +1937,10 @@ importers: dependencies: '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.9) + version: 5.102.0(react@19.2.3) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.9))(react@19.2.9) + version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.3))(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -2126,11 +1954,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -2142,11 +1970,11 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2164,10 +1992,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.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)) + 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)) srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -2175,8 +2003,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/basic-tsr-config: dependencies: @@ -2187,11 +2015,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@tanstack/router-e2e-utils': specifier: workspace:^ @@ -2212,20 +2040,20 @@ importers: specifier: 'catalog:' version: 6.1.2 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.9(react@19.2.9))(react@19.2.9) + 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) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -2236,11 +2064,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -2249,11 +2077,11 @@ importers: version: 3.6.0 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2271,7 +2099,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.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)) + 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)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -2279,8 +2107,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/csp: dependencies: @@ -2291,15 +2119,15 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2316,14 +2144,14 @@ importers: specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/css-inline: dependencies: @@ -2337,24 +2165,24 @@ importers: specifier: ^5.2.1 version: 5.2.1(supports-color@10.2.2) react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.15 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@rsbuild/core': - specifier: ^2.3.1 - version: 2.3.1 + specifier: ^2.1.0 + version: 2.1.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)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.1.1(@swc/helpers@0.5.23)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2372,13 +2200,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/css-modules: dependencies: @@ -2389,27 +2217,18 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@cloudflare/vite-plugin': specifier: ^1.29.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) + 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) '@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) + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:* version: link:../../e2e-utils @@ -2427,28 +2246,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.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) + 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)) nitro: - 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) + specifier: ^3.0.260311-beta + version: 3.0.260311-beta(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)(@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)) sass: specifier: ^1.97.2 version: 1.97.2 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) wrangler: specifier: ^4.74.0 version: 4.75.0 @@ -2468,21 +2281,21 @@ importers: specifier: ^5.2.1 version: 5.2.1(supports-color@10.2.2) react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: 'catalog:' version: 0.5.1 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2503,13 +2316,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.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)) + 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)) cross-env: specifier: ^10.0.0 version: 10.0.0 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -2520,8 +2333,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/custom-server-rsbuild: dependencies: @@ -2535,21 +2348,21 @@ importers: specifier: ^5.2.1 version: 5.2.1(supports-color@10.2.2) react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@rsbuild/core': - specifier: ^2.3.1 - version: 2.3.1 + specifier: ^2.1.0 + version: 2.1.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)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.1.1(@swc/helpers@0.5.23)) '@tailwindcss/postcss': specifier: ^4.2.2 version: 4.2.2 @@ -2575,8 +2388,8 @@ importers: specifier: ^10.0.0 version: 10.0.0 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.15 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -2596,18 +2409,18 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@rsbuild/core': - specifier: ^2.3.1 - version: 2.3.1 + specifier: ^2.1.0 + version: 2.1.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)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.1.1(@swc/helpers@0.5.23)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2625,16 +2438,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.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)) + 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)) srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.15 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/dev-ssr-styles: dependencies: @@ -2645,15 +2458,15 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-core': specifier: workspace:* version: link:../../../packages/router-core @@ -2674,19 +2487,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.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)) + 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)) nitro: - specifier: ^3.0.260903-beta - version: 3.0.260903-beta + specifier: ^3.0.260311-beta + version: 3.0.260311-beta(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)(@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)) srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) zod: specifier: ^4.4.3 version: 4.4.3 @@ -2700,15 +2513,15 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2729,13 +2542,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.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)) + 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)) node-forge: specifier: ^1.3.1 version: 1.3.1 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: 0.11.15 + version: 0.11.15 tsx: specifier: 4.20.3 version: 4.20.3 @@ -2743,8 +2556,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/flamegraph-bench: dependencies: @@ -2755,14 +2568,14 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 devDependencies: '@platformatic/flame': specifier: latest @@ -2772,7 +2585,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.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)) + 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)) autocannon: specifier: ^8.0.0 version: 8.0.0 @@ -2780,14 +2593,14 @@ importers: specifier: 9.2.1 version: 9.2.1 nitro: - specifier: ^3.0.260903-beta - version: 3.0.260903-beta + specifier: ^3.0.260311-beta + version: 3.0.260311-beta(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)(@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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/hmr: dependencies: @@ -2798,27 +2611,27 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@rsbuild/core': - specifier: ^2.3.1 - version: 2.3.1 + specifier: ^2.1.0 + version: 2.1.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)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.1.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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2836,7 +2649,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.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)) + 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)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -2844,8 +2657,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/i18n-paraglide: dependencies: @@ -2859,21 +2672,21 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@inlang/paraglide-js': specifier: ^2.4.0 version: 2.4.0(babel-plugin-macros@3.1.0) '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2891,7 +2704,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.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)) + 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)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -2899,8 +2712,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/import-protection: dependencies: @@ -2911,24 +2724,24 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) react-tweet: specifier: ^3.3.0 - version: 3.3.0(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + version: 3.3.0(react-dom@19.2.3(react@19.2.3))(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@rsbuild/core': - specifier: ^2.3.1 - version: 2.3.1 + specifier: ^2.1.0 + version: 2.1.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)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.1.1(@swc/helpers@0.5.23)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2946,16 +2759,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.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)) + 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)) srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/import-protection-custom-config: dependencies: @@ -2966,15 +2779,15 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -2992,16 +2805,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.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)) + 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)) srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/issue-8049: dependencies: @@ -3012,15 +2825,15 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3032,19 +2845,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.9) + version: 5.102.0(react@19.2.3) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.9))(react@19.2.9) + version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.3))(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -3058,11 +2871,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) tailwind-merge: specifier: ^3.6.0 version: 3.6.0 @@ -3071,11 +2884,11 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3093,7 +2906,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.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)) + 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)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -3101,57 +2914,8 @@ importers: 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/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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/root-document-hydration: dependencies: @@ -3162,15 +2926,15 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:* version: link:../../e2e-utils @@ -3188,16 +2952,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.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)) + 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)) srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/rsbuild: dependencies: @@ -3208,21 +2972,21 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@rsbuild/core': - specifier: ^2.3.1 - version: 2.3.1 + specifier: ^2.1.0 + version: 2.1.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)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.1.1(@swc/helpers@0.5.23)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3236,8 +3000,8 @@ importers: specifier: ^19.2.3 version: 19.2.3(@types/react@19.2.9) srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.10.0 + version: 0.10.1 typescript: specifier: ^5.7.2 version: 5.9.3 @@ -3254,21 +3018,21 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@rsbuild/core': - specifier: ^2.3.1 - version: 2.3.1 + specifier: ^2.1.0 + version: 2.1.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)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.1.1(@swc/helpers@0.5.23)) '@tanstack/eslint-plugin-start': specifier: workspace:^ version: link:../../../packages/eslint-plugin-start @@ -3289,22 +3053,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.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)) + 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)) '@vitejs/plugin-rsc': - 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)) + 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)) eslint: specifier: ^9.22.0 version: 9.22.0(jiti@2.7.0)(supports-color@10.2.2) srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.10.0 + version: 0.10.0 typescript: specifier: ^5.7.2 version: 5.9.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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/rsc-deferred-hydration: dependencies: @@ -3315,15 +3079,15 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3341,28 +3105,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.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)) + 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)) '@vitejs/plugin-rsc': - 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)) + 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)) srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.15 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.9) + version: 5.102.0(react@19.2.3) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.9))(react@19.2.9) + version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.3))(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -3376,15 +3140,15 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3399,19 +3163,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.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)) + 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)) '@vitejs/plugin-rsc': - 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)) + 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)) srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.10.0 + version: 0.10.0 typescript: specifier: ^5.7.2 version: 5.9.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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/rsc-rsbuild: dependencies: @@ -3422,21 +3186,21 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@rsbuild/core': - specifier: ^2.3.1 - version: 2.3.1 + specifier: ^2.1.0 + version: 2.1.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)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.1.1(@swc/helpers@0.5.23)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3450,8 +3214,8 @@ importers: specifier: ^19.2.3 version: 19.2.3(@types/react@19.2.9) srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.10.0 + version: 0.10.1 typescript: specifier: ^5.7.2 version: 5.9.3 @@ -3468,11 +3232,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -3484,11 +3248,11 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3506,13 +3270,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.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)) + 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)) combinate: specifier: ^1.1.11 version: 1.1.11 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -3520,8 +3284,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/selective-ssr: dependencies: @@ -3535,18 +3299,18 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) zod: specifier: ^4.4.3 version: 4.4.3 devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3564,10 +3328,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.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)) + 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)) srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -3575,8 +3339,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/serialization-adapters: dependencies: @@ -3590,18 +3354,18 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) zod: specifier: ^4.4.3 version: 4.4.3 devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3619,10 +3383,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.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)) + 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)) srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -3630,14 +3394,14 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.9) + version: 5.102.0(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -3654,11 +3418,11 @@ importers: specifier: ^3.0.5 version: 3.0.5 react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -3670,20 +3434,20 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@rsbuild/core': - specifier: ^2.3.1 - version: 2.3.1 + specifier: ^2.1.0 + version: 2.1.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)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.1.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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3704,13 +3468,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.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)) + 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)) combinate: specifier: ^1.1.11 version: 1.1.11 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -3718,8 +3482,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/server-functions-global-middleware: dependencies: @@ -3730,18 +3494,18 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3759,10 +3523,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.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)) + 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)) srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -3770,14 +3534,14 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.9) + version: 5.102.0(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -3794,11 +3558,11 @@ importers: specifier: ^3.0.5 version: 3.0.5 react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -3810,11 +3574,11 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3835,13 +3599,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.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)) + 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)) combinate: specifier: ^1.1.11 version: 1.1.11 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -3849,8 +3613,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/server-routes-global-middleware: dependencies: @@ -3861,18 +3625,18 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -3890,10 +3654,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.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)) + 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)) srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -3901,69 +3665,8 @@ importers: 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/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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/spa-mode: dependencies: @@ -3977,15 +3680,15 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4008,8 +3711,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/split-base-and-basepath: dependencies: @@ -4023,15 +3726,15 @@ importers: specifier: ^5.2.1 version: 5.2.1(supports-color@10.2.2) react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4049,16 +3752,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.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)) + 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)) srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/start-manifest: dependencies: @@ -4069,15 +3772,15 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4095,16 +3798,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.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)) + 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)) nitro: - specifier: ^3.0.260903-beta - version: 3.0.260903-beta + specifier: ^3.0.260311-beta + version: 3.0.260311-beta(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)(@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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/static-server-functions: dependencies: @@ -4118,18 +3821,18 @@ importers: specifier: workspace:* version: link:../../../packages/start-static-server-functions nitro: - specifier: ^3.0.260903-beta - version: 3.0.260903-beta + 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.1)(@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)) react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:* version: link:../../e2e-utils @@ -4147,19 +3850,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.9) + version: 5.102.0(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -4170,15 +3873,15 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4194,18 +3897,15 @@ importers: '@typescript/native': specifier: npm:typescript@^7.0.2 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.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 + specifier: ^0.11.9 + version: 0.11.12 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/transform-asset-urls: dependencies: @@ -4219,15 +3919,15 @@ importers: specifier: ^5.2.1 version: 5.2.1(supports-color@10.2.2) react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4245,16 +3945,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.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)) + 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)) srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/virtual-routes: dependencies: @@ -4271,11 +3971,11 @@ importers: specifier: workspace:* version: link:../../../packages/virtual-file-routes react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -4287,11 +3987,11 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4309,13 +4009,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.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)) + 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)) combinate: specifier: ^1.1.11 version: 1.1.11 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -4323,8 +4023,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/react-start/website: dependencies: @@ -4338,11 +4038,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: 'catalog:' version: 0.5.1 @@ -4354,11 +4054,11 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4376,10 +4076,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.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)) + 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)) srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -4387,8 +4087,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/solid-router/basepath-file-based: dependencies: @@ -4406,23 +4106,23 @@ importers: version: 1.9.12 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) e2e/solid-router/basic: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/solid-router': specifier: workspace:^ version: link:../../../packages/solid-router @@ -4440,17 +4140,17 @@ importers: version: 4.2.2 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) e2e/solid-router/basic-esbuild-file-based: dependencies: @@ -4474,8 +4174,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4490,7 +4190,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -4514,8 +4214,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4523,17 +4223,17 @@ importers: specifier: ^1.1.11 version: 1.1.11 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) e2e/solid-router/basic-file-based-code-splitting: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -4557,23 +4257,23 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) e2e/solid-router/basic-scroll-restoration: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/solid-router': specifier: workspace:^ version: link:../../../packages/solid-router @@ -4594,8 +4294,8 @@ importers: version: 4.2.2 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4603,17 +4303,17 @@ importers: specifier: ~5.9.0 version: 5.9.3 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) e2e/solid-router/basic-solid-query: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/solid-query': specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) @@ -4637,23 +4337,23 @@ importers: version: 4.2.2 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) e2e/solid-router/basic-solid-query-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -4683,23 +4383,23 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) e2e/solid-router/basic-virtual-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -4726,23 +4426,23 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) e2e/solid-router/basic-virtual-named-export-config-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -4769,23 +4469,23 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) e2e/solid-router/generator-cli-only: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-cli': specifier: workspace:* version: link:../../../packages/router-cli @@ -4806,23 +4506,23 @@ importers: version: 4.2.2 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) e2e/solid-router/js-only-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/solid-router': specifier: workspace:^ version: link:../../../packages/solid-router @@ -4840,8 +4540,8 @@ importers: version: 4.2.2 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -4849,11 +4549,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) e2e/solid-router/rspack-basic-file-based: dependencies: @@ -4871,17 +4571,17 @@ importers: version: 1.9.12 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@rsbuild/core': - specifier: ^2.3.1 - version: 2.3.1 + specifier: ^2.1.0 + version: 2.1.1 '@rsbuild/plugin-babel': specifier: ^1.1.2 - version: 1.1.2(@rsbuild/core@2.3.1)(supports-color@10.2.2) + version: 1.1.2(@rsbuild/core@2.1.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.3.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.1.1)(solid-js@1.9.12)(supports-color@10.2.2) '@tailwindcss/postcss': specifier: ^4.2.2 version: 4.2.2 @@ -4920,17 +4620,17 @@ importers: version: 1.9.12 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@rsbuild/core': - specifier: ^2.3.1 - version: 2.3.1 + specifier: ^2.1.0 + version: 2.1.1 '@rsbuild/plugin-babel': specifier: ^1.1.2 - version: 1.1.2(@rsbuild/core@2.3.1)(supports-color@10.2.2) + version: 1.1.2(@rsbuild/core@2.1.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.3.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.1.1)(solid-js@1.9.12)(supports-color@10.2.2) '@tailwindcss/postcss': specifier: ^4.2.2 version: 4.2.2 @@ -4960,7 +4660,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -4984,17 +4684,17 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) e2e/solid-router/sentry-integration: dependencies: @@ -5009,7 +4709,7 @@ importers: version: 4.6.1(supports-color@10.2.2) '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/solid-router': specifier: workspace:^ version: link:../../../packages/solid-router @@ -5027,23 +4727,23 @@ importers: version: 4.2.2 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) e2e/solid-router/view-transitions: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -5067,8 +4767,8 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5079,11 +4779,11 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) e2e/solid-start/basic: dependencies: @@ -5119,23 +4819,23 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@rsbuild/core': - specifier: ^2.3.1 - version: 2.3.1 + specifier: ^2.1.0 + version: 2.1.1 '@rsbuild/plugin-babel': specifier: ^1.1.2 - version: 1.1.2(@rsbuild/core@2.3.1)(supports-color@10.2.2) + version: 1.1.2(@rsbuild/core@2.1.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.3.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.1.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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5152,8 +4852,8 @@ importers: specifier: ^1.1.11 version: 1.1.11 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -5161,11 +4861,11 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) e2e/solid-start/basic-auth: dependencies: @@ -5177,7 +4877,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.9(react@19.2.9))(react@19.2.9)) + 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)) '@tanstack/solid-router': specifier: workspace:^ version: link:../../../packages/solid-router @@ -5187,9 +4887,6 @@ 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 @@ -5201,11 +4898,11 @@ importers: version: 3.6.0 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5220,10 +4917,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.9(react@19.2.9))(react@19.2.9) + 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) srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -5231,11 +4928,11 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) e2e/solid-start/basic-cloudflare: dependencies: @@ -5254,13 +4951,13 @@ importers: devDependencies: '@cloudflare/vite-plugin': specifier: ^1.29.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) + 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) '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5277,11 +4974,11 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) wrangler: specifier: ^4.74.0 version: 4.75.0 @@ -5320,11 +5017,11 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5335,8 +5032,8 @@ importers: specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -5344,11 +5041,11 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) e2e/solid-start/basic-tsr-config: dependencies: @@ -5378,17 +5075,17 @@ importers: specifier: 'catalog:' version: 6.1.2 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) e2e/solid-start/csp: dependencies: @@ -5403,8 +5100,8 @@ importers: version: 1.9.12 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5415,17 +5112,17 @@ importers: specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) e2e/solid-start/css-modules: dependencies: @@ -5440,8 +5137,8 @@ importers: version: 1.9.12 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:* version: link:../../e2e-utils @@ -5455,17 +5152,17 @@ importers: specifier: ^1.97.2 version: 1.97.2 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) e2e/solid-start/custom-basepath: dependencies: @@ -5489,11 +5186,11 @@ importers: version: 1.9.12 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5510,8 +5207,8 @@ importers: specifier: ^10.0.0 version: 10.0.0 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -5522,11 +5219,11 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) e2e/solid-start/deferred-hydration: dependencies: @@ -5541,14 +5238,14 @@ importers: version: 1.9.12 devDependencies: '@rsbuild/core': - specifier: ^2.3.1 - version: 2.3.1 + specifier: ^2.1.0 + version: 2.1.1 '@rsbuild/plugin-babel': specifier: ^1.1.2 - version: 1.1.2(@rsbuild/core@2.3.1)(supports-color@10.2.2) + version: 1.1.2(@rsbuild/core@2.1.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.3.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.1.1)(solid-js@1.9.12)(supports-color@10.2.2) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5559,57 +5256,17 @@ importers: specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.15 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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/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)) + 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)) e2e/solid-start/query-integration: dependencies: @@ -5642,11 +5299,11 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5663,11 +5320,11 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) e2e/solid-start/scroll-restoration: dependencies: @@ -5694,11 +5351,11 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5712,8 +5369,8 @@ importers: specifier: ^1.1.11 version: 1.1.11 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -5721,11 +5378,11 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) e2e/solid-start/selective-ssr: dependencies: @@ -5744,7 +5401,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5752,8 +5409,8 @@ importers: specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -5761,11 +5418,11 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) e2e/solid-start/serialization-adapters: dependencies: @@ -5787,7 +5444,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5798,8 +5455,8 @@ importers: specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -5807,11 +5464,11 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) e2e/solid-start/server-functions: dependencies: @@ -5847,11 +5504,11 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5868,8 +5525,8 @@ importers: specifier: ^1.1.11 version: 1.1.11 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -5877,11 +5534,11 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) e2e/solid-start/server-routes: dependencies: @@ -5917,11 +5574,11 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5938,8 +5595,8 @@ importers: specifier: ^1.1.11 version: 1.1.11 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -5947,11 +5604,11 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) e2e/solid-start/solid-query-layout-suspense: dependencies: @@ -5969,8 +5626,8 @@ importers: version: 1.9.12 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -5984,11 +5641,11 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) e2e/solid-start/spa-mode: dependencies: @@ -6010,7 +5667,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -6024,11 +5681,11 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) e2e/solid-start/start-manifest: dependencies: @@ -6043,8 +5700,8 @@ importers: version: 1.9.12 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -6055,60 +5712,17 @@ importers: specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.15 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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/streaming-ssr: - dependencies: - '@tanstack/solid-query': - specifier: ^5.102.0 - version: 5.102.0(solid-js@1.9.12) - '@tanstack/solid-router': - specifier: workspace:^ - version: link:../../../packages/solid-router - '@tanstack/solid-router-ssr-query': - specifier: workspace:* - version: link:../../../packages/solid-router-ssr-query - '@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-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)) + 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)) e2e/solid-start/virtual-routes: dependencies: @@ -6138,11 +5752,11 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -6156,8 +5770,8 @@ importers: specifier: ^1.1.11 version: 1.1.11 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -6165,11 +5779,11 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) e2e/solid-start/website: dependencies: @@ -6196,11 +5810,11 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -6211,8 +5825,8 @@ importers: specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -6220,17 +5834,17 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) e2e/vue-router/basepath-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -6257,23 +5871,23 @@ importers: version: 3.5.25(typescript@5.8.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils '@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@5.8.3)) + 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)) '@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@5.8.3)) + 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)) typescript: specifier: ~5.8.3 version: 5.8.3 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -6282,7 +5896,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/vue-router': specifier: workspace:* version: link:../../../packages/vue-router @@ -6300,20 +5914,20 @@ importers: version: 3.5.25(typescript@5.8.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils '@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@5.8.3)) + 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)) typescript: specifier: ~5.8.3 version: 5.8.3 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -6346,8 +5960,8 @@ importers: specifier: ^9.36.0 version: 9.36.0 '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -6383,7 +5997,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -6410,8 +6024,8 @@ importers: specifier: ^9.36.0 version: 9.36.0 '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -6423,10 +6037,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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@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)) + 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)) '@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@5.8.3)) + 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)) 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) @@ -6434,8 +6048,8 @@ importers: specifier: ~5.8.3 version: 5.8.3 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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-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) @@ -6447,7 +6061,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -6471,23 +6085,23 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils '@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@5.8.3)) + 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)) '@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@5.8.3)) + 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)) typescript: specifier: ~5.8.3 version: 5.8.3 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -6496,7 +6110,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/vue-router': specifier: workspace:* version: link:../../../packages/vue-router @@ -6517,23 +6131,23 @@ importers: version: 3.5.25(typescript@5.9.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils '@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@5.9.3)) + 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)) '@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@5.9.3)) + 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.9.3)) typescript: specifier: ~5.9.0 version: 5.9.3 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.9.3) @@ -6542,7 +6156,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -6572,23 +6186,23 @@ importers: version: 3.5.25(typescript@5.8.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils '@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@5.8.3)) + 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)) '@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@5.8.3)) + 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)) typescript: specifier: ~5.8.3 version: 5.8.3 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -6597,7 +6211,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -6627,23 +6241,23 @@ importers: version: 3.5.25(typescript@5.8.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils '@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@5.8.3)) + 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)) '@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@5.8.3)) + 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)) typescript: specifier: ~5.8.3 version: 5.8.3 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -6652,7 +6266,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/vue-query': specifier: ^5.102.0 version: 5.102.0(vue@3.5.25(typescript@5.8.3)) @@ -6676,23 +6290,23 @@ importers: version: 3.5.25(typescript@5.8.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils '@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@5.8.3)) + 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)) '@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@5.8.3)) + 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)) typescript: specifier: ~5.8.3 version: 5.8.3 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -6701,7 +6315,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -6731,23 +6345,23 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils '@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@5.8.3)) + 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)) '@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@5.8.3)) + 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)) typescript: specifier: ~5.8.3 version: 5.8.3 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -6756,7 +6370,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-cli': specifier: workspace:* version: link:../../../packages/router-cli @@ -6777,23 +6391,23 @@ importers: version: 3.5.25(typescript@5.8.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils '@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@5.8.3)) + 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)) '@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@5.8.3)) + 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)) typescript: specifier: ~5.8.3 version: 5.8.3 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -6802,16 +6416,16 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@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@6.0.2)) + version: 5.102.0(vue@3.5.25(typescript@7.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@6.0.2)))(vue@3.5.25(typescript@6.0.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)) '@tanstack/vue-router': specifier: workspace:* version: link:../../../packages/vue-router @@ -6826,23 +6440,23 @@ importers: version: 4.2.2 vue: specifier: ^3.5.16 - version: 3.5.25(typescript@6.0.2) + version: 3.5.25(typescript@7.0.2) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils '@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@6.0.2)) + 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)) '@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@6.0.2)) + 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@7.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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-router/rspack-basic-file-based: dependencies: @@ -6860,20 +6474,20 @@ importers: version: 3.5.25(@typescript/typescript6@6.0.2) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@rsbuild/core': - specifier: ^2.3.1 - version: 2.3.1 + specifier: ^2.1.0 + version: 2.1.1 '@rsbuild/plugin-babel': specifier: ^1.1.2 - version: 1.1.2(@rsbuild/core@2.3.1)(supports-color@10.2.2) + version: 1.1.2(@rsbuild/core@2.1.1)(supports-color@10.2.2) '@rsbuild/plugin-vue': specifier: ^1.2.7 - 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)) + version: 1.2.7(@rsbuild/core@2.1.1)(@rspack/core@2.1.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.3.1)(supports-color@10.2.2) + version: 2.0.0(@babel/core@7.29.7(supports-color@10.2.2))(@rsbuild/core@2.1.1)(supports-color@10.2.2) '@tailwindcss/postcss': specifier: ^4.2.2 version: 4.2.2 @@ -6918,20 +6532,20 @@ importers: version: 3.5.25(@typescript/typescript6@6.0.2) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@rsbuild/core': - specifier: ^2.3.1 - version: 2.3.1 + specifier: ^2.1.0 + version: 2.1.1 '@rsbuild/plugin-babel': specifier: ^1.1.2 - version: 1.1.2(@rsbuild/core@2.3.1)(supports-color@10.2.2) + version: 1.1.2(@rsbuild/core@2.1.1)(supports-color@10.2.2) '@rsbuild/plugin-vue': specifier: ^1.2.7 - 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)) + version: 1.2.7(@rsbuild/core@2.1.1)(@rspack/core@2.1.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.3.1)(supports-color@10.2.2) + version: 2.0.0(@babel/core@7.29.7(supports-color@10.2.2))(@rsbuild/core@2.1.1)(supports-color@10.2.2) '@tailwindcss/postcss': specifier: ^4.2.2 version: 4.2.2 @@ -6964,7 +6578,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -6988,23 +6602,23 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils '@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@5.8.3)) + 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)) '@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@5.8.3)) + 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)) typescript: specifier: ~5.8.3 version: 5.8.3 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -7022,7 +6636,7 @@ importers: 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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/vue-router': specifier: workspace:* version: link:../../../packages/vue-router @@ -7040,20 +6654,20 @@ importers: version: 3.5.25(typescript@5.8.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils '@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@5.8.3)) + 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)) typescript: specifier: ~5.8.3 version: 5.8.3 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -7062,7 +6676,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -7089,23 +6703,23 @@ importers: version: 3.5.25(typescript@5.8.3) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils '@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@5.8.3)) + 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)) '@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@5.8.3)) + 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)) typescript: specifier: ~5.8.3 version: 5.8.3 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -7144,26 +6758,26 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@rsbuild/core': - specifier: ^2.3.1 - version: 2.3.1 + specifier: ^2.1.0 + version: 2.1.1 '@rsbuild/plugin-babel': specifier: ^1.1.2 - version: 1.1.2(@rsbuild/core@2.3.1)(supports-color@10.2.2) + version: 1.1.2(@rsbuild/core@2.1.1)(supports-color@10.2.2) '@rsbuild/plugin-vue': specifier: ^1.2.7 - 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)) + version: 1.2.7(@rsbuild/core@2.1.1)(@rspack/core@2.1.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.3.1)(supports-color@10.2.2) + version: 2.0.0(@babel/core@7.29.7(supports-color@10.2.2))(@rsbuild/core@2.1.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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -7178,16 +6792,16 @@ importers: 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)) + 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)) '@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)) + 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)) combinate: specifier: ^1.1.11 version: 1.1.11 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -7195,8 +6809,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/basic-auth: dependencies: @@ -7208,7 +6822,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.9(react@19.2.9))(react@19.2.9)) + 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)) '@tanstack/vue-router': specifier: workspace:* version: link:../../../packages/vue-router @@ -7218,9 +6832,6 @@ 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 @@ -7232,11 +6843,11 @@ importers: version: 3.5.25(@typescript/typescript6@6.0.2) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -7248,19 +6859,19 @@ importers: 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)) + 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)) '@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)) + 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)) 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.9(react@19.2.9))(react@19.2.9) + 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) srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -7268,8 +6879,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/basic-cloudflare: dependencies: @@ -7288,13 +6899,13 @@ importers: devDependencies: '@cloudflare/vite-plugin': specifier: ^1.29.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) + 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) '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -7306,10 +6917,10 @@ importers: 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)) + 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)) '@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)) + 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)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -7317,8 +6928,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) wrangler: specifier: ^4.74.0 version: 4.75.0 @@ -7349,22 +6960,22 @@ importers: 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)) + 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)) '@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)) + 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)) rimraf: specifier: 'catalog:' version: 6.1.2 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/basic-vue-query: dependencies: @@ -7400,11 +7011,11 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -7416,13 +7027,13 @@ importers: 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)) + 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)) '@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)) + 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)) srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -7430,8 +7041,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/css-modules: dependencies: @@ -7446,8 +7057,8 @@ importers: version: 3.5.25(@typescript/typescript6@6.0.2) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:* version: link:../../e2e-utils @@ -7459,19 +7070,19 @@ importers: version: typescript@7.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)) + 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)) sass: specifier: ^1.97.2 version: 1.97.2 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/custom-basepath: dependencies: @@ -7495,11 +7106,11 @@ importers: version: 3.5.25(@typescript/typescript6@6.0.2) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -7514,16 +7125,16 @@ importers: 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)) + 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)) '@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)) + 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)) cross-env: specifier: ^10.0.0 version: 10.0.0 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -7534,51 +7145,8 @@ importers: 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/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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/query-integration: dependencies: @@ -7611,11 +7179,11 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -7627,10 +7195,10 @@ importers: 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)) + 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)) '@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)) + 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)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -7638,8 +7206,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/scroll-restoration: dependencies: @@ -7666,11 +7234,11 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -7682,16 +7250,16 @@ importers: 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)) + 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)) '@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)) + 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)) combinate: specifier: ^1.1.11 version: 1.1.11 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -7699,8 +7267,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/selective-ssr: dependencies: @@ -7719,7 +7287,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -7728,13 +7296,13 @@ importers: 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)) + 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)) '@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)) + 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)) srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -7742,8 +7310,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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-tsc: specifier: ^3.3.8 version: 3.3.8(@typescript/typescript6@6.0.2) @@ -7768,7 +7336,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -7777,13 +7345,13 @@ importers: 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)) + 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)) '@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)) + 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)) srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -7791,8 +7359,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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-tsc: specifier: ^3.3.8 version: 3.3.8(@typescript/typescript6@6.0.2) @@ -7831,11 +7399,11 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -7850,16 +7418,16 @@ importers: 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)) + 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)) '@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)) + 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)) combinate: specifier: ^1.1.11 version: 1.1.11 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -7867,8 +7435,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/server-routes: dependencies: @@ -7904,11 +7472,11 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -7923,16 +7491,16 @@ importers: 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)) + 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)) '@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)) + 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)) combinate: specifier: ^1.1.11 version: 1.1.11 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -7940,8 +7508,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/spa-mode: dependencies: @@ -7963,7 +7531,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -7972,10 +7540,10 @@ importers: 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)) + 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)) '@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)) + 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)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -7983,8 +7551,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/start-manifest: dependencies: @@ -7999,8 +7567,8 @@ importers: version: 3.5.25(@typescript/typescript6@6.0.2) devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -8012,59 +7580,16 @@ importers: version: typescript@7.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)) + 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)) srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.15 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/streaming-ssr: - dependencies: - '@tanstack/vue-query': - specifier: ^5.102.0 - version: 5.102.0(vue@3.5.25(@typescript/typescript6@6.0.2)) - '@tanstack/vue-router': - specifier: workspace:* - version: link:../../../packages/vue-router - '@tanstack/vue-router-ssr-query': - specifier: workspace:* - version: link:../../../packages/vue-router-ssr-query - '@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-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-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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/virtual-routes: dependencies: @@ -8094,11 +7619,11 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -8110,16 +7635,16 @@ importers: 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)) + 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)) '@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)) + 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)) combinate: specifier: ^1.1.11 version: 1.1.11 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -8127,8 +7652,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) e2e/vue-start/website: dependencies: @@ -8155,11 +7680,11 @@ importers: version: 4.4.3 devDependencies: '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 + specifier: ^1.61.0 + version: 1.61.1 '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-e2e-utils': specifier: workspace:^ version: link:../../e2e-utils @@ -8171,13 +7696,13 @@ importers: 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)) + 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)) '@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)) + 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)) srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -8185,14 +7710,14 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8203,11 +7728,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -8229,19 +7754,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8255,11 +7780,11 @@ importers: specifier: ^11.4.0 version: 11.4.0 react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -8284,19 +7809,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) examples/react/basic: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8304,11 +7829,11 @@ importers: specifier: workspace:^ version: link:../../../packages/react-router-devtools react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -8327,22 +7852,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.9) + version: 5.102.0(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8350,11 +7875,11 @@ importers: specifier: workspace:^ version: link:../../../packages/react-router-devtools react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -8376,25 +7901,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.9) + version: 5.102.0(react@19.2.3) '@tanstack/react-query-devtools': specifier: ^5.67.2 - version: 5.67.2(@tanstack/react-query@5.102.0(react@19.2.9))(react@19.2.9) + version: 5.67.2(@tanstack/react-query@5.102.0(react@19.2.3))(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8402,11 +7927,11 @@ importers: specifier: workspace:^ version: link:../../../packages/react-router-devtools react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -8425,19 +7950,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8448,11 +7973,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -8474,19 +7999,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8494,11 +8019,11 @@ importers: specifier: workspace:^ version: link:../../../packages/react-router-devtools react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -8517,25 +8042,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.9) + version: 5.102.0(react@19.2.3) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.9))(react@19.2.9) + version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.3))(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8543,11 +8068,11 @@ importers: specifier: workspace:^ version: link:../../../packages/react-router-devtools react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -8566,25 +8091,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.9) + version: 5.102.0(react@19.2.3) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.9))(react@19.2.9) + version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.3))(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8595,11 +8120,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -8621,13 +8146,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) examples/react/basic-ssr-file-based: dependencies: @@ -8650,11 +8175,11 @@ importers: specifier: ^3.3.2 version: 3.3.2 react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@tanstack/react-router-devtools': specifier: workspace:^ @@ -8673,13 +8198,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) examples/react/basic-ssr-streaming-file-based: dependencies: @@ -8702,11 +8227,11 @@ importers: specifier: ^3.3.2 version: 3.3.2 react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@tanstack/react-router-devtools': specifier: workspace:^ @@ -8725,19 +8250,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8751,11 +8276,11 @@ importers: specifier: workspace:* version: link:../../../packages/virtual-file-routes react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -8777,19 +8302,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8803,11 +8328,11 @@ importers: specifier: workspace:* version: link:../../../packages/virtual-file-routes react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -8829,19 +8354,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8849,11 +8374,11 @@ importers: specifier: workspace:^ version: link:../../../packages/react-router-devtools react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -8875,19 +8400,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8895,11 +8420,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -8921,19 +8446,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8944,11 +8469,11 @@ importers: specifier: ^10.1.1 version: 10.1.1 react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -8970,19 +8495,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -8996,11 +8521,11 @@ importers: specifier: ^10.1.1 version: 10.1.1 react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -9022,25 +8547,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.9) + version: 5.102.0(react@19.2.3) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.9))(react@19.2.9) + version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.3))(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -9051,11 +8576,11 @@ importers: specifier: ^10.1.1 version: 10.1.1 react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -9077,25 +8602,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.9) + version: 5.102.0(react@19.2.3) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.9))(react@19.2.9) + version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.3))(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -9109,11 +8634,11 @@ importers: specifier: ^10.1.1 version: 10.1.1 react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -9135,22 +8660,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.9) + version: 5.102.0(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -9161,11 +8686,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -9187,25 +8712,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.9(react@19.2.9))(react@19.2.9) + 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) '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.9) + version: 5.102.0(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -9213,11 +8738,11 @@ importers: specifier: workspace:^ version: link:../../../packages/react-router-devtools react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -9236,22 +8761,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.9) + version: 5.102.0(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -9259,11 +8784,11 @@ importers: specifier: workspace:^ version: link:../../../packages/react-router-devtools react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -9282,19 +8807,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) examples/react/quickstart: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -9302,11 +8827,11 @@ importers: specifier: workspace:^ version: link:../../../packages/react-router-devtools react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -9322,13 +8847,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) examples/react/quickstart-esbuild-file-based: dependencies: @@ -9342,11 +8867,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -9368,7 +8893,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -9379,11 +8904,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -9405,13 +8930,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) examples/react/quickstart-rspack-file-based: dependencies: @@ -9428,21 +8953,21 @@ importers: specifier: ^8.5.1 version: 8.5.3 react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) tailwindcss: specifier: ^4.2.2 version: 4.2.2 devDependencies: '@rsbuild/core': - specifier: ^2.3.1 - version: 2.3.1 + specifier: ^2.1.0 + version: 2.1.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)) + version: 2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.1.1(@swc/helpers@0.5.23)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -9468,11 +8993,11 @@ importers: specifier: workspace:^ version: link:../../../packages/react-router-devtools react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@swc/core': specifier: ^1.15.33 @@ -9509,16 +9034,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(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/react/router-monorepo-react-query: dependencies: '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.9) + version: 5.102.0(react@19.2.3) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.9))(react@19.2.9) + version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.3))(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -9529,11 +9054,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -9552,16 +9077,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(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.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) examples/react/router-monorepo-react-query/packages/app: dependencies: @@ -9573,17 +9098,17 @@ importers: version: link:../router '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.9) + version: 5.102.0(react@19.2.3) react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/react-router-devtools': specifier: workspace:^ version: link:../../../../../packages/react-router-devtools @@ -9598,7 +9123,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.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)) + 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)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -9606,11 +9131,11 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(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.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) examples/react/router-monorepo-react-query/packages/post-feature: dependencies: @@ -9622,13 +9147,13 @@ importers: version: link:../router '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.9) + version: 5.102.0(react@19.2.3) react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@types/react': specifier: ^19.2.8 @@ -9641,22 +9166,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(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.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.9) + version: 5.102.0(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -9669,13 +9194,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) examples/react/router-monorepo-react-query/packages/router: dependencies: @@ -9687,7 +9212,7 @@ importers: version: link:../../../../../packages/history '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.9) + version: 5.102.0(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../../../packages/react-router @@ -9695,11 +9220,11 @@ importers: specifier: workspace:* version: link:../../../../../packages/router-plugin react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -9718,16 +9243,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(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.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) examples/react/router-monorepo-simple: dependencies: @@ -9741,11 +9266,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -9764,16 +9289,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(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.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) examples/react/router-monorepo-simple-lazy: dependencies: @@ -9787,11 +9312,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -9810,16 +9335,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(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.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) examples/react/router-monorepo-simple-lazy/packages/app: dependencies: @@ -9830,15 +9355,15 @@ importers: specifier: workspace:* version: link:../router react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/react-router-devtools': specifier: workspace:^ version: link:../../../../../packages/react-router-devtools @@ -9853,7 +9378,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.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)) + 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)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -9861,11 +9386,11 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(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.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) examples/react/router-monorepo-simple-lazy/packages/post-feature: dependencies: @@ -9874,13 +9399,13 @@ importers: version: link:../router '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.9) + version: 5.102.0(react@19.2.3) react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@types/react': specifier: ^19.2.8 @@ -9893,16 +9418,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(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.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) examples/react/router-monorepo-simple-lazy/packages/router: dependencies: @@ -9916,11 +9441,11 @@ importers: specifier: workspace:* version: link:../../../../../packages/router-plugin react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -9939,16 +9464,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(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.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) examples/react/router-monorepo-simple/packages/app: dependencies: @@ -9959,15 +9484,15 @@ importers: specifier: workspace:* version: link:../router react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/react-router-devtools': specifier: workspace:^ version: link:../../../../../packages/react-router-devtools @@ -9982,7 +9507,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.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)) + 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)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -9990,11 +9515,11 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(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.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) examples/react/router-monorepo-simple/packages/post-feature: dependencies: @@ -10002,11 +9527,11 @@ importers: specifier: workspace:* version: link:../router react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@types/react': specifier: ^19.2.8 @@ -10019,16 +9544,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(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.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) examples/react/router-monorepo-simple/packages/router: dependencies: @@ -10042,11 +9567,11 @@ importers: specifier: workspace:* version: link:../../../../../packages/router-plugin react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -10065,22 +9590,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(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.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -10089,13 +9614,13 @@ importers: version: link:../../../packages/react-router-devtools '@tanstack/react-virtual': specifier: ^3.13.0 - version: 3.13.0(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + version: 3.13.0(react-dom@19.2.3(react@19.2.3))(react@19.2.3) react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10111,25 +9636,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/arktype-adapter': specifier: workspace:* version: link:../../../packages/arktype-adapter '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.9) + version: 5.102.0(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -10149,11 +9674,11 @@ importers: specifier: ^2.1.7 version: 2.1.7 react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10165,11 +9690,11 @@ importers: version: 3.25.76 devDependencies: '@testing-library/jest-dom': - specifier: ^7.0.1 - version: 7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.4) + specifier: ^6.6.3 + version: 6.6.3 '@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.9(react@19.2.9))(react@19.2.9) + 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) '@types/react': specifier: ^19.2.8 version: 19.2.9 @@ -10181,7 +9706,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.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)) + 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)) jsdom: specifier: ^27.0.0 version: 27.0.0(supports-color@10.2.2) @@ -10189,11 +9714,11 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: - 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)) + specifier: ^4.1.4 + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.7.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)) examples/react/start-bare: dependencies: @@ -10207,11 +9732,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) zod: specifier: ^4.4.3 version: 4.4.3 @@ -10230,13 +9755,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-basic: dependencies: @@ -10250,11 +9775,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) tailwind-merge: specifier: ^3.6.0 version: 3.6.0 @@ -10264,7 +9789,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -10279,10 +9804,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.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)) + 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)) nitro: - specifier: ^3.0.260903-beta - version: 3.0.260903-beta + specifier: ^3.0.260311-beta + version: 3.0.260311-beta(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)(@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)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10290,8 +9815,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-basic-auth: dependencies: @@ -10303,7 +9828,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.9(react@19.2.9))(react@19.2.9)) + 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)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -10313,15 +9838,12 @@ 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.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -10331,7 +9853,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -10346,13 +9868,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.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)) + 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)) 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.9(react@19.2.9))(react@19.2.9) + 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) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10360,8 +9882,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-basic-authjs: dependencies: @@ -10378,11 +9900,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) start-authjs: specifier: ^1.0.0 version: 1.0.0(@auth/core@0.41.1) @@ -10392,7 +9914,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -10407,7 +9929,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.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)) + 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)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10415,8 +9937,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-basic-cloudflare: dependencies: @@ -10430,18 +9952,18 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@cloudflare/vite-plugin': specifier: ^1.29.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) + 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) '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -10456,7 +9978,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.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)) + 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)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10464,8 +9986,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) wrangler: specifier: ^4.74.0 version: 4.75.0 @@ -10474,10 +9996,10 @@ importers: dependencies: '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.9) + version: 5.102.0(react@19.2.3) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.9))(react@19.2.9) + version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.3))(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -10491,11 +10013,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -10503,12 +10025,9 @@ importers: specifier: ^3.6.0 version: 3.6.0 devDependencies: - '@playwright/test': - specifier: ^1.63.0 - version: 1.63.0 '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -10523,7 +10042,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.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)) + 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)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10531,8 +10050,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-basic-rsbuild: dependencies: @@ -10546,11 +10065,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) tailwind-merge: specifier: ^3.6.0 version: 3.6.0 @@ -10559,14 +10078,14 @@ importers: version: 4.4.3 devDependencies: '@rsbuild/core': - specifier: ^2.3.1 - version: 2.3.1 + specifier: ^2.0.11 + version: 2.0.14 '@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)) + version: 2.0.0(@rsbuild/core@2.0.14)(@rspack/core@2.1.1(@swc/helpers@0.5.23)) '@rsbuild/plugin-tailwindcss': specifier: ^2.0.3 - version: 2.0.3(@rsbuild/core@2.3.1)(@rspack/core@2.3.1(@swc/helpers@0.5.23))(webpack@5.110.3) + version: 2.0.3(@rsbuild/core@2.0.14)(@rspack/core@2.1.1(@swc/helpers@0.5.23))(webpack@5.110.3) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -10580,8 +10099,8 @@ importers: specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.18 + version: 0.11.18 tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10605,13 +10124,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.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)) + 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)) react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -10621,7 +10140,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -10641,17 +10160,17 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@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.9(react@19.2.9))(react@19.2.9)(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.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -10668,24 +10187,24 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) tailwindcss: specifier: ^4.2.2 version: 4.2.2 devDependencies: '@tanstack/eslint-config': specifier: ^0.3.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) + 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) '@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.9(react@19.2.9))(react@19.2.9) + 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) '@types/bun': specifier: ^1.2.22 version: 1.2.22(@types/react@19.2.9) @@ -10703,7 +10222,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.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)) + 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)) jsdom: specifier: ^27.0.0 version: 27.0.0(supports-color@10.2.2) @@ -10714,11 +10233,11 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: - 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)) + specifier: ^4.1.4 + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.7.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)) web-vitals: specifier: ^5.1.0 version: 5.1.0 @@ -10727,7 +10246,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.9(react@19.2.9))(react@19.2.9) + 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) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -10739,26 +10258,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.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)) + 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)) react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.9 + version: 0.11.12 tailwind-merge: specifier: ^3.6.0 version: 3.6.0 devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -10778,20 +10297,20 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.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)) + 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)) '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.9) + version: 5.102.0(react@19.2.3) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.9))(react@19.2.9) + version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.3))(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -10809,7 +10328,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.9(react@19.2.9))(react@19.2.9))(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + 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) ky: specifier: ^1.7.4 version: 1.7.4 @@ -10817,14 +10336,14 @@ importers: specifier: ^2.7.0 version: 2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2) react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) react-hot-toast: specifier: ^2.5.1 - version: 2.5.1(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + version: 2.5.1(react-dom@19.2.3(react@19.2.3))(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -10837,7 +10356,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -10852,7 +10371,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.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)) + 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)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10860,8 +10379,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-counter: dependencies: @@ -10875,11 +10394,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@types/node': specifier: 25.0.9 @@ -10895,19 +10414,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.9(react@19.2.9))(react@19.2.9)(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.3(react@19.2.3))(react@19.2.3)(solid-js@1.9.12) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -10918,18 +10437,18 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) 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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -10944,7 +10463,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.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)) + 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)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -10952,14 +10471,14 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.9) + version: 5.102.0(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -10970,11 +10489,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -10987,7 +10506,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -11002,7 +10521,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.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)) + 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)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -11010,8 +10529,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-material-ui: dependencies: @@ -11020,16 +10539,16 @@ importers: version: 11.14.0 '@emotion/react': specifier: 11.14.0 - version: 11.14.0(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2) + version: 11.14.0(@types/react@19.2.9)(react@19.2.3)(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.9)(supports-color@10.2.2))(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2) + 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) '@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.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) + 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) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -11040,11 +10559,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) zod: specifier: ^4.4.3 version: 4.4.3 @@ -11063,59 +10582,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.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)) + 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)) 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) - - examples/react/start-next-migration: - dependencies: - '@tanstack/react-router': - specifier: workspace:* - version: link:../../../packages/react-router - '@tanstack/react-start': - specifier: workspace:* - version: link:../../../packages/react-start - iron-session: - 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.9(react@19.2.9))(react@19.2.9)(sass@1.97.2) - 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 - '@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)) - nitro: - 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.3.4 - version: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-rscs: dependencies: @@ -11132,11 +10605,11 @@ importers: specifier: ^4.0.10 version: 4.2.1 react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) tailwind-merge: specifier: ^3.6.0 version: 3.6.0 @@ -11145,11 +10618,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.9)(use-sync-external-store@1.6.0(react@19.2.9)) + 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)) devDependencies: '@tailwindcss/vite': specifier: ^4.1.18 - 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)) + 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)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -11161,13 +10634,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.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)) + 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)) '@vitejs/plugin-rsc': - 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)) + 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)) nitro: - specifier: ^3.0.260903-beta - version: 3.0.260903-beta + specifier: ^3.0.260311-beta + version: 3.0.260311-beta(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)(@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)) tailwindcss: specifier: ^4.1.18 version: 4.2.2 @@ -11175,8 +10648,8 @@ importers: specifier: ^5.7.2 version: 5.9.3 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-streaming-data-from-server-functions: dependencies: @@ -11190,11 +10663,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) zod: specifier: ^4.4.3 version: 4.4.3 @@ -11213,13 +10686,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-supabase-basic: dependencies: @@ -11239,18 +10712,18 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@types/react': specifier: ^19.2.8 version: 19.2.9 @@ -11262,7 +10735,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.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)) + 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)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -11270,8 +10743,8 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) examples/react/start-tailwind-v4: dependencies: @@ -11285,11 +10758,11 @@ importers: specifier: workspace:* version: link:../../../packages/react-start react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) tailwind-merge: specifier: ^3.6.0 version: 3.6.0 @@ -11299,7 +10772,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -11314,7 +10787,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.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)) + 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)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -11322,17 +10795,17 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.9) + version: 5.102.0(react@19.2.3) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.9))(react@19.2.9) + version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.3))(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -11352,14 +10825,14 @@ importers: specifier: ^2.7.0 version: 2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2) react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) react-hot-toast: specifier: ^2.5.1 - version: 2.5.1(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + version: 2.5.1(react-dom@19.2.3(react@19.2.3))(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -11372,7 +10845,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -11387,7 +10860,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.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)) + 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)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -11395,14 +10868,14 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.9(react@19.2.9))(react@19.2.9) + 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) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -11414,13 +10887,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.9(react@19.2.9))(react@19.2.9) + 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) react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) devDependencies: '@types/react': specifier: ^19.2.8 @@ -11433,19 +10906,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -11456,11 +10929,11 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -11482,19 +10955,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -11503,13 +10976,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.9(react@19.2.9))(react@19.2.9) + version: 11.18.2(@emotion/is-prop-valid@1.3.1)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -11531,19 +11004,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.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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -11563,11 +11036,11 @@ importers: specifier: ^5.2.1 version: 5.2.1(supports-color@10.2.2) react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -11589,25 +11062,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.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)) + 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)) tsx: specifier: ^4.20.3 version: 4.20.3 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/react-query': specifier: ^5.102.0 - version: 5.102.0(react@19.2.9) + version: 5.102.0(react@19.2.3) '@tanstack/react-query-devtools': specifier: ^5.90.0 - version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.9))(react@19.2.9) + version: 5.90.2(@tanstack/react-query@5.102.0(react@19.2.3))(react@19.2.3) '@tanstack/react-router': specifier: workspace:* version: link:../../../packages/react-router @@ -11625,16 +11098,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.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) + 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) express: specifier: ^5.2.1 version: 5.2.1(supports-color@10.2.2) react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -11656,24 +11129,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.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)) + 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)) tsx: specifier: ^4.20.3 version: 4.20.3 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0)) + 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)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11698,22 +11171,22 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/authenticated-routes-firebase: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11744,19 +11217,19 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/basic: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11784,22 +11257,22 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/basic-default-search-params: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/solid-query': specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11824,19 +11297,19 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/basic-devtools-panel: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11858,19 +11331,19 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/basic-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11898,19 +11371,19 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/basic-non-nested-devtools: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11938,17 +11411,17 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/basic-solid-query: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/solid-query': specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) @@ -11956,7 +11429,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.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -11981,17 +11454,17 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/basic-solid-query-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/solid-query': specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) @@ -11999,7 +11472,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.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12027,11 +11500,11 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/basic-ssr-file-based: dependencies: @@ -12039,7 +11512,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router compression: specifier: ^1.8.0 @@ -12070,19 +11543,19 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/basic-ssr-streaming-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12125,22 +11598,22 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/basic-virtual-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12168,22 +11641,22 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/basic-virtual-inside-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12211,19 +11684,19 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/deferred-data: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12248,22 +11721,22 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/i18n-paraglide: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router solid-js: specifier: 1.9.12 @@ -12285,19 +11758,19 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/kitchen-sink: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12325,19 +11798,19 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/kitchen-sink-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12368,17 +11841,17 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/kitchen-sink-solid-query: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/solid-query': specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) @@ -12386,7 +11859,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.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12414,17 +11887,17 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/kitchen-sink-solid-query-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -12435,7 +11908,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.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12463,17 +11936,17 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/large-file-based: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -12481,7 +11954,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12506,22 +11979,22 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/location-masking: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/solid-query': specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12543,22 +12016,22 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/navigation-blocking: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/solid-query': specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12580,19 +12053,19 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/quickstart: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12611,11 +12084,11 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/quickstart-esbuild-file-based: dependencies: @@ -12623,7 +12096,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12652,9 +12125,9 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12682,11 +12155,11 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/quickstart-rspack-file-based: dependencies: @@ -12694,7 +12167,7 @@ importers: specifier: ^4.2.2 version: 4.2.2 '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12710,14 +12183,14 @@ importers: version: 4.2.2 devDependencies: '@rsbuild/core': - specifier: ^2.3.1 - version: 2.3.1 + specifier: ^2.1.0 + version: 2.1.1 '@rsbuild/plugin-babel': specifier: ^1.1.2 - version: 1.1.2(@rsbuild/core@2.3.1)(supports-color@10.2.2) + version: 1.1.2(@rsbuild/core@2.1.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.3.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.1.1)(solid-js@1.9.12)(supports-color@10.2.2) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -12731,7 +12204,7 @@ importers: examples/solid/quickstart-webpack-file-based: dependencies: '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12781,7 +12254,7 @@ 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.1)(webpack-cli@5.1.4) + version: 5.97.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(esbuild@0.28.2)(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) @@ -12795,7 +12268,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12817,14 +12290,14 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(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.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/router-monorepo-simple-lazy: dependencies: @@ -12832,7 +12305,7 @@ importers: specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12854,14 +12327,14 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(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.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/router-monorepo-solid-query: dependencies: @@ -12875,7 +12348,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.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12897,22 +12370,22 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(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.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/scroll-restoration: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12934,17 +12407,17 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/search-validator-adapters: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/arktype-adapter': specifier: workspace:* version: link:../../../packages/arktype-adapter @@ -12955,7 +12428,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -12986,8 +12459,8 @@ importers: specifier: ^0.8.10 version: 0.8.10(solid-js@1.9.12) '@testing-library/jest-dom': - specifier: ^7.0.1 - version: 7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.4) + specifier: ^6.6.3 + version: 6.6.3 '@typescript/native': specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 @@ -12998,19 +12471,19 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: specifier: ^2.11.11 - 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)) + 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)) vitest: - 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)) + specifier: ^4.1.4 + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.7.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)) examples/solid/start-basic: dependencies: '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13030,7 +12503,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -13038,8 +12511,8 @@ importers: specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 nitro: - specifier: ^3.0.260903-beta - version: 3.0.260903-beta + specifier: ^3.0.260311-beta + version: 3.0.260311-beta(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)(@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)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -13047,11 +12520,11 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/start-basic-auth: dependencies: @@ -13063,9 +12536,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.9(react@19.2.9))(react@19.2.9)) + 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)) '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13073,9 +12546,6 @@ 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 @@ -13088,7 +12558,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -13100,7 +12570,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.9(react@19.2.9))(react@19.2.9) + 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) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -13108,11 +12578,11 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/start-basic-authjs: dependencies: @@ -13120,7 +12590,7 @@ importers: specifier: ^0.41.1 version: 0.41.1 '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13140,7 +12610,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -13154,16 +12624,16 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/start-basic-cloudflare: dependencies: '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13177,10 +12647,10 @@ importers: devDependencies: '@cloudflare/vite-plugin': specifier: ^1.29.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) + 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) '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -13194,11 +12664,11 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) wrangler: specifier: ^4.74.0 version: 4.75.0 @@ -13206,7 +12676,7 @@ importers: examples/solid/start-basic-netlify: dependencies: '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13219,11 +12689,11 @@ importers: version: 1.9.12 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.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)) + specifier: ^1.1.4 + version: 1.1.4(@tanstack/solid-start@packages+solid-start)(babel-plugin-macros@3.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))(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)) '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -13237,16 +12707,16 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/start-basic-nitro: dependencies: '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13260,7 +12730,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -13268,8 +12738,8 @@ importers: specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 nitro: - specifier: ^3.0.260903-beta - version: 3.0.260903-beta + specifier: ^3.0.260311-beta + version: 3.0.260311-beta(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)(@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)) tailwindcss: specifier: ^4.2.2 version: 4.2.2 @@ -13277,11 +12747,11 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/start-basic-solid-query: dependencies: @@ -13292,7 +12762,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.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13315,7 +12785,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -13329,16 +12799,16 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/start-basic-static: dependencies: '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13361,7 +12831,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -13375,17 +12845,17 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/start-bun: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -13393,7 +12863,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.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13416,7 +12886,7 @@ importers: version: 0.8.10(solid-js@1.9.12) '@tanstack/eslint-config': specifier: ^0.3.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) + 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) '@testing-library/dom': specifier: ^10.4.1 version: 10.4.1 @@ -13439,14 +12909,14 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) vitest: - 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)) + specifier: ^4.1.4 + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.7.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)) web-vitals: specifier: ^5.1.0 version: 5.1.0 @@ -13455,12 +12925,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.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) + version: 0.9.7(@standard-schema/spec@1.1.0)(@typescript/typescript6@6.0.2)(better-auth@1.6.19(@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)(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) '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13470,16 +12940,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.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)) + version: 1.6.19(@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)(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)) 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.9(react@19.2.9))(react@19.2.9))(react@19.2.9) + 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) convex-solidjs: specifier: ^0.0.3 - 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) + 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) redaxios: specifier: ^0.5.1 version: 0.5.1 @@ -13509,16 +12979,16 @@ importers: 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.105.1)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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.105.1)(terser@5.51.2)(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.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) examples/solid/start-counter: dependencies: '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13552,11 +13022,11 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/start-i18n-paraglide: dependencies: @@ -13564,7 +13034,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.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13581,7 +13051,7 @@ importers: version: 2.4.0(babel-plugin-macros@3.1.0) '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -13595,11 +13065,11 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/start-large: dependencies: @@ -13607,7 +13077,7 @@ importers: specifier: ^5.102.0 version: 5.102.0(solid-js@1.9.12) '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13630,7 +13100,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -13644,16 +13114,16 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/start-streaming-data-from-server-functions: dependencies: '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13678,11 +13148,11 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/start-supabase-basic: dependencies: @@ -13693,7 +13163,7 @@ importers: specifier: ^2.48.1 version: 2.48.1 '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13710,7 +13180,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -13724,16 +13194,16 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/start-tailwind-v4: dependencies: '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13753,7 +13223,7 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -13767,22 +13237,22 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/view-transitions: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13807,19 +13277,19 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/with-framer-motion: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13847,22 +13317,22 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/solid/with-trpc: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin '@tanstack/solid-router': - specifier: ^1.170.43 + specifier: ^1.170.31 version: link:../../../packages/solid-router '@tanstack/solid-router-devtools': specifier: workspace:^ @@ -13896,11 +13366,11 @@ importers: specifier: ^4.20.3 version: 4.20.3 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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)) + 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)) examples/vue/basic: dependencies: @@ -13922,22 +13392,22 @@ importers: devDependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@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)) + 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)) '@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)) + 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)) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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-tsc: specifier: ^3.3.8 version: 3.3.8(@typescript/typescript6@6.0.2) @@ -13946,7 +13416,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -13980,10 +13450,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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@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)) + 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)) '@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@5.8.3)) + 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)) 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) @@ -13991,8 +13461,8 @@ importers: specifier: ~5.8.3 version: 5.8.3 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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-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) @@ -14004,7 +13474,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.2.2 - 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)) + 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)) '@tanstack/router-plugin': specifier: workspace:* version: link:../../../packages/router-plugin @@ -14029,16 +13499,16 @@ importers: devDependencies: '@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@5.8.3)) + 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)) '@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@5.8.3)) + 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)) typescript: specifier: ~5.8.3 version: 5.8.3 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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-tsc: specifier: ^3.3.8 version: 3.3.8(typescript@5.8.3) @@ -14053,13 +13523,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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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)) '@testing-library/jest-dom': specifier: 'catalog:' - version: 7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.4) + version: 6.6.3 '@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.9(react@19.2.9))(react@19.2.9) + 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) '@types/react': specifier: ^19.2.8 version: 19.2.9 @@ -14076,20 +13546,20 @@ importers: specifier: 'catalog:' version: 0.3.17 react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) rimraf: specifier: 'catalog:' version: 6.1.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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.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/eslint-plugin-router: dependencies: @@ -14102,7 +13572,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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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)) '@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) @@ -14119,11 +13589,11 @@ importers: specifier: 'catalog:' version: 6.1.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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.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/eslint-plugin-start: dependencies: @@ -14139,7 +13609,7 @@ importers: version: 0.18.4 '@tanstack/vite-config': specifier: 'catalog:' - 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)) + 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)) '@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) @@ -14157,7 +13627,7 @@ importers: version: 5.9.2 vitest: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.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)) packages/history: devDependencies: @@ -14166,7 +13636,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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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)) jsdom: specifier: 'catalog:' version: 25.0.1(supports-color@10.2.2) @@ -14177,11 +13647,39 @@ importers: specifier: 'catalog:' version: 6.1.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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.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.1.1(@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(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.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/react-router: dependencies: @@ -14189,8 +13687,8 @@ importers: specifier: workspace:* version: link:../history '@tanstack/react-store': - specifier: ^0.11.2 - version: 0.11.2(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + specifier: ^0.9.3 + version: 0.9.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3) '@tanstack/router-core': specifier: workspace:* version: link:../router-core @@ -14206,16 +13704,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.9) + version: 5.102.0(react@19.2.3) '@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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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)) '@testing-library/jest-dom': specifier: 'catalog:' - version: 7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.4) + version: 6.6.3 '@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.9(react@19.2.9))(react@19.2.9) + 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) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -14227,7 +13725,7 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: 'catalog:' - 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)) + 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)) combinate: specifier: 'catalog:' version: 1.1.11 @@ -14241,20 +13739,20 @@ importers: specifier: 'catalog:' version: 0.3.17 react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) rimraf: specifier: 'catalog:' version: 6.1.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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.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)) zod: specifier: 'catalog:' version: 4.5.4 @@ -14279,7 +13777,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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -14291,7 +13789,7 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: 'catalog:' - 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)) + 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)) eslint-plugin-react-hooks: specifier: 'catalog:' version: 5.1.0(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2)) @@ -14302,20 +13800,20 @@ importers: specifier: 'catalog:' version: 0.3.17 react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) rimraf: specifier: 'catalog:' version: 6.1.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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.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/react-router-ssr-query: dependencies: @@ -14334,13 +13832,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.9) + version: 5.102.0(react@19.2.3) '@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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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)) '@types/react': specifier: ^19.2.8 version: 19.2.9 @@ -14349,7 +13847,7 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: 'catalog:' - 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)) + 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)) eslint-plugin-react-hooks: specifier: 'catalog:' version: 5.1.0(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2)) @@ -14360,20 +13858,20 @@ importers: specifier: 'catalog:' version: 0.3.17 react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) rimraf: specifier: 'catalog:' version: 6.1.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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.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/react-start: dependencies: @@ -14405,8 +13903,8 @@ importers: specifier: 'catalog:' version: 2.0.3 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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:' @@ -14416,10 +13914,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.3.1 + version: 2.1.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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -14439,17 +13937,17 @@ importers: specifier: 'catalog:' version: 0.3.17 react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) rimraf: specifier: 'catalog:' version: 6.1.2 vitest: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.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/react-start-client: dependencies: @@ -14471,10 +13969,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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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)) '@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.9(react@19.2.9))(react@19.2.9) + 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) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -14486,7 +13984,7 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: 'catalog:' - 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)) + 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)) eslint-plugin-react-hooks: specifier: 'catalog:' version: 5.1.0(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2)) @@ -14497,20 +13995,20 @@ importers: specifier: 'catalog:' version: 0.3.17 react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) rimraf: specifier: 'catalog:' version: 6.1.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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.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/react-start-rsc: dependencies: @@ -14546,14 +14044,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.2.7 - version: 2.2.7(@swc/helpers@0.5.23) + specifier: 2.0.0 + version: 2.0.0(@swc/helpers@0.5.23) '@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.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)) + 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)) '@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.9(react@19.2.9))(react@19.2.9) + 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) '@types/react': specifier: ^19.2.8 version: 19.2.9 @@ -14562,10 +14060,10 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: 'catalog:' - 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)) + 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)) '@vitejs/plugin-rsc': - 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)) + 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)) eslint-plugin-react-hooks: specifier: 'catalog:' version: 5.1.0(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2)) @@ -14576,20 +14074,20 @@ importers: specifier: 'catalog:' version: 0.3.17 react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) react-server-dom-rspack: - 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) + 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) rimraf: specifier: 'catalog:' version: 6.1.2 vitest: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.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)) packages/react-start-server: dependencies: @@ -14611,7 +14109,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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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)) '@types/react': specifier: ^19.2.8 version: 19.2.9 @@ -14623,7 +14121,7 @@ importers: version: typescript@7.0.2 '@vitejs/plugin-react': specifier: 'catalog:' - 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)) + 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)) eslint-plugin-react-hooks: specifier: 'catalog:' version: 5.1.0(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2)) @@ -14634,11 +14132,11 @@ importers: specifier: 'catalog:' version: 0.3.17 react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) rimraf: specifier: 'catalog:' version: 6.1.2 @@ -14646,33 +14144,36 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.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/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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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)) '@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 @@ -14680,11 +14181,11 @@ importers: specifier: 'catalog:' version: 6.1.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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.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/router-core: dependencies: @@ -14695,21 +14196,21 @@ importers: specifier: ^3.0.0 version: 3.1.1 seroval: - specifier: ^1.6.7 - version: 1.6.7 + specifier: ^1.6.2 + version: 1.6.2 seroval-plugins: - specifier: ^1.6.7 - version: 1.6.7(seroval@1.6.7) + specifier: ^1.6.2 + version: 1.6.2(seroval@1.6.2) devDependencies: '@arethetypeswrong/cli': specifier: 'catalog:' version: 0.18.4 '@tanstack/store': - specifier: ^0.11.2 - version: 0.11.2 + specifier: ^0.9.3 + version: 0.9.3 '@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.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)) + 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.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -14726,11 +14227,11 @@ importers: specifier: 'catalog:' version: 6.1.2 vite: - 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.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/router-devtools: dependencies: @@ -14752,7 +14253,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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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)) '@types/react': specifier: ^19.2.8 version: 19.2.9 @@ -14761,7 +14262,7 @@ importers: version: 19.2.3(@types/react@19.2.9) '@vitejs/plugin-react': specifier: 'catalog:' - 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)) + 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)) eslint-plugin-react-hooks: specifier: 'catalog:' version: 5.1.0(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2)) @@ -14769,20 +14270,20 @@ importers: specifier: 'catalog:' version: 0.3.17 react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) rimraf: specifier: 'catalog:' version: 6.1.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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.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/router-devtools-core: dependencies: @@ -14804,10 +14305,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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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)) '@testing-library/jest-dom': specifier: 'catalog:' - version: 7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.4) + version: 6.6.3 jsdom: specifier: 'catalog:' version: 25.0.1(supports-color@10.2.2) @@ -14821,14 +14322,14 @@ importers: specifier: 1.9.12 version: 1.9.12 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + 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)) vitest: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.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/router-generator: dependencies: @@ -14865,7 +14366,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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -14876,17 +14377,17 @@ importers: specifier: 'catalog:' version: 0.3.17 react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 rimraf: specifier: 'catalog:' version: 6.1.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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.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/router-plugin: dependencies: @@ -14915,14 +14416,14 @@ importers: specifier: 'catalog:' version: 5.0.0 unplugin: - 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) + specifier: ^3.3.0 + version: 3.3.0(@rspack/core@2.1.1(@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) 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(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.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) zod: specifier: 'catalog:' version: 4.5.4 @@ -14932,10 +14433,10 @@ importers: version: 0.18.4 '@rsbuild/core': specifier: 'catalog:' - version: 2.3.1 + version: 2.1.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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0)) '@types/babel__core': specifier: ^7.20.5 version: 7.20.5 @@ -14954,27 +14455,24 @@ 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.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) rimraf: specifier: 'catalog:' version: 6.1.2 vitest: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.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)) 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.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) + 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.15)(sharp@0.34.5)(svgo@4.0.0)(webpack-cli@5.1.4) packages/router-ssr-query-core: devDependencies: @@ -14989,7 +14487,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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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)) jsdom: specifier: 'catalog:' version: 25.0.1(supports-color@10.2.2) @@ -15000,11 +14498,11 @@ importers: specifier: 'catalog:' version: 6.1.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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.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/router-utils: dependencies: @@ -15024,8 +14522,8 @@ importers: specifier: ^1.0.12 version: 1.0.12(supports-color@10.2.2) diff: - specifier: ^9.0.0 - version: 9.0.0 + specifier: ^8.0.4 + version: 8.0.4 pathe: specifier: 'catalog:' version: 2.0.3 @@ -15038,7 +14536,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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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)) '@types/babel__generator': specifier: ^7.27.0 version: 7.27.0 @@ -15052,11 +14550,11 @@ importers: specifier: 'catalog:' version: 6.1.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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.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/router-vite-plugin: dependencies: @@ -15069,7 +14567,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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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 @@ -15077,11 +14575,11 @@ importers: specifier: 'catalog:' version: 6.1.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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.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/solid-router: dependencies: @@ -15109,10 +14607,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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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)) '@testing-library/jest-dom': specifier: 'catalog:' - version: 7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.4) + version: 6.6.3 '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -15132,14 +14630,14 @@ importers: specifier: 1.9.12 version: 1.9.12 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + 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)) vitest: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.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)) zod: specifier: 'catalog:' version: 4.5.4 @@ -15161,7 +14659,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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -15175,14 +14673,14 @@ importers: specifier: 1.9.12 version: 1.9.12 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(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.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.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/solid-router-ssr-query: dependencies: @@ -15204,7 +14702,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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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)) 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) @@ -15221,14 +14719,14 @@ importers: specifier: 1.9.12 version: 1.9.12 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(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.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.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/solid-start: dependencies: @@ -15265,13 +14763,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.3.1 + version: 2.1.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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -15288,11 +14786,11 @@ importers: specifier: 'catalog:' version: 6.1.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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.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/solid-start-client: dependencies: @@ -15314,10 +14812,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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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)) '@testing-library/jest-dom': specifier: 'catalog:' - version: 7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.4) + version: 6.6.3 jsdom: specifier: 'catalog:' version: 25.0.1(supports-color@10.2.2) @@ -15328,14 +14826,14 @@ importers: specifier: 'catalog:' version: 6.1.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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + 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)) vitest: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.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/solid-start-server: dependencies: @@ -15354,7 +14852,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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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)) '@typescript/native': specifier: npm:typescript@^7.0.2 version: typescript@7.0.2 @@ -15374,14 +14872,14 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: 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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(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.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.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/start-client-core: dependencies: @@ -15395,15 +14893,15 @@ importers: specifier: workspace:* version: link:../start-storage-context seroval: - specifier: ^1.6.7 - version: 1.6.7 + specifier: ^1.6.2 + version: 1.6.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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -15417,11 +14915,11 @@ importers: specifier: 'catalog:' version: 6.1.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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.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/start-fn-stubs: devDependencies: @@ -15430,7 +14928,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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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 @@ -15438,11 +14936,11 @@ importers: specifier: 'catalog:' version: 6.1.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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.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/start-plugin-core: dependencies: @@ -15474,8 +14972,8 @@ importers: specifier: workspace:* version: link:../start-server-core exsolve: - specifier: ^1.1.3 - version: 1.2.0 + specifier: ^1.1.1 + version: 1.1.1 lightningcss: specifier: ^1.33.0 version: 1.33.0 @@ -15486,14 +14984,14 @@ importers: specifier: ^4.0.7 version: 4.0.7 seroval: - specifier: ^1.6.7 - version: 1.6.7 + specifier: ^1.6.2 + version: 1.6.2 source-map: specifier: ^0.7.6 version: 0.7.6 srvx: - specifier: ^1.0.0 - version: 1.0.5 + specifier: ^0.11.22 + version: 0.11.22 tinyglobby: specifier: 'catalog:' version: 0.2.17 @@ -15502,7 +15000,7 @@ importers: version: 1.6.4 vitefu: specifier: ^1.1.3 - 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)) + 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)) xmlbuilder2: specifier: ^4.0.3 version: 4.0.3 @@ -15515,10 +15013,10 @@ importers: version: 0.18.4 '@rsbuild/core': specifier: 'catalog:' - version: 2.3.1 + version: 2.1.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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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)) '@types/babel__code-frame': specifier: ^7.0.6 version: 7.0.6 @@ -15531,9 +15029,6 @@ 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 @@ -15541,11 +15036,11 @@ importers: specifier: 'catalog:' version: 6.1.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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.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/start-server-core: dependencies: @@ -15561,15 +15056,15 @@ 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.2.0 - version: 0.2.0 + 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)) seroval: - specifier: ^1.6.7 - version: 1.6.7 + specifier: ^1.6.2 + version: 1.6.2 devDependencies: '@arethetypeswrong/cli': specifier: 'catalog:' @@ -15579,13 +15074,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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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)) '@types/node': specifier: 25.0.9 version: 25.0.9 - iron-session: - specifier: 9.0.1 - version: 9.0.1 + cookie-es: + specifier: ^3.0.0 + version: 3.1.1 jsdom: specifier: 'catalog:' version: 25.0.1(supports-color@10.2.2) @@ -15596,11 +15091,11 @@ importers: specifier: 'catalog:' version: 6.1.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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.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/start-static-server-functions: dependencies: @@ -15614,15 +15109,15 @@ importers: specifier: workspace:* version: link:../start-client-core seroval: - specifier: ^1.6.7 - version: 1.6.7 + specifier: ^1.6.2 + version: 1.6.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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -15636,11 +15131,11 @@ importers: specifier: 'catalog:' version: 6.1.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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.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/start-storage-context: dependencies: @@ -15653,7 +15148,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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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)) '@types/node': specifier: 25.0.9 version: 25.0.9 @@ -15667,11 +15162,11 @@ importers: specifier: 'catalog:' version: 6.1.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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.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/valibot-adapter: devDependencies: @@ -15683,13 +15178,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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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)) '@testing-library/jest-dom': specifier: 'catalog:' - version: 7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.4) + version: 6.6.3 '@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.9(react@19.2.9))(react@19.2.9) + 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) '@types/react': specifier: ^19.2.8 version: 19.2.9 @@ -15703,23 +15198,23 @@ importers: specifier: 'catalog:' version: 0.3.17 react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) rimraf: specifier: 'catalog:' version: 6.1.2 valibot: specifier: 1.0.0-beta.15 - version: 1.0.0-beta.15(@typescript/typescript6@6.0.2) + version: 1.0.0-beta.15(typescript@7.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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.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/virtual-file-routes: devDependencies: @@ -15728,7 +15223,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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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)) jsdom: specifier: 'catalog:' version: 25.0.1(supports-color@10.2.2) @@ -15739,11 +15234,11 @@ importers: specifier: 'catalog:' version: 6.1.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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.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/vue-router: dependencies: @@ -15754,8 +15249,8 @@ importers: specifier: workspace:* version: link:../router-core '@tanstack/vue-store': - specifier: ^0.11.2 - version: 0.11.2(vue@3.5.25(@typescript/typescript6@6.0.2)) + specifier: ^0.9.3 + version: 0.9.3(vue@3.5.25(@typescript/typescript6@6.0.2)) '@vue/runtime-dom': specifier: ^3.5.25 version: 3.5.25 @@ -15768,10 +15263,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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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)) '@testing-library/jest-dom': specifier: 'catalog:' - version: 7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.4) + version: 6.6.3 '@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)) @@ -15780,10 +15275,10 @@ importers: version: 25.0.9 '@vitejs/plugin-vue-jsx': specifier: 'catalog:' - 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)) + 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)) '@vitest/ui': specifier: 'catalog:' - version: 5.0.4(vitest@5.0.4) + version: 4.1.4(vitest@4.1.4) combinate: specifier: 'catalog:' version: 1.1.11 @@ -15797,11 +15292,11 @@ importers: specifier: 'catalog:' version: 6.1.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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.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)) vue: specifier: 'catalog:' version: 3.5.25(@typescript/typescript6@6.0.2) @@ -15821,21 +15316,21 @@ importers: specifier: workspace:* version: link:../vue-router 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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)) '@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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@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)) + 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)) publint: specifier: 'catalog:' version: 0.3.17 @@ -15844,7 +15339,7 @@ importers: version: 6.1.2 vitest: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.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)) vue: specifier: 'catalog:' version: 3.5.25(@typescript/typescript6@6.0.2) @@ -15866,13 +15361,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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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/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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@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)) + 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)) publint: specifier: 'catalog:' version: 0.3.17 @@ -15880,11 +15375,11 @@ importers: specifier: 'catalog:' version: 6.1.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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.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)) vue: specifier: 'catalog:' version: 3.5.25(@typescript/typescript6@6.0.2) @@ -15918,19 +15413,19 @@ importers: version: 0.18.4 '@rsbuild/core': specifier: 'catalog:' - version: 2.3.1 + version: 2.1.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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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)) '@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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@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)) + 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)) jsdom: specifier: 'catalog:' version: 25.0.1(supports-color@10.2.2) @@ -15941,11 +15436,11 @@ importers: specifier: 'catalog:' version: 6.1.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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.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)) vue: specifier: 'catalog:' version: 3.5.25(@typescript/typescript6@6.0.2) @@ -15967,10 +15462,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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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)) '@vitejs/plugin-vue-jsx': specifier: 'catalog:' - 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)) + 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)) jsdom: specifier: 'catalog:' version: 25.0.1(supports-color@10.2.2) @@ -15981,11 +15476,11 @@ importers: specifier: 'catalog:' version: 6.1.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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.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)) vue: specifier: 'catalog:' version: 3.5.25(@typescript/typescript6@6.0.2) @@ -16007,13 +15502,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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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)) '@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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@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)) + 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)) jsdom: specifier: 'catalog:' version: 25.0.1(supports-color@10.2.2) @@ -16027,11 +15522,11 @@ importers: 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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.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)) vue: specifier: 'catalog:' version: 3.5.25(@typescript/typescript6@6.0.2) @@ -16046,13 +15541,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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(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)(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)) '@testing-library/jest-dom': specifier: 'catalog:' - version: 7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.4) + version: 6.6.3 '@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.9(react@19.2.9))(react@19.2.9) + 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) '@types/react': specifier: ^19.2.8 version: 19.2.9 @@ -16066,20 +15561,20 @@ importers: specifier: 'catalog:' version: 0.3.17 react: - specifier: ~19.2.9 - version: 19.2.9 + specifier: ^19.2.3 + version: 19.2.3 react-dom: - specifier: ~19.2.9 - version: 19.2.9(react@19.2.9) + specifier: ^19.2.3 + version: 19.2.3(react@19.2.3) rimraf: specifier: 'catalog:' version: 6.1.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) + specifier: ^8.0.14 + version: 8.0.14(@types/node@25.0.9)(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: specifier: 'catalog:' - 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)) + version: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.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)) zod: specifier: ^3.24.2 version: 3.25.57 @@ -16370,6 +15865,18 @@ 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'} @@ -16414,6 +15921,10 @@ packages: resolution: {integrity: sha512-I5z7H3bf/41ktsNVLtpN0wAa336HkqIHQ5BuPLEhTkt1jVSyZpeNKIzTgEWmlxjdg81R0IgUCcaE+Ok3NvrfZg==} engines: {node: '>=6.9.0'} + '@babel/types@7.28.4': + resolution: {integrity: sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==} + engines: {node: '>=6.9.0'} + '@babel/types@7.29.8': resolution: {integrity: sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg==} engines: {node: '>=6.9.0'} @@ -16504,9 +16015,6 @@ 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==} @@ -16589,14 +16097,6 @@ packages: '@chevrotain/utils@10.5.0': resolution: {integrity: sha512-hBzuU5+JjB2cqNZyszkDHZgOSrUUT8V3dhgRl8Q9Gp6dAj/H5+KILGjbhDpc3Iy9qmqlm/akuOI2ut9VUtzJxQ==} - '@clack/core@1.4.3': - resolution: {integrity: sha512-/kr3UWNtdJfxZtPgDqUOmG2pvwlmcLGheex5yiZKdwbzZJxhV+HMNR9QNmyY5cGwTNV6LrR7Jtp+KjhUAP1qBQ==} - engines: {node: '>= 20.12.0'} - - '@clack/prompts@1.7.0': - resolution: {integrity: sha512-y7/yvZ2TPAnR9+jnc00klvNNLkJiXFFrQA/hlLCcxA9a2A4zQIOimyFQ9XfwYKiGD1fb5GY8vbKIIgO8d5Tb2A==} - engines: {node: '>= 20.12.0'} - '@clerk/backend@2.18.3': resolution: {integrity: sha512-fWMq/Tb2hgfUXLKJN8jr6pbpA5XLUwC4BjWz7lB5Y+YhXhBrO7GtfpZIS91L/aDhNb17X6IaE6XvS6tDJBCUUw==} engines: {node: '>=18.17.0'} @@ -16610,23 +16110,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.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 '@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.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 '@clerk/shared@3.28.2': resolution: {integrity: sha512-BfBCPaoPoLCiU0b0MhQUfCjs+bWRRLkdHw0vBffSjtsFLxp1b5IL5D8nKgDPIKIIv7DmCCmO15tr+GqG3CGpYQ==} engines: {node: '>=18.17.0'} peerDependencies: - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: react: optional: true @@ -16637,8 +16137,8 @@ packages: resolution: {integrity: sha512-sJUur/7jnHHlAsdoDosxpOmfV05VR7K5rvqlFskj3GaAMFEJrvdOztw0hmhBGVSWiCpjTZfdGITegton8mo7mQ==} engines: {node: '>=18.17.0'} peerDependencies: - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: react: optional: true @@ -16651,8 +16151,8 @@ packages: peerDependencies: '@tanstack/react-router': workspace:* '@tanstack/react-start': workspace:* - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 '@clerk/tanstack-react-start@0.27.14': resolution: {integrity: sha512-So+pchhM3NUIY0sFqxh3yv2hG9bifPUqkCIDUKVzq0+korMhHTsMXBwcsbt2LpQ9UBXob1dW5v1WxtdWkqELFw==} @@ -16660,8 +16160,8 @@ packages: peerDependencies: '@tanstack/react-router': workspace:* '@tanstack/react-start': workspace:* - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 '@clerk/types@4.101.10': resolution: {integrity: sha512-qlmgnAm/IeK02RKEKVN8/Glx07xw/Lcv67jBfikM8HXhHc5v7bfYLD8UiWTr6H2RGtvB09cIt9JezRRlsuVBew==} @@ -16673,19 +16173,10 @@ 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: @@ -16695,19 +16186,10 @@ 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.3.4 + vite: ^8.0.14 wrangler: ^4.75.0 '@cloudflare/workerd-darwin-64@1.20260317.1': @@ -16716,69 +16198,39 @@ 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] - '@cloudflare/workerd-windows-64@1.20261104.1': - resolution: {integrity: sha512-b/fnEU1leVm8UrI2EHQ4MSrK2vmnWdR1jefRyEUDZe3ucpKY0PWi4bVxWh5niZdlL0MIc4C5tXNXTlAMZpKDdA==} - engines: {node: '>=16'} - cpu: [x64] - os: [win32] + '@codspeed/core@5.5.0': + resolution: {integrity: sha512-5FbjNlxSVOfemB85orEecikZiTz0C8aZYUfCkt5HY6QLLd1mqkrHAfekEJw0gkHcgCjNgD6DVp2TXm0V/xtt4w==} - '@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==} + '@codspeed/vitest-plugin@5.5.0': + resolution: {integrity: sha512-u7NTLXujxo0bQVCYDXk2mDJ+lA8h5vPY96FvUpPYLUbzVRsM6HO62gXXn4ABJOGYwx1bIwXtgSpUlK/V63iIcg==} peerDependencies: tinybench: '>=2.9.0' - vite: ^8.3.4 - vitest: ^3.2 || ^4 || ^5 + vite: ^8.0.14 + vitest: ^3.2 || ^4 '@colors/colors@1.5.0': resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==} @@ -16793,8 +16245,8 @@ packages: peerDependencies: better-auth: 1.3.27 convex: '>=1.28.2 <1.35.0' - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 '@convex-dev/react-query@0.0.0-alpha.8': resolution: {integrity: sha512-Rv/q7/CplU75f7ckBd2vh+HoeeQ0tOrjwMl14Hk7D/03e55oUIU0TV5JYYzC79ZQyyAtoj7CmCo5ZxcmtKNv1Q==} @@ -16900,20 +16352,23 @@ packages: peerDependencies: '@electric-sql/pglite': 0.3.2 - '@electric-sql/pglite@0.3.16': - resolution: {integrity: sha512-mZkZfOd9OqTMHsK+1cje8OSzfAQcpD7JmILXTl5ahdempjUDdmg4euf1biDex5/LfQIDJ3gvCu6qDgdnDxfJmA==} - '@electric-sql/pglite@0.3.2': resolution: {integrity: sha512-zfWWa+V2ViDCY/cmUfRqeWY1yLto+EpxjXnZzenB1TyxsTiXaTWeZFIZw6mac52BsuQm0RjCnisjBtdBaXOI6w==} - '@emnapi/core@1.11.3': - resolution: {integrity: sha512-zLpS5asjEb7lq8jYLq37N6XKaE41DIexlY1rF/z4/tIl3wo13Sqm28fRyfIsKZD+NZ8mM5RoKkpW/rBcuoSZSg==} + '@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.4.5': resolution: {integrity: sha512-XsLw1dEOpkSX/WucdqUhPWP7hDxSvZiY+fsUC14h+FtQ2Ifni4znbBt8punRX+Uj2JG/uDb8nEHVKvrVlvdZ5Q==} - '@emnapi/runtime@1.11.3': - resolution: {integrity: sha512-Xz4Tpyki7XyrpbUK1jR1AhdAdaXyhhY4lZ3neLodmhpuWfy2PAQN5B46sAiU4liOXGLkHypn/qU+jvfWSCYYLA==} + '@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.4.5': resolution: {integrity: sha512-++LApOtY0pEEz1zrd9vy1/zXVaVJJ/EbAF3u0fXIzPJEDtnITsBGbbK0EkM72amhl/R5b+5xx0Y/QhcVOpuulg==} @@ -16921,8 +16376,11 @@ packages: '@emnapi/wasi-threads@1.0.4': resolution: {integrity: sha512-PJR+bOmMOPH8AtcTGAyYNiuJ3/Fcoj2XN/gBEWzDIKh254XO+mM9XoXHk5GNEhodxeMznbg7BlRojVbKN+gC6g==} - '@emnapi/wasi-threads@1.2.3': - resolution: {integrity: sha512-ELEBe8PsLvvJ6QMr0zLt8ffvOHW/dc1m3CEzNMg7aJUv3bMaoDtw2TXyDAwkYBuroxxuHEwhRTLJSe5sya547g==} + '@emnapi/wasi-threads@1.2.1': + resolution: {integrity: sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==} + + '@emnapi/wasi-threads@1.2.2': + resolution: {integrity: sha512-c95qOXkHdydNKhscBTebqEC1CVAZpyqOfVfBzQ1qgzyl3gfeldUjIggDbIZgDKsHLgnsM+igH7TJ/eAasaVuMA==} '@emotion/babel-plugin@11.13.5': resolution: {integrity: sha512-pxHCpT2ex+0q+HH91/zsdHkw/lXd468DIN2zvfvLtPKLLMo6gQj7oLObq8PhkrxOZb/gGCq03S3Z7PDhS8pduQ==} @@ -16943,7 +16401,7 @@ packages: resolution: {integrity: sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA==} peerDependencies: '@types/react': '*' - react: ~19.2.9 + react: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -16959,7 +16417,7 @@ packages: peerDependencies: '@emotion/react': ^11.0.0-rc.0 '@types/react': '*' - react: ~19.2.9 + react: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -16970,7 +16428,7 @@ packages: '@emotion/use-insertion-effect-with-fallbacks@1.2.0': resolution: {integrity: sha512-yJMtVdH59sxi/aVJBpk9FQq+OR8ll5GT8oWd57UpeaKEVGab41JWaCFA7FRLoMLloOZF/c/wsPoe+bfGmRKgDg==} peerDependencies: - react: ~19.2.9 + react: ^19.2.3 '@emotion/utils@1.4.2': resolution: {integrity: sha512-3vLclRofFziIa3J2wDh9jjbkUz9qk5Vi3IZ/FSTKViB0k+ef0fPV7dYrUIugbgupYDx7v9ud/SjrtEP8Y4xLoA==} @@ -17015,8 +16473,8 @@ packages: cpu: [ppc64] os: [aix] - '@esbuild/aix-ppc64@0.28.1': - resolution: {integrity: sha512-Svl7tq8k/08+p6CXPpRjQ1fKX+1odH/BQbb48fV6fj3CWHhsoIOoY87w1oHXm0qEpkIK3ZfVgp0hed3XBXzXMQ==} + '@esbuild/aix-ppc64@0.28.2': + resolution: {integrity: sha512-XExcO+dvLKvVtNTibSTBej1NCAbaGhWn9Ww1ZPx80qsahhPFe/8jgWP0IchNe0F3HwkU7n8ejhH8bjonqht8mQ==} engines: {node: '>=18'} cpu: [ppc64] os: [aix] @@ -17051,8 +16509,8 @@ packages: cpu: [arm64] os: [android] - '@esbuild/android-arm64@0.28.1': - resolution: {integrity: sha512-34EGEbCIAgosYz6goLcopX6Mo7NyGv9tfwEM2/7Ce2VcVRk568iSvniGWcUXIy7wEDR1wzolcxcriFVrWYcwBg==} + '@esbuild/android-arm64@0.28.2': + resolution: {integrity: sha512-5YfKeeI8qWfBZIX+u2xZC3Zlb3Os/gLS2sbEKM+I4ZOcsWmHS2WLysCcQZDAFRslDUU5Oiq44gf6PYN1vGwG5A==} engines: {node: '>=18'} cpu: [arm64] os: [android] @@ -17087,8 +16545,8 @@ packages: cpu: [arm] os: [android] - '@esbuild/android-arm@0.28.1': - resolution: {integrity: sha512-0k2F129Xdio1TdJfzJ8sy1Q47vUD2NnwdhiAf7drUN1EBTfPf4hsFCtmMgu/6m8JSzsBrlmVjudMBQqOfG8usQ==} + '@esbuild/android-arm@0.28.2': + resolution: {integrity: sha512-kXXoiPVVGQcnIYGOeaovwOURpniDBpSq4A03qkQ+BMQqtGG6HYap3xne9C1O1yo4TR3qxlCX5IqqmX6fFo2Lqg==} engines: {node: '>=18'} cpu: [arm] os: [android] @@ -17123,8 +16581,8 @@ packages: cpu: [x64] os: [android] - '@esbuild/android-x64@0.28.1': - resolution: {integrity: sha512-dbwY7ltSMDWsRatcRpCnES4F+im88OCUgGZjy52shC7GqHRE/cYlxNbB4Z4UpJswpcc4Qxd2oE/ufM0p61IKng==} + '@esbuild/android-x64@0.28.2': + resolution: {integrity: sha512-O387ite7SzUyCcy3JQX4P4bLtEA7bLLkx+esve5JHnyYfNTxcVpXZo9jhdB0lTKN44gztELTdU7nS8Nr16Fs1Q==} engines: {node: '>=18'} cpu: [x64] os: [android] @@ -17159,8 +16617,8 @@ packages: cpu: [arm64] os: [darwin] - '@esbuild/darwin-arm64@0.28.1': - resolution: {integrity: sha512-TZbWkQY7kvTAXbXUT7uVACR5cMHsDiSz9z7ZKAX/RTq/WJEk3QyRr0wZpNhBDX+/0CtdqUIJlOiodQcta6tY3Q==} + '@esbuild/darwin-arm64@0.28.2': + resolution: {integrity: sha512-n4KqkOQrraxHJcgjM1RvwbigfQKIKJVpM7xp+KsxiyUSrRdIXnt73VhrPAx0fV44hgfmIVKjxMN9J1t5jySVkw==} engines: {node: '>=18'} cpu: [arm64] os: [darwin] @@ -17195,8 +16653,8 @@ packages: cpu: [x64] os: [darwin] - '@esbuild/darwin-x64@0.28.1': - resolution: {integrity: sha512-zfdzgK9ACBNZLI/CyHTOx81SyNbM6YXn7rxSgX97VjyiPl9W1i4Ka4fgKECEoFCKGpvBj5qArWIGgQjOwkgskQ==} + '@esbuild/darwin-x64@0.28.2': + resolution: {integrity: sha512-uq6suIWYP37qzGddBKPw5QEQPi6HiLGsO7UmkpfyaYNQ3D+rN6w6WfwH+nuqcGXWvawGwxOEroO4YGnFh95azw==} engines: {node: '>=18'} cpu: [x64] os: [darwin] @@ -17231,8 +16689,8 @@ packages: cpu: [arm64] os: [freebsd] - '@esbuild/freebsd-arm64@0.28.1': - resolution: {integrity: sha512-wG2EA8ENdEI0qhkSZMjfqrdY+ziCYCPMmtZjjIwOmXFjmyzEHn+UUxk5of+SYsjtfs3VpnlC7QLzSI5hY/rOAw==} + '@esbuild/freebsd-arm64@0.28.2': + resolution: {integrity: sha512-n+I0BTSRIoy+d6RPKnEVwql5UwBJolytvY4mAOIEJorKlqgPII8ix6slVVrfZ5Tnj7glIZvloylbB/EJPMWEXw==} engines: {node: '>=18'} cpu: [arm64] os: [freebsd] @@ -17267,8 +16725,8 @@ packages: cpu: [x64] os: [freebsd] - '@esbuild/freebsd-x64@0.28.1': - resolution: {integrity: sha512-i7dZ9vQgnvSCzi/rYCXNgtF/U+eKZNJBzu3eTQbRgHnM7tNSizLOkRFAl3qzVc/Op/u5YkHHa4pf/3DOYHthLQ==} + '@esbuild/freebsd-x64@0.28.2': + resolution: {integrity: sha512-78XJTJkvPs0kz2w61301PJjXl4g7q3JqiYMZ/M/yVI73EHBrCRTgkhu9oqG7vPqq+a/yadEW8aD+agKlk5xrmg==} engines: {node: '>=18'} cpu: [x64] os: [freebsd] @@ -17303,8 +16761,8 @@ packages: cpu: [arm64] os: [linux] - '@esbuild/linux-arm64@0.28.1': - resolution: {integrity: sha512-yHs+0uc8+nvEAfAfxrWQKK5peSNzBc4PegcMO0EJ2hT71uA7vB8Ihg2e77R2P7SG5uYjPbHlLLmve4LLLRCf0g==} + '@esbuild/linux-arm64@0.28.2': + resolution: {integrity: sha512-pW4AC0P3it8c7do9MVM4p51FzHzdM/TZrerurgRcHJ2WTa1VQ1CIq18xncfpBJw4ojkiZZrKW2yIBWBP92j6Ug==} engines: {node: '>=18'} cpu: [arm64] os: [linux] @@ -17339,8 +16797,8 @@ packages: cpu: [arm] os: [linux] - '@esbuild/linux-arm@0.28.1': - resolution: {integrity: sha512-qVXBOHQS+d5Y722GwJzJUtOLlX7km3CraOaGormF1pDtPd2C/l1SHRPgjLunLGe51Sh5YYWKMFDyV4SxgMQYTQ==} + '@esbuild/linux-arm@0.28.2': + resolution: {integrity: sha512-XlDnu2q5yoqems+xay6wSAcg9DDD7K9RLKZEBOMZm3ckNpJBvOX20tSfby8KfrrhINDyv9V2YVZKY/SpoGJI8w==} engines: {node: '>=18'} cpu: [arm] os: [linux] @@ -17375,8 +16833,8 @@ packages: cpu: [ia32] os: [linux] - '@esbuild/linux-ia32@0.28.1': - resolution: {integrity: sha512-d1z4ZuP0ajrfz/FhGT4vv278rX8KnPPJx8i5+AtK7TYbx9Le9F1hyzurZpkEyjkGa9dUGhQow4C1NmeGvqxN2w==} + '@esbuild/linux-ia32@0.28.2': + resolution: {integrity: sha512-CYbnj78HsIeA+DhgUKgFCfvNsTHFhMMrinUrMZpDXJXKN8T3XViTZ/+wtHeVxEWY8ewSzTFN+nRmSwO2tZaLUQ==} engines: {node: '>=18'} cpu: [ia32] os: [linux] @@ -17411,8 +16869,8 @@ packages: cpu: [loong64] os: [linux] - '@esbuild/linux-loong64@0.28.1': - resolution: {integrity: sha512-M5sRjUVZrkm1OAPR3dlOYzNmN+loZKGVi1VUQGrwuqLcbR6qeAz+famMhjASeH3YVKvZz+zT1jlh/keC3Rj/lg==} + '@esbuild/linux-loong64@0.28.2': + resolution: {integrity: sha512-buwkd8nsph4R+ajRvw0qM5Hja/TXQow3ptzWO2EbG/cqcIkHloRrdlBtQlshyYGTNFvfkfJ5tpPLVkY4DtsPfQ==} engines: {node: '>=18'} cpu: [loong64] os: [linux] @@ -17447,8 +16905,8 @@ packages: cpu: [mips64el] os: [linux] - '@esbuild/linux-mips64el@0.28.1': - resolution: {integrity: sha512-mRObBZeHh2OxcBFPWE/FjylkRgZdYuiTR3vaTozquCGOH14iP9oN4x4Ge81CoIDYQrXmIxpFumJBu5MtZpnQJQ==} + '@esbuild/linux-mips64el@0.28.2': + resolution: {integrity: sha512-ZVykbDyk7519VwiNb9Lcj9m8XM6v5V9uKPvrEMkkEedVewf+0itkhahp4HDpgERXhwLRpWFypsGbG/J8s0QjJA==} engines: {node: '>=18'} cpu: [mips64el] os: [linux] @@ -17483,8 +16941,8 @@ packages: cpu: [ppc64] os: [linux] - '@esbuild/linux-ppc64@0.28.1': - resolution: {integrity: sha512-slScBsMAb3GFDcdrCgLwZtPYRoH2H/youv10QiZyRjmsP48fznoveWytSgCI/R0ZcUgpc0ZhIUEx6LHts8yrfQ==} + '@esbuild/linux-ppc64@0.28.2': + resolution: {integrity: sha512-CAXl+Dtd9UUuJd8pKKdwh6MLm3MUMiqMPmhZ3tTSXPqfyQ3vDl6R5hZdZ/kYojK4ofXtdfSv1tFq8XzWx3heNQ==} engines: {node: '>=18'} cpu: [ppc64] os: [linux] @@ -17519,8 +16977,8 @@ packages: cpu: [riscv64] os: [linux] - '@esbuild/linux-riscv64@0.28.1': - resolution: {integrity: sha512-kw0owk1o0GFETUJyW0jc0G4Yzs0BHZn0JDZ8JRT088vjJYX777BAs1fDGxAC+q831qOs2DTC96mNsG2opdfyyQ==} + '@esbuild/linux-riscv64@0.28.2': + resolution: {integrity: sha512-GeXCej4IQtU1B+QlDV8W/RRvbzI3O/Stss+/bCXv4lZls5WGRtu2a+3JkA3i4qIUlMXpcHebWpF8AkJhATowuA==} engines: {node: '>=18'} cpu: [riscv64] os: [linux] @@ -17555,8 +17013,8 @@ packages: cpu: [s390x] os: [linux] - '@esbuild/linux-s390x@0.28.1': - resolution: {integrity: sha512-/lAIjX8aYFRByhh6L5rYtPEDRqa9de/4V/juOXcta5frjvzXO4/sqEtyytse0g3zZFuWu5cDN0MkLz2qRDD2Ag==} + '@esbuild/linux-s390x@0.28.2': + resolution: {integrity: sha512-3H1weTYZPxt/WOhByszQZybS9w5lKzUn1FDMsgEChbHWQwHYQQRfBxgCcZvPhjHfKyJjIievvMmEUawJrdY9Dg==} engines: {node: '>=18'} cpu: [s390x] os: [linux] @@ -17591,8 +17049,8 @@ packages: cpu: [x64] os: [linux] - '@esbuild/linux-x64@0.28.1': - resolution: {integrity: sha512-u/anNYF2mmVOEDwLtnQ1wOr3EZ9sTNGLWrsYGYwHWzGA3Si84IOkHXlbWTD1NB+9/1lcnweYKO54uhxZydNzfA==} + '@esbuild/linux-x64@0.28.2': + resolution: {integrity: sha512-4xTZr1FUmSoQW4XIWmit3tzQrUTZM+N3P0XV8xROKYF50XfI7xeO90+1bZvNwxIufQ9hDQVRJH5YhgPVF8A/HQ==} engines: {node: '>=18'} cpu: [x64] os: [linux] @@ -17621,8 +17079,8 @@ packages: cpu: [arm64] os: [netbsd] - '@esbuild/netbsd-arm64@0.28.1': - resolution: {integrity: sha512-oks0DYbLwWMmaakTsCb+zL4E+aHRVLom9IJZOAthMQEPiQmydXHkziYEsGYRx0uNV/IjEKGAV941JzH02pflqw==} + '@esbuild/netbsd-arm64@0.28.2': + resolution: {integrity: sha512-sSATRjPeDBg3pdgHoQfoYBob11Kk1FGa9lui5RIHZCoCkJa9QKlvl3/vKz2usCmYYjs7ymJR/2Nnsqe+Hjt5nw==} engines: {node: '>=18'} cpu: [arm64] os: [netbsd] @@ -17657,8 +17115,8 @@ packages: cpu: [x64] os: [netbsd] - '@esbuild/netbsd-x64@0.28.1': - resolution: {integrity: sha512-aeL6lAnN89Hz43Mlh1G8ARasbuoYvSITDEx0tHh5b7jJnHcssqgjy9Yx430GDpmCa6OyrKoS0aNRjKundRizGg==} + '@esbuild/netbsd-x64@0.28.2': + resolution: {integrity: sha512-lqnzCV+mM0gIADaKihiCg6ifgfU2L3h5E33rNQBN1Y4MaVGnzryzmvvf7UHxprpQdE8hpqLolJ9Rl+SkIRDpyw==} engines: {node: '>=18'} cpu: [x64] os: [netbsd] @@ -17693,8 +17151,8 @@ packages: cpu: [arm64] os: [openbsd] - '@esbuild/openbsd-arm64@0.28.1': - resolution: {integrity: sha512-MEFJe5C3R8pwXdZ5Y21oo6m7ePiS0d9pWucn99O/wvyJZChoIQKrQDxKrGeW8F5+T0okTHesAmDeiHDTIq0V/Q==} + '@esbuild/openbsd-arm64@0.28.2': + resolution: {integrity: sha512-AL2qJILH7lNjrDmCQDvdxMfAUIv8KMNZOvrwAQ8i8//ntL9FflhOyMJ8OZSMBb8/AWXe3/5v5S20y3zCoZWKoQ==} engines: {node: '>=18'} cpu: [arm64] os: [openbsd] @@ -17729,8 +17187,8 @@ packages: cpu: [x64] os: [openbsd] - '@esbuild/openbsd-x64@0.28.1': - resolution: {integrity: sha512-i/ZLIOafE0Z8cI/XANJAixoJL/uRAoS2xOA3rb0xN+KK0K177cMAsQYkzHtBrtMXAKuAc7HGgcWiZ/sRC1Nxgw==} + '@esbuild/openbsd-x64@0.28.2': + resolution: {integrity: sha512-QtiuPytchRyC4rwUKhexJdQKvDuZ6hWloi3igqPQNUJCS1/v9EiO3UTOXR6A3FoMo4fnAKbWJdqaIwhOzh8qEw==} engines: {node: '>=18'} cpu: [x64] os: [openbsd] @@ -17753,8 +17211,8 @@ packages: cpu: [arm64] os: [openharmony] - '@esbuild/openharmony-arm64@0.28.1': - resolution: {integrity: sha512-ge+Z7EXFNt2BO1oAMsVpiQ8EwndV9i1xXerAeTIK7AtPs3bKFXQM7nlRxDSIUIMeueR1CNXxqztLzdNeReKBJg==} + '@esbuild/openharmony-arm64@0.28.2': + resolution: {integrity: sha512-WkhYDmpTjLvGlScA1rwjRUmhl4k8oXR3cIbtqWmELgU/dFeHHlEllxDvdWcNJV9rbzCexB5vz8gtNewWLgCT7Q==} engines: {node: '>=18'} cpu: [arm64] os: [openharmony] @@ -17789,8 +17247,8 @@ packages: cpu: [x64] os: [sunos] - '@esbuild/sunos-x64@0.28.1': - resolution: {integrity: sha512-BEjgtECkL3vY+SaSQ6nzVfiALUeFxpawyp8Jmf5PtYhf1Ug40N1h/hxlhts+f1FvSvarEigdxS3BlSMI2PJLcQ==} + '@esbuild/sunos-x64@0.28.2': + resolution: {integrity: sha512-GPMSkTOtMnv2U2F8gxe4Io6qmVs+YKyp832Etqqxr0hFngmXQ3rzwytelm3GIn7T4VviRUlf3sOgBOiTdvaf7g==} engines: {node: '>=18'} cpu: [x64] os: [sunos] @@ -17825,8 +17283,8 @@ packages: cpu: [arm64] os: [win32] - '@esbuild/win32-arm64@0.28.1': - resolution: {integrity: sha512-lCv9eK/H6ZJWbE7bh2nw54CZ9M2nupBxJcTsdk/QQnWkdSjKGuxmmH8/GWrlT1eMmZfn4dGcCjRte397WqfQXA==} + '@esbuild/win32-arm64@0.28.2': + resolution: {integrity: sha512-PIhhEkE9uPBleRBrQEJpUn7MBnibZzbGzYWPmY3x+YoVg/95zbjB4CxPPOQ8l5tYYM4mMaCthF8/1DIfBQQyWQ==} engines: {node: '>=18'} cpu: [arm64] os: [win32] @@ -17861,8 +17319,8 @@ packages: cpu: [ia32] os: [win32] - '@esbuild/win32-ia32@0.28.1': - resolution: {integrity: sha512-zvb/mB2bSCoJOpoCBgYKKpX6YM6mJBlBUVUtVj41DlZJVEB6/0CKlRYxP5wWl1C1ILiCoAU5wZZ4q1P3qeS6Eg==} + '@esbuild/win32-ia32@0.28.2': + resolution: {integrity: sha512-YmJbfTlvU7Sdn9BB+4PRES4oB6pxgS37MAONj+hBr/cpXS1aBPKXxNnDbu+QCWPj0o9dgyxeq79g6c5P8KeuYA==} engines: {node: '>=18'} cpu: [ia32] os: [win32] @@ -17897,8 +17355,8 @@ packages: cpu: [x64] os: [win32] - '@esbuild/win32-x64@0.28.1': - resolution: {integrity: sha512-bm4Mowrv+GXMlpWX++EcXw/iLyd1o3+bJkC2DkWXYVvgZCqD/bSj9ctZeAMC3cIxgjRVR2Dufaiu4YPxr5gW1A==} + '@esbuild/win32-x64@0.28.2': + resolution: {integrity: sha512-5ebpxr3nWMzrL/rnUI755Jkuee0bHL/Gq0WTF9lvcpv73wAp5eu8MfBUgWK9bhWvZjj7yX8etf/8tI8Ney695g==} engines: {node: '>=18'} cpu: [x64] os: [win32] @@ -18256,8 +17714,8 @@ packages: '@floating-ui/react-dom@2.1.2': resolution: {integrity: sha512-06okr5cgPzMNBy+Ycse2A6udMi4bqwW/zgBF/rwjcNqWkyr82Mcg8b0vjX8OJpZFy/FKjJmw6wV7t44kK6kW7A==} peerDependencies: - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 '@floating-ui/utils@0.2.9': resolution: {integrity: sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==} @@ -18280,11 +17738,6 @@ 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'} @@ -18309,26 +17762,29 @@ packages: resolution: {integrity: sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==} engines: {node: '>=18.18'} - '@img/colour@1.1.0': - resolution: {integrity: sha512-Td76q7j57o/tLVdgS746cYARfSyxk8iEfRxewL9h4OMzYhbW4TAcppl0mT4eyqXddh6L/jwoM75mo7ixa/pCeQ==} + '@iarna/toml@2.2.5': + resolution: {integrity: sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==} + + '@img/colour@1.0.0': + resolution: {integrity: sha512-A5P/LfWGFSl6nsckYtjw9da+19jB8hkJ6ACTGcDfEJ0aE+l2n2El7dsVM7UVHZQ9s2lmYMWlrS21YLy2IR1LUw==} engines: {node: '>=18'} + '@img/sharp-darwin-arm64@0.34.4': + resolution: {integrity: sha512-sitdlPzDVyvmINUdJle3TNHl+AG9QcwiAMsXmccqsCOMZNIdW2/7S26w0LyU8euiLVzFBL3dXPwVCq/ODnf2vA==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [arm64] + os: [darwin] + '@img/sharp-darwin-arm64@0.34.5': resolution: {integrity: sha512-imtQ3WMJXbMY4fxb/Ndp6HBTNVtWCUI0WdobyheGf5+ad6xX8VIDO8u2xE4qc/fr08CKG/7dDseFtn6M6g/r3w==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} cpu: [arm64] os: [darwin] - '@img/sharp-darwin-arm64@0.35.4': - resolution: {integrity: sha512-Uhfl4V4lhP2nbUVF9+hyH1+luj86f1gUFeo8ALYxFoULoU+G87D43BfeMP8XHsk9boxAnCY/bf2EHwhA7MuGsA==} - engines: {node: '>=20.9.0'} - cpu: [arm64] - os: [darwin] - - '@img/sharp-darwin-arm64@0.35.5': - resolution: {integrity: sha512-QRUlFQ0WxvdWyqqG/WtI3iupfD5rBzmCHXSdPsY91sAtVtTo7Q4cb6zOccZ3gqEqkr0f1As1ehLqmEpDsRf+lg==} - engines: {node: '>=20.9.0'} - cpu: [arm64] + '@img/sharp-darwin-x64@0.34.4': + resolution: {integrity: sha512-rZheupWIoa3+SOdF/IcUe1ah4ZDpKBGWcsPX6MT0lYniH9micvIU7HQkYTfrx5Xi8u+YqwLtxC/3vl8TQN6rMg==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [x64] os: [darwin] '@img/sharp-darwin-x64@0.34.5': @@ -18337,41 +17793,19 @@ packages: cpu: [x64] os: [darwin] - '@img/sharp-darwin-x64@0.35.4': - resolution: {integrity: sha512-hWniXY3bG5qKpkKrAwPe4y+VTPmf086YQAnkxWh7uA1YrlRouWGa0M0Mxj3ZjnXFkv7/TD1bTy9lGUK26vRvWw==} - engines: {node: '>=20.9.0'} - cpu: [x64] + '@img/sharp-libvips-darwin-arm64@1.2.3': + resolution: {integrity: sha512-QzWAKo7kpHxbuHqUC28DZ9pIKpSi2ts2OJnoIGI26+HMgq92ZZ4vk8iJd4XsxN+tYfNJxzH6W62X5eTcsBymHw==} + cpu: [arm64] 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] os: [darwin] - '@img/sharp-libvips-darwin-arm64@1.3.3': - resolution: {integrity: sha512-suTBPTDGrI9WodccaDdwZItTSaBYASlBk1NSfElSHrUfzu3szG6lvIF58+WiFvnfzuK8ZBFS5zE00PxqxnRiPg==} - cpu: [arm64] - os: [darwin] - - '@img/sharp-libvips-darwin-arm64@1.3.4': - resolution: {integrity: sha512-5R89nBYiRdUlSWJxPhO+GVtaXzXSxKnRu/xqMn3KTA3L9EB9Oy/P+Nn2f2vlhPuUdy/Zusb2DarbyTpGCfEDuw==} - cpu: [arm64] + '@img/sharp-libvips-darwin-x64@1.2.3': + resolution: {integrity: sha512-Ju+g2xn1E2AKO6YBhxjj+ACcsPQRHT0bhpglxcEf+3uyPY+/gL8veniKoo96335ZaPo03bdDXMv0t+BBFAbmRA==} + cpu: [x64] os: [darwin] '@img/sharp-libvips-darwin-x64@1.2.4': @@ -18379,15 +17813,11 @@ packages: cpu: [x64] os: [darwin] - '@img/sharp-libvips-darwin-x64@1.3.3': - resolution: {integrity: sha512-FVJZ5mITMobmXIz/hPDTw0EintTW5H3WfrxwLqEqjiIihlu+hVRyGrFQ60xl0Lxn7Bt3zdpevPaQi0HEzqz9fw==} - 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.3': + resolution: {integrity: sha512-I4RxkXU90cpufazhGPyVujYwfIm9Nk1QDEmiIsaPwdnm013F7RIceaCc87kAH+oUB1ezqEvC6ga4m7MSlqsJvQ==} + cpu: [arm64] + os: [linux] + libc: [glibc] '@img/sharp-libvips-linux-arm64@1.2.4': resolution: {integrity: sha512-excjX8DfsIcJ10x1Kzr4RcWe1edC9PquDRRPx3YVCvQv+U5p7Yin2s32ftzikXojb1PIFc/9Mt28/y+iRklkrw==} @@ -18395,15 +17825,9 @@ packages: os: [linux] libc: [glibc] - '@img/sharp-libvips-linux-arm64@1.3.3': - resolution: {integrity: sha512-0DaL0A6Xu6sQSQFwe4iVCrKWU2cCTItnRsYsCdxAMm9NF6twAA9BKnoqy4hqz4+azQ0JHuA26qiUKsf1XJ/v5A==} - cpu: [arm64] - os: [linux] - libc: [glibc] - - '@img/sharp-libvips-linux-arm64@1.3.4': - resolution: {integrity: sha512-Y3dgX/6lE2QhQb+Gxy0WZxfg9MEm/JBjamZpS2IklP7xIQoKN4hzAm7KcMVGtaVDt3neE9OKBC7vAfonA/Lr1A==} - cpu: [arm64] + '@img/sharp-libvips-linux-arm@1.2.3': + resolution: {integrity: sha512-x1uE93lyP6wEwGvgAIV0gP6zmaL/a0tGzJs/BIDDG0zeBhMnuUPm7ptxGhUbcGs4okDJrk4nxgrmxpib9g6HpA==} + cpu: [arm] os: [linux] libc: [glibc] @@ -18413,15 +17837,9 @@ packages: os: [linux] libc: [glibc] - '@img/sharp-libvips-linux-arm@1.3.3': - resolution: {integrity: sha512-3rbU4vqXXc3hY/OiXdl52xZvT0F1yEngWfvqudtPJg/KkyiaQw2DRsFrNzpmLvfavbwOq3qXn36GP8obHRULQA==} - cpu: [arm] - os: [linux] - libc: [glibc] - - '@img/sharp-libvips-linux-arm@1.3.4': - resolution: {integrity: sha512-LmRtTsOHuvM2+wlO2Db37dx5MiZhB0FvSunciw48YjdOkZz9KAiRbm8ujeMOA1INqmei5NapFxYEK1D1ZSidmw==} - cpu: [arm] + '@img/sharp-libvips-linux-ppc64@1.2.3': + resolution: {integrity: sha512-Y2T7IsQvJLMCBM+pmPbM3bKT/yYJvVtLJGfCs4Sp95SjvnFIjynbjzsa7dY1fRJX45FTSfDksbTp6AGWudiyCg==} + cpu: [ppc64] os: [linux] libc: [glibc] @@ -18431,33 +17849,15 @@ packages: os: [linux] libc: [glibc] - '@img/sharp-libvips-linux-ppc64@1.3.3': - resolution: {integrity: sha512-cdn1OvUBwsXhbC0zSzJnNzf5MZ/mTrobawDvNXBTxe8VtqKAm0sRuEY2Evzovb/w9JMk4TvRxqt1mekSuJz64w==} - cpu: [ppc64] - 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] os: [linux] libc: [glibc] - '@img/sharp-libvips-linux-riscv64@1.3.3': - resolution: {integrity: sha512-HjPVx7yKz+0lqdhDlTw1tt90wamBoxhiXpvl1XZpJLiHH4RCJ5yDTqH+VlYPv2fwFs89JFw4c1IexYOcQUi4IQ==} - cpu: [riscv64] - os: [linux] - libc: [glibc] - - '@img/sharp-libvips-linux-riscv64@1.3.4': - resolution: {integrity: sha512-aHkkIEHPRdQEegJN20MLmGtxYD9R2wQr3Cwpddnu5+YKMt6Uzax7S9h5gpZTo8wyrGuZSlfQ63OevL5mTyOC7Q==} - cpu: [riscv64] + '@img/sharp-libvips-linux-s390x@1.2.3': + resolution: {integrity: sha512-RgWrs/gVU7f+K7P+KeHFaBAJlNkD1nIZuVXdQv6S+fNA6syCcoboNjsV2Pou7zNlVdNQoQUpQTk8SWDHUA3y/w==} + cpu: [s390x] os: [linux] libc: [glibc] @@ -18467,15 +17867,9 @@ packages: os: [linux] libc: [glibc] - '@img/sharp-libvips-linux-s390x@1.3.3': - resolution: {integrity: sha512-neWLh+3yCNThxnfy3c4BbVBeGgt9aftno+XbT56iK28RgeDs3UOFWviLWlUu0bArYVYJaFDK+RRohbicUNCm8Q==} - cpu: [s390x] - os: [linux] - libc: [glibc] - - '@img/sharp-libvips-linux-s390x@1.3.4': - resolution: {integrity: sha512-ra/mB6MikESDUO7Yg+Mi95bFBb9GsObURuhnOv3OqknjGe9sZrG8tCe9q0xSIGrtLgvgw0gKnFWcK4blSgQOuQ==} - cpu: [s390x] + '@img/sharp-libvips-linux-x64@1.2.3': + resolution: {integrity: sha512-3JU7LmR85K6bBiRzSUc/Ff9JBVIFVvq6bomKE0e63UXGeRw2HPVEjoJke1Yx+iU4rL7/7kUjES4dZ/81Qjhyxg==} + cpu: [x64] os: [linux] libc: [glibc] @@ -18485,17 +17879,11 @@ packages: os: [linux] libc: [glibc] - '@img/sharp-libvips-linux-x64@1.3.3': - resolution: {integrity: sha512-4vKmvAst9nrowcqquKFAyZJUDolUaIp8uRiN0mWFguJ1IplC9/pitXtlnnlU4aa/eJw3J7i67V+pwUL+wZGdsA==} - cpu: [x64] + '@img/sharp-libvips-linuxmusl-arm64@1.2.3': + resolution: {integrity: sha512-F9q83RZ8yaCwENw1GieztSfj5msz7GGykG/BA+MOUefvER69K/ubgFHNeSyUu64amHIYKGDs4sRCMzXVj8sEyw==} + cpu: [arm64] os: [linux] - libc: [glibc] - - '@img/sharp-libvips-linux-x64@1.3.4': - resolution: {integrity: sha512-GJ//SSXbnwSDes02umB3nDJLFcQzw8a18V8fyhqr6tV515tOEMdImjjxj1AoafMRz56F3PHgftnj1QEKSU1zkw==} - cpu: [x64] - os: [linux] - libc: [glibc] + libc: [musl] '@img/sharp-libvips-linuxmusl-arm64@1.2.4': resolution: {integrity: sha512-FVQHuwx1IIuNow9QAbYUzJ+En8KcVm9Lk5+uGUQJHaZmMECZmOlix9HnH7n1TRkXMS0pGxIJokIVB9SuqZGGXw==} @@ -18503,15 +17891,9 @@ packages: os: [linux] libc: [musl] - '@img/sharp-libvips-linuxmusl-arm64@1.3.3': - resolution: {integrity: sha512-Y9kQaLMuNoB0bPYOOdcZMaseNrFpPodIWWMrx+CZyydf2xn68j9WYc6sWWRrDwNkzCQjKYfc68L7jKjGlHMibw==} - cpu: [arm64] - os: [linux] - libc: [musl] - - '@img/sharp-libvips-linuxmusl-arm64@1.3.4': - resolution: {integrity: sha512-hvulFwtjUcagsis6BBxHwGFwWoNZjgYmULGVrZcyfNbjA8hKILbRxGg15/7w5HDyXHXUos/j6baAWqnCyQ2DWA==} - cpu: [arm64] + '@img/sharp-libvips-linuxmusl-x64@1.2.3': + resolution: {integrity: sha512-U5PUY5jbc45ANM6tSJpsgqmBF/VsL6LnxJmIf11kB7J5DctHgqm0SkuXzVWtIY90GnJxKnC/JT251TDnk1fu/g==} + cpu: [x64] os: [linux] libc: [musl] @@ -18521,17 +17903,12 @@ packages: os: [linux] libc: [musl] - '@img/sharp-libvips-linuxmusl-x64@1.3.3': - resolution: {integrity: sha512-fj8Mv0HHfD1Rr+4I68+3agJynxDWtBFgicTbSOb9Bke6pIwzGcJ+RX/yHjmiEGFMCavY/dxvem7MyNaJF+wDiw==} - cpu: [x64] + '@img/sharp-linux-arm64@0.34.4': + resolution: {integrity: sha512-YXU1F/mN/Wu786tl72CyJjP/Ngl8mGHN1hST4BGl+hiW5jhCnV2uRVTNOcaYPs73NeT/H8Upm3y9582JVuZHrQ==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [arm64] os: [linux] - libc: [musl] - - '@img/sharp-libvips-linuxmusl-x64@1.3.4': - resolution: {integrity: sha512-6zXKeE/p39I1AmA3cJG35eyBGNqNddLnUXjhwBnsGjFPWqf5VKkDBEqaEkPDoTEtkxwi2vv8Tcr2mDyP4So7Fg==} - cpu: [x64] - os: [linux] - libc: [musl] + libc: [glibc] '@img/sharp-linux-arm64@0.34.5': resolution: {integrity: sha512-bKQzaJRY/bkPOXyKx5EVup7qkaojECG6NLYswgktOZjaXecSAeCWiZwwiFf3/Y+O1HrauiE3FVsGxFg8c24rZg==} @@ -18540,17 +17917,10 @@ packages: os: [linux] libc: [glibc] - '@img/sharp-linux-arm64@0.35.4': - resolution: {integrity: sha512-De4jpEnAU8Hd5oT0j1G3uL4ZvTuipVMn7YC6vPaJhy6/7EwEae0SVAoBrUMYQbkLGDm85taVWwuPc1a44LTzCQ==} - engines: {node: '>=20.9.0'} - cpu: [arm64] - os: [linux] - libc: [glibc] - - '@img/sharp-linux-arm64@0.35.5': - resolution: {integrity: sha512-LYVx5JTsOM2CBzmxreh+nl64/3H6Xb09iSLknqH47z2T2DFFxDeFLP5y4dJwe6H7uGQlHPyEEtIqyo3DYsRwdQ==} - engines: {node: '>=20.9.0'} - cpu: [arm64] + '@img/sharp-linux-arm@0.34.4': + resolution: {integrity: sha512-Xyam4mlqM0KkTHYVSuc6wXRmM7LGN0P12li03jAnZ3EJWZqj83+hi8Y9UxZUbxsgsK1qOEwg7O0Bc0LjqQVtxA==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [arm] os: [linux] libc: [glibc] @@ -18561,17 +17931,10 @@ packages: os: [linux] libc: [glibc] - '@img/sharp-linux-arm@0.35.4': - resolution: {integrity: sha512-7OAS8gI0EReKGVN2HssHlM6umJgxF5VI3xN0p9FA91p/YO+ou5hiNghLdZ5BEHztwaaK5+bLKRf8x/o2L2nk9A==} - engines: {node: '>=20.9.0'} - cpu: [arm] - os: [linux] - libc: [glibc] - - '@img/sharp-linux-arm@0.35.5': - resolution: {integrity: sha512-LEaXK2WdXVK5ykcw0buWyPMsmLLL2vpHLD6yrNSW+JGEL3BZPA4tpKN6iaMc4AxTTAoaX/sU1rOL51lcIz48ZQ==} - engines: {node: '>=20.9.0'} - cpu: [arm] + '@img/sharp-linux-ppc64@0.34.4': + resolution: {integrity: sha512-F4PDtF4Cy8L8hXA2p3TO6s4aDt93v+LKmpcYFLAVdkkD3hSxZzee0rh6/+94FpAynsuMpLX5h+LRsSG3rIciUQ==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [ppc64] os: [linux] libc: [glibc] @@ -18582,20 +17945,6 @@ packages: os: [linux] libc: [glibc] - '@img/sharp-linux-ppc64@0.35.4': - resolution: {integrity: sha512-2oYZJeIl4kCcMGk4ouZVjnkCtFrpQFlNEtJ6GbxzhHQchwH0NH/qEb9ykmOl29dqwMq+JhFdZn+1ak2FKhI9fQ==} - engines: {node: '>=20.9.0'} - cpu: [ppc64] - 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} @@ -18603,17 +17952,10 @@ packages: os: [linux] libc: [glibc] - '@img/sharp-linux-riscv64@0.35.4': - resolution: {integrity: sha512-cPbNChoRURAWdebDIHSenxRpgEdy7JkPydSnUxRm9VvKD7m0/xVaR/8Fzlu81pk5nHEvHH87UZUA7cTtwnbJSA==} - engines: {node: '>=20.9.0'} - cpu: [riscv64] - os: [linux] - libc: [glibc] - - '@img/sharp-linux-riscv64@0.35.5': - resolution: {integrity: sha512-LtdreXguaavKODPIfzJ4kffx7UNt1omwtK0rch4EBbbSTXPnxWmYSayXdLJw0fJzQ97kHt1gL/yh4tvU+nCyRQ==} - engines: {node: '>=20.9.0'} - cpu: [riscv64] + '@img/sharp-linux-s390x@0.34.4': + resolution: {integrity: sha512-qVrZKE9Bsnzy+myf7lFKvng6bQzhNUAYcVORq2P7bDlvmF6u2sCmK2KyEQEBdYk+u3T01pVsPrkj943T1aJAsw==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [s390x] os: [linux] libc: [glibc] @@ -18624,17 +17966,10 @@ packages: os: [linux] libc: [glibc] - '@img/sharp-linux-s390x@0.35.4': - resolution: {integrity: sha512-RY0JFY8Fd6RonCBtHz+DvadaPkXDSI1AUn6yWL9TipqkZ1vY8w8evqdgyDFnkm4/K1ve1TvZiaePP5oSd4+WVQ==} - engines: {node: '>=20.9.0'} - cpu: [s390x] - os: [linux] - libc: [glibc] - - '@img/sharp-linux-s390x@0.35.5': - resolution: {integrity: sha512-UZasTOFiYzotTsGOCu42BfUzP6Tu6Do/947iRm1RsLKvlllxwGcn4RN27LibGWceix4Y+Pmw3jsnTcCQIgWjqA==} - engines: {node: '>=20.9.0'} - cpu: [s390x] + '@img/sharp-linux-x64@0.34.4': + resolution: {integrity: sha512-ZfGtcp2xS51iG79c6Vhw9CWqQC8l2Ot8dygxoDoIQPTat/Ov3qAa8qpxSrtAEAJW+UjTXc4yxCjNfxm4h6Xm2A==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [x64] os: [linux] libc: [glibc] @@ -18645,19 +17980,12 @@ packages: os: [linux] libc: [glibc] - '@img/sharp-linux-x64@0.35.4': - resolution: {integrity: sha512-9qvvEAuk8k89TfWUoX2htWjbAMX8p+NxCppjpcg5k6xMsjhBQPTsoIh36h9Qde4WRuGpJeYnOjdosDn/cnv+OA==} - engines: {node: '>=20.9.0'} - cpu: [x64] + '@img/sharp-linuxmusl-arm64@0.34.4': + resolution: {integrity: sha512-8hDVvW9eu4yHWnjaOOR8kHVrew1iIX+MUgwxSuH2XyYeNRtLUe4VNioSqbNkB7ZYQJj9rUTT4PyRscyk2PXFKA==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [arm64] 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] + libc: [musl] '@img/sharp-linuxmusl-arm64@0.34.5': resolution: {integrity: sha512-fprJR6GtRsMt6Kyfq44IsChVZeGN97gTD331weR1ex1c1rypDEABN6Tm2xa1wE6lYb5DdEnk03NZPqA7Id21yg==} @@ -18666,17 +17994,10 @@ packages: os: [linux] libc: [musl] - '@img/sharp-linuxmusl-arm64@0.35.4': - resolution: {integrity: sha512-KB5jxpfWQTr0nc3xdHtWChdbifHrBGsd2SM62Eyxrl8afikm+f5qGBU75SJIZBT/S1MC8XyacdlXBMSWq6OURA==} - engines: {node: '>=20.9.0'} - cpu: [arm64] - os: [linux] - libc: [musl] - - '@img/sharp-linuxmusl-arm64@0.35.5': - resolution: {integrity: sha512-9HbMclmI1zlNkFRs3z9/eBtDjfD0sGlrX1z6b1qwmiFY5ElDLh4BC0LPBdVp7z1DXFiKlIcznf+ZlsuZzLxQqg==} - engines: {node: '>=20.9.0'} - cpu: [arm64] + '@img/sharp-linuxmusl-x64@0.34.4': + resolution: {integrity: sha512-lU0aA5L8QTlfKjpDCEFOZsTYGn3AEiO6db8W5aQDxj0nQkVrZWmN3ZP9sYKWJdtq3PWPhUNlqehWyXpYDcI9Sg==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [x64] os: [linux] libc: [musl] @@ -18687,42 +18008,21 @@ packages: os: [linux] libc: [musl] - '@img/sharp-linuxmusl-x64@0.35.4': - resolution: {integrity: sha512-f+eZJZIQNEEd26RPSW+76chwOf1XtA2Y/O+5ocVyLliHkeih3e+jhLVBdNTd2rS3IbNXK8+ug93Vf5ZXtF5Lxg==} - engines: {node: '>=20.9.0'} - cpu: [x64] - 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.4': + resolution: {integrity: sha512-33QL6ZO/qpRyG7woB/HUALz28WnTMI2W1jgX3Nu2bypqLIKx/QKMILLJzJjI+SIbvXdG9fUnmrxR7vbi1sTBeA==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [wasm32] '@img/sharp-wasm32@0.34.5': resolution: {integrity: sha512-OdWTEiVkY2PHwqkbBI8frFxQQFekHaSSkUIJkwzclWZe64O1X4UlUjqqqLaPbUpMOQk6FBu/HtlGXNblIs0huw==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} cpu: [wasm32] - '@img/sharp-wasm32@0.35.4': - 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.4': + resolution: {integrity: sha512-2Q250do/5WXTwxW3zjsEuMSv5sUU4Tq9VThWKlU2EYLm4MB7ZeMwF+SFJutldYODXF6jzc6YEOC+VfX0SZQPqA==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [arm64] + os: [win32] '@img/sharp-win32-arm64@0.34.5': resolution: {integrity: sha512-WQ3AgWCWYSb2yt+IG8mnC6Jdk9Whs7O0gxphblsLvdhSpSTtmu69ZG1Gkb6NuvxsNACwiPV6cNSZNzt0KPsw7g==} @@ -18730,16 +18030,10 @@ packages: cpu: [arm64] os: [win32] - '@img/sharp-win32-arm64@0.35.4': - resolution: {integrity: sha512-iNdlBX9gLVvqe2I3uIJSIKTq6wckP/DYxZtcqxm09x5Gi24DnFBmPAWZmr60ZyYMG0xlzo6goG3670ar+RXvRw==} - engines: {node: '>=20.9.0'} - 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] + '@img/sharp-win32-ia32@0.34.4': + resolution: {integrity: sha512-3ZeLue5V82dT92CNL6rsal6I2weKw1cYu+rGKm8fOCCtJTR2gYeUfY3FqUnIJsMUPIH68oS5jmZ0NiJ508YpEw==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [ia32] os: [win32] '@img/sharp-win32-ia32@0.34.5': @@ -18748,16 +18042,10 @@ packages: cpu: [ia32] os: [win32] - '@img/sharp-win32-ia32@0.35.4': - resolution: {integrity: sha512-kqRsbaa5CS6KHlpxnN7WhE6vAAugXyZButpRdvDWetlv6Qv4N9WTcrWzF7tXfB9T7MsoadqdI8hmwLq6UlLvtw==} - engines: {node: ^20.9.0} - cpu: [ia32] - os: [win32] - - '@img/sharp-win32-ia32@0.35.5': - resolution: {integrity: sha512-5Zm82LoBc43nhwNybZlG7Y1KO//Zhsn306fQl29ZOuStHLGTo3BWL83q3cznX0poxSAMuYL1On/BHBxkBeKr6A==} - engines: {node: ^20.9.0} - cpu: [ia32] + '@img/sharp-win32-x64@0.34.4': + resolution: {integrity: sha512-xIyj4wpYs8J18sVN3mSQjwrw7fKUqRw+Z5rnHNCy5fYTxigBz81u5mOMPmFumwjcn8+ld1ppptMBCLic1nz6ig==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + cpu: [x64] os: [win32] '@img/sharp-win32-x64@0.34.5': @@ -18766,18 +18054,6 @@ packages: cpu: [x64] os: [win32] - '@img/sharp-win32-x64@0.35.4': - resolution: {integrity: sha512-XtmnYhBcrORsJ4XJngyzr/EWP0hRZLAZRFaApdKuviyqF78+ylxh2y06ZmtULAMOnObJ3ucpN0AcwSWnMowTRg==} - engines: {node: '>=20.9.0'} - 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==} @@ -18792,38 +18068,16 @@ packages: resolution: {integrity: sha512-cvz/C1rF5WBxzHbEoiBoI6Sz6q6M+TdxfWkEGBYTD77opY8i8WN01prUWXEM87GPF4SZcyIySez9U0Ccm12oFQ==} engines: {node: '>=18.0.0'} - '@inquirer/ansi@2.0.8': - resolution: {integrity: sha512-WpQM+Ti6Z40EFwwt+uL2p4UabT+W179zHp6HhLVOzfbwnVn05IPO/eXIZXGNqcT1jbQ15SujNLzQ39k4QPPxBQ==} - engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} - '@inquirer/confirm@5.1.4': resolution: {integrity: sha512-EsiT7K4beM5fN5Mz6j866EFA9+v9d5o9VUra3hrg8zY4GHmCS8b616FErbdo5eyKoVotBQkHzMIeeKYsKDStDw==} engines: {node: '>=18'} peerDependencies: '@types/node': 25.0.9 - '@inquirer/confirm@6.3.2': - resolution: {integrity: sha512-Xvr/0HggjddPtGppuqVmxhTw+Hr8PvsZ/k0HmOEaAqQEt80OITNkFWnsdNmyT0/eM4Ab+iJLx2R8rctlEyfSVg==} - engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} - peerDependencies: - '@types/node': 25.0.9 - peerDependenciesMeta: - '@types/node': - optional: true - '@inquirer/core@10.1.5': resolution: {integrity: sha512-/vyCWhET0ktav/mUeBqJRYTwmjFPIKPRYb3COAw7qORULgipGSUO2vL32lQKki3UxDKJ8BvuEbokaoyCA6YlWw==} engines: {node: '>=18'} - '@inquirer/core@12.0.3': - resolution: {integrity: sha512-wsSy0sznmXwkty+2PzZwx00Cazc/E0r0B7mAzdGROz2Ct+DFZXaK7WDjGZvgjRldxH5ZhFVfF2lgkYrqgOw2KA==} - engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} - peerDependencies: - '@types/node': 25.0.9 - peerDependenciesMeta: - '@types/node': - optional: true - '@inquirer/external-editor@1.0.3': resolution: {integrity: sha512-RWbSrDiYmO4LbejWY7ttpxczuwQyZLBUyygsA9Nsv95hpzUWwnNTVQmAq3xuh7vNwCp07UTmE5i11XAEExx4RA==} engines: {node: '>=18'} @@ -18837,10 +18091,6 @@ packages: resolution: {integrity: sha512-Ey6176gZmeqZuY/W/nZiUyvmb1/qInjcpiZjXWi6nON+nxJpD1bxtSoBxNliGISae32n6OwbY+TSXPZ1CfS4bw==} engines: {node: '>=18'} - '@inquirer/figures@2.0.9': - resolution: {integrity: sha512-EAWgUTGQ/Umgga51dE3B2PUHbufuXarDfg86uVgoSgNHNNQnyFKcOrQLWVqYMghuSyHh8+2HUH0Js9cTC1WAdg==} - engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} - '@inquirer/type@3.0.4': resolution: {integrity: sha512-2MNFrDY8jkFYc9Il9DgLsHhMzuHnOYM1+CUYVWbzu9oT0hC7V7EcYvdCKeoll/Fcci04A+ERZ9wcc7cQ8lTkIA==} engines: {node: '>=18'} @@ -18850,15 +18100,6 @@ packages: '@types/node': optional: true - '@inquirer/type@4.1.1': - resolution: {integrity: sha512-yJoHYrMnxIsJZCY+0Vb66Dy3he3kL3e2wOBKhoSwWWAzZAY82emlxwgprCtp6yRixvNRNq9ztfRWQYPNr3Go7A==} - engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} - peerDependencies: - '@types/node': 25.0.9 - peerDependenciesMeta: - '@types/node': - optional: true - '@ioredis/commands@1.10.0': resolution: {integrity: sha512-UmeW7z4LfctwoQ5wkhVzgq8tXkreED2xZGpX+Bg+zA+WJFZCT6c062AfCK/Dfk81xZnnwdhJCUMkitihRaoC2Q==} @@ -18890,9 +18131,6 @@ 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==} @@ -19088,20 +18326,10 @@ packages: resolution: {integrity: sha512-JwqeCQ1U3fvccttHZq7Tk0m/TMC6WcFAQZdukypW3AzlJYKYTGNVd1ANU2GuhKnv4UQuOFj3oAl0LLG/gxFN1w==} engines: {node: '>=16'} - '@msw/playwright@0.6.7': - resolution: {integrity: sha512-q7m2JtnN1Iz25xauqx5lkD+tbbDM3oXZBg67aXr4EbxK7IZKTh6c71bbTCnDi/F2SuHq/jPUfS8NJXPcdroARA==} - engines: {node: '>=20.0.0'} - peerDependencies: - msw: ^2.12.10 - '@mswjs/interceptors@0.37.6': resolution: {integrity: sha512-wK+5pLK5XFmgtH3aQ2YVvA3HohS3xqV/OxuVOdNx9Wpnz7VE/fnC+e1A7ln6LFYeck7gOJ/dsZV6OLplOtAJ2w==} engines: {node: '>=18'} - '@mswjs/interceptors@0.41.9': - resolution: {integrity: sha512-VVPPgHyQ6ShqnrmDWuxjmUIsO9gWyOZFmuOfLd9LfBGQJwZfy0gvv9pbHSJuoFNIYC7ZDX9aoFwowjcdSC4E8w==} - engines: {node: '>=18'} - '@mui/core-downloads-tracker@6.4.7': resolution: {integrity: sha512-XjJrKFNt9zAKvcnoIIBquXyFyhfrHYuttqMsoDS7lM7VwufYG4fAPw4kINjBFg++fqXM2BNAuWR9J7XVIuKIKg==} @@ -19113,8 +18341,8 @@ packages: '@emotion/styled': ^11.3.0 '@mui/material-pigment-css': ^6.4.7 '@types/react': ^19.2.8 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@emotion/react': optional: true @@ -19130,7 +18358,7 @@ packages: engines: {node: '>=14.0.0'} peerDependencies: '@types/react': ^19.2.8 - react: ~19.2.9 + react: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -19141,7 +18369,7 @@ packages: peerDependencies: '@emotion/react': ^11.4.1 '@emotion/styled': ^11.3.0 - react: ~19.2.9 + react: ^19.2.3 peerDependenciesMeta: '@emotion/react': optional: true @@ -19155,7 +18383,7 @@ packages: '@emotion/react': ^11.5.0 '@emotion/styled': ^11.3.0 '@types/react': ^19.2.8 - react: ~19.2.9 + react: ^19.2.3 peerDependenciesMeta: '@emotion/react': optional: true @@ -19177,7 +18405,7 @@ packages: engines: {node: '>=14.0.0'} peerDependencies: '@types/react': ^19.2.8 - react: ~19.2.9 + react: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -19195,8 +18423,14 @@ packages: '@napi-rs/wasm-runtime@0.2.4': resolution: {integrity: sha512-9zESzOO5aDByvhIAsOy9TbpZ0Ur2AJbUI7UT73kcUTS2mxAMHOBaa1st/jAymNoCtvrit99kkzT1FZuXVcgfIQ==} - '@napi-rs/wasm-runtime@1.1.6': - resolution: {integrity: sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg==} + '@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 @@ -19204,204 +18438,125 @@ packages: '@neon-rs/load@0.0.4': resolution: {integrity: sha512-kTPhdZyTQxB+2wpiRcFWrDcejc4JI6tkPuS7UZCG4l6Zvc5kU/gGQ/ozvHTh1XR5tS+UlfAfGuPajjzQjCiHCw==} - '@netlify/ai@1.0.1': - resolution: {integrity: sha512-jicymJwSK2/PPi0c3TjWRSp2h1Q/R+SrDd2NMY6bjckFYJJ6jyfToJj+gaypMycknSWI5LCgFwnJS209CMXtMw==} - engines: {node: '>=22.12.0'} - - '@netlify/api@15.1.2': - resolution: {integrity: sha512-mwDpddsem/KJw0CDAKUBnzKsM9UUfgUgRntvL3yyOZ+L12amaXmj38T/1ndnxmRIx1rIJtfbq4eEzxloaniylA==} - engines: {node: '>=22.12.0'} + '@netlify/api@14.0.7': + resolution: {integrity: sha512-smSD3MnyUwi+rdcvRlD2EAGEpzK9RRMiGxaXzKW7FGqIlZSEe08aPySuC0d5BXwl/7EmT43hOkBHH4KtP8DxcQ==} + engines: {node: '>=18.14.0'} '@netlify/binary-info@1.0.0': resolution: {integrity: sha512-4wMPu9iN3/HL97QblBsBay3E1etIciR84izI3U+4iALY+JHCrI+a2jO0qbAZ/nxKoegypYEaiiqWXylm+/zfrw==} - '@netlify/blobs@11.0.3': - resolution: {integrity: sha512-Z8IXQtQC8BQjm76i1bN+l12TTyKQ/s1R92Ajhou7+fpP0KSxnJ65QzLEb5WuFuFutn8ORrcd4mlF8A2xhw8dzA==} - engines: {node: '>=22.12.0'} + '@netlify/blobs@10.1.0': + resolution: {integrity: sha512-dFpqDc6/x5LEu9L7kblCQu00CFEchH8J42jmQoXPuhKoE7avajzeLTbVKA8Olk3S/c2m9ejegrgbhL8NRA2Jyw==} + engines: {node: ^14.16.0 || >=16.0.0} - '@netlify/cache@4.0.0': - resolution: {integrity: sha512-tRWkLmO6pyqZetFkhYgtX6LH1umqaJAZN5mRNOJubca/+Mqm0VTUyl51FeS0UbVfetLwiwgpzbGmABpc5gGHyg==} - engines: {node: '>=22.12.0'} + '@netlify/cache@3.3.0': + resolution: {integrity: sha512-rKHmfPreOJhOz0FEKzqFdykIAdO2fC98hNXab6JuIKycySWZtLq+YtythuR/qL6AWBtdn1DQTAsOh8zBz7va7w==} + engines: {node: '>=20.6.1'} - '@netlify/config@25.2.5': - resolution: {integrity: sha512-VqJeiQk2eZ9o3ls7C57e2TEalQdR2U3oLjI/Rlo9njU0l8bD3Cr6kBTU5shGIPQgeJVGU9rQLaX24Yd7WXrWVA==} - engines: {node: '>=22.12.0'} + '@netlify/config@23.2.0': + resolution: {integrity: sha512-zlI792/efPUY1XKtBML2OJBgKMyfNQIeGEYibH8SqeDxPjNuCy0qELE0U9Sc6+Ss34XryPBUPdV60tYhSoe6lw==} + engines: {node: '>=18.14.0'} hasBin: true - '@netlify/database-dev@1.0.1': - 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'} + '@netlify/dev@4.6.3': + resolution: {integrity: sha512-PT23zofsvrH/y28HwdLpa3VDsXaJPG+aauJ9MTWC2xQBUlMvlhuLBB+WtjxbnEuQUTzxQ7sgVXnt2o5WyqWb7A==} + engines: {node: '>=20.6.1'} - '@netlify/dev@5.1.0': - resolution: {integrity: sha512-g4fIVlz62NXshbLMx+UjHkcF/cr28AXAU/xpTJiFntkKddsoO5ahQjtBEoiKSQsBPtUrT7a7vMk6VFlrB3RDrg==} - engines: {node: '>=22.12.0'} - - '@netlify/edge-bundler@16.0.4': - resolution: {integrity: sha512-J7joSRuOIwg7bSMQBc+zq7Lb3p6gwsLMU/NYSFbXNIZtk6gSQnY3ZwnAncEhRqvN8lKsKx+27bn+4B2+B0N8ag==} - engines: {node: '>=22.12.0'} + '@netlify/edge-bundler@14.7.0': + resolution: {integrity: sha512-EvjYzhY0qrDhapJQ8n/fXvEsjImai36VKs6kuVey20Qos5jC0oljdUBOeQ35nXTxiWi2Vo91IhjIWEQCLcUNdQ==} + engines: {node: '>=18.14.0'} '@netlify/edge-functions-bootstrap@2.16.0': resolution: {integrity: sha512-v8QQihSbBHj3JxtJsHoepXALpNumD9M7egHoc8z62FYl5it34dWczkaJoFFopEyhiBVKi4K/n0ZYpdzwfujd6g==} - '@netlify/edge-functions-dev@2.0.1': - resolution: {integrity: sha512-IIIBoBhbqoOeOQLEfYLmW55IHOAxXc9athsUH7ZHKUUs3agi7ehVaZYZwhkQxB+l/K9/vRYHUnAZD715auIDpA==} - engines: {node: '>=22.12.0'} + '@netlify/edge-functions-dev@1.0.0': + resolution: {integrity: sha512-bAUOuyxkqjEnX64Xel2QKqa7RNA13axrHYI089Vh9w5/+MCtf+CEuwexQ0Y3RoCyefjg8arHShL7lBccWFh4cg==} + engines: {node: '>=20.6.1'} - '@netlify/edge-functions@4.0.0': - resolution: {integrity: sha512-0jerPQQ5mLczl7jwCRfTJsLcaiXbvPOC+Whtxxk7IHdz24OvZGjUtVHAxhppjT8wcX48I7C6oAff04QdQDMTfw==} - engines: {node: '>=22.12.0'} + '@netlify/edge-functions@3.0.0': + resolution: {integrity: sha512-qvwxrrOFeB9phD4zok/8FDWCXtipYpmLav/B2M6mUyjwB+XTZA769WfNWRElTG4cSUgrNM+GkyLuFHU2D0aY4Q==} + engines: {node: '>=18.0.0'} - '@netlify/functions-dev@2.0.5': - resolution: {integrity: sha512-SSlmwe5GMfQmTDPbHfVTPe4h6lI3kbcepRxT2CKN30L9gx0NmwTGoMgns36DV64fHvabT5gNzzRxOx5sxYgzNg==} - engines: {node: '>=22.12.0'} + '@netlify/functions-dev@1.0.0': + resolution: {integrity: sha512-Ws/NZiSjz2X2KW4fpZIPkfKGwoFcTFItm6iAgpY06TOol+n+sy2+qgvvjvF6Plm1l7mT2kttxXdsk6kVnR31Qg==} + engines: {node: '>=20.6.1'} - '@netlify/functions@6.0.0': - resolution: {integrity: sha512-Pee+FoFnAtdejTkl62a7mZxj6Wx4eqVNuYyDc5T4XPJN9GaAWaUf4cZQFlf2m4Fqq0HoghjtcPKo+BZviVPPKA==} - engines: {node: '>=22.12.0'} + '@netlify/functions@5.0.0': + resolution: {integrity: sha512-gyKzl+P5SPp6P4iqykwPagSy7ODgRoQqi9TkjFJjM74FVJgxdiBQoLAmz+Pjl7kE5avJWtIvlQ+akAFaChekQQ==} + engines: {node: '>=18.0.0'} - '@netlify/headers-parser@10.1.1': - resolution: {integrity: sha512-ooiSc/eN/ktuugZmY4GVPh6nBYz2um0zpemokDvTLLQPF12QyXil8N6fr82wdLi03WNowwiL98eultZkTyHlyw==} - engines: {node: '>=22.12.0'} + '@netlify/headers-parser@9.0.2': + resolution: {integrity: sha512-86YEGPxVemhksY1LeSr8NSOyH11RHvYHq+FuBJnTlPZoRDX+TD+0TAxF6lwzAgVTd1VPkyFEHlNgUGqw7aNzRQ==} + engines: {node: '>=18.14.0'} - '@netlify/headers@3.0.1': - resolution: {integrity: sha512-LcEu16gy28dkEp2+pa5EafauTfmFl6hkwiPqmoMBY+GiLLWQC00X8L4O1ZUrPqbKynsraSqEeKEfocC2FktrEQ==} - engines: {node: '>=22.12.0'} + '@netlify/headers@2.1.0': + resolution: {integrity: sha512-+7MgRPBYhRjizrd6JHxlD9KCjUyYk5yMqa16Ib3VNOSWYzaYiQi8Muyb1pn1pQVfBN2oPeK/q7J3pEdc/PWznQ==} + engines: {node: '>=20.6.1'} - '@netlify/images@2.0.1': - resolution: {integrity: sha512-47DzR/PqIJqbUIef6P7EmhbNQbUOD4IuGNhTG7h3+xcynhQdBLBkCaBwY2DXOzUloA1MxYhKGYV2z4R3pO36hg==} - engines: {node: '>=22.12.0'} + '@netlify/images@1.3.0': + resolution: {integrity: sha512-edQefgR4aeL04oSgkGyjza3CObdU2C24EmRuF/FPXIR1GHa/TkEKMamppxFjZ6qj1i5tX0RGTLKvnREmtW34NA==} + engines: {node: '>=20.6.1'} - '@netlify/open-api@2.57.1': - resolution: {integrity: sha512-4YKcf35SKDp8N1JPw5cN/P0n/rJmVg8igL3UQUtAPIA9lBea6IigUknWRAXZEHhmXHAyR2ptiejSuQk+YFmlEA==} + '@netlify/open-api@2.40.0': + resolution: {integrity: sha512-Dp4lilDnkRKGWnljGkFVxfoh1wsWqxheE5/ZOf/sMZPsh3jGu5QZ4hVLEidzXYB/zIKFFqLaUbP2XYVxTqWqyQ==} engines: {node: '>=14.8.0'} - '@netlify/otel@7.0.2': - resolution: {integrity: sha512-MHEsRJTZtOCrLa2fR+Y3GN51rvgxUHazuRVxuWuG7R1qzwynXAZB20Ufwp7BxKSTKcp7LNVEnKAZ/k2ytVmYvQ==} - engines: {node: '>=22.12.0'} + '@netlify/redirect-parser@15.0.3': + resolution: {integrity: sha512-/HB3fcRRNgf6O/pbLn4EYNDHrU2kiadMMnazg8/OjvQK2S9i4y61vQcrICvDxYKUKQdgeEaABUuaCNAJFnfD9w==} + engines: {node: '>=18.14.0'} - '@netlify/redirect-parser@16.1.1': - resolution: {integrity: sha512-2Wg2em5rUi9EXKz5z4MAUb2Pfoyxm+jJpERYyIuYOwm6pfQHQCBjOD+HoW2CzDS859c0FlxNdnxq50bkfdKiLA==} - engines: {node: '>=22.12.0'} + '@netlify/redirects@3.1.0': + resolution: {integrity: sha512-Eo50oNaTybEfB/4W6JFWdzQ1EbpObbaf83sIpT6H0DzfBgQIzPc3azdb7eD9eEFi3IAQjR5kZ6bOb2i4wbFDHQ==} + engines: {node: '>=20.6.1'} - '@netlify/redirects@4.0.2': - resolution: {integrity: sha512-4Qpz6FpwrLITrScg34zjK9Iv0BiyyPVAGO7HvUZg0txihHPgKBRtLMByEwfP6mhuzTExoxMXYklqgHg2xtbPxA==} - engines: {node: '>=22.12.0'} - - '@netlify/runtime-utils@3.0.0': - resolution: {integrity: sha512-OHo40+V3QZkR+UrDjqhN+LekrAby/dSSJxsvyYs9i88E/mSl3goB/ysoL+VYROm190egxmQyRYlHK7vL4GeHBQ==} - engines: {node: '>=22.12.0'} - - '@netlify/runtime@5.0.3': - resolution: {integrity: sha512-MGoAWvFDuD0BbpIo8pwYPxxWsfMGBiiI4HetQOMkrx7ytnEZjq/qKKfzNCQKJg0Ed86XdQefKToVcP10wc38IQ==} - engines: {node: '>=22.12.0'} - - '@netlify/server-dev@0.1.1': - resolution: {integrity: sha512-yA+uMfscw2Unz8JvC0dRP9z5P0lnCOy//9YICFF4nzDijYXe80bsnvrblB8wOPYBq0/KmVhl4s0gCP/3roTp4w==} - engines: {node: '>=22.12.0'} - - '@netlify/serverless-functions-api@2.18.0': - resolution: {integrity: sha512-Uo5XyMFZOinq6AonHu6dUOkLvVydn+SaldoVkB4yQSpDrtqYWi56CoA26IIOur1EMJqRdt6JIzjzIe4jpzYdhQ==} - engines: {node: '>=18.0.0'} - - '@netlify/serverless-functions-api@2.21.2': - resolution: {integrity: sha512-hlWyAXqwPXXujQ59fago956xft8EykD9jBncM6h+M/06mBR6E4stO1r1tDgAqRYm+XqgA7ZZNZU5TtBD+ZhLVw==} - engines: {node: '>=18.0.0'} - - '@netlify/static@4.0.0': - resolution: {integrity: sha512-YJcyaByknJ/JMmcqUFb9XId2NLgZitJlQC2FGP1a6mqndiMzAd9qoKtHxNRHX4NefI49+UABGtKF4UkL5rM8tw==} - engines: {node: '>=22.12.0'} - - '@netlify/types@2.8.0': - resolution: {integrity: sha512-8/g0Pt6y6wXj5Ia5eeYLiXhRfWeqZXGXpGFeCiiQdUOem+FPtXdA4+YdGxqzWc7D0AvptKSO01KGeeVWHSu8Kg==} + '@netlify/runtime-utils@2.2.0': + resolution: {integrity: sha512-K3kWIxIMucibzQsATU2xw2JI+OpS9PZfPW/a+81gmeLC8tLv5YAxTVT0NFY/3imk1kcOJb9g7658jPLqDJaiAw==} engines: {node: ^18.14.0 || >=20} - '@netlify/types@3.0.0': - resolution: {integrity: sha512-zRCidsQgI4CZWrZB/kmwdPf0QbSNljakfNSLizFvrsSA3UcUrTWSBNMVKmZnob92/8ESeUN0ewXLOlffJU+ATQ==} - engines: {node: '>=22.12.0'} + '@netlify/runtime@4.1.1': + resolution: {integrity: sha512-5qnHsri4X5r2spdD2tvdbU78grFV4fq7uVh/rMXF19qlgcHiuo0yr1JBEim1oINs/w+pyjusXMfnFEZjvV2qlQ==} + engines: {node: '>=20.6.1'} - '@netlify/vite-plugin-tanstack-start@1.3.19': - resolution: {integrity: sha512-qLrbU7ZWyHtoCdtmTUOUc9VQwMRHfJ5EqAVOwZyXHbp4okdFGeJkpcpwNGa1pHDOvdrVf8dyIK0Plc0KvX829g==} - engines: {node: ^22.12.0 || >=24.0.0} + '@netlify/serverless-functions-api@2.7.1': + resolution: {integrity: sha512-NQcLB8BHbIsgSBPk9A/OBR5mGpc6dOAg1iRsYHWK0IoKsvwQ9a7bZc2+E40nE41Mnk24UjfK09vDLxP85O/zwA==} + engines: {node: '>=18.0.0'} + + '@netlify/static@3.1.0': + resolution: {integrity: sha512-XbxiXpHaAakBASBFL5qc0SJhLlJdzYD0MYdM9sfCnRI38YJdvr0F2eHQlQDF016gn/iXhG6fJDxcWHEt2hEFDA==} + engines: {node: '>=20.6.1'} + + '@netlify/types@2.1.0': + resolution: {integrity: sha512-ktUb5d58pt1lQGXO5E9S0F1ljM0g+CoQuGTVII0IxBc0apmPq5RI0o3OWLY7U3ZERRiYTg5UfjiMihBEzuZsuw==} + engines: {node: ^18.14.0 || >=20} + + '@netlify/vite-plugin-tanstack-start@1.1.4': + resolution: {integrity: sha512-GahhrKT7B1LRi4Bnj+O+Yhs2Bu4N6AfILzz/b06YxXEO7rRfX2yUDRBtv7/AFVLkyVOtkypkFZhZBbK9craVEA==} + engines: {node: ^22.12.0} peerDependencies: '@tanstack/react-start': workspace:* '@tanstack/solid-start': workspace:* - vite: ^8.3.4 + vite: ^8.0.14 peerDependenciesMeta: '@tanstack/react-start': optional: true '@tanstack/solid-start': optional: true - '@netlify/vite-plugin@3.0.1': - resolution: {integrity: sha512-63vL+KpnbfJv+xQSfOn37j8aSOWjiljeaFL9g/HY+YNJpDJ3Y5BPPW1VExx4dcPqXBkggBHm5Y6HpTvBeTSx3Q==} - engines: {node: '>=22.12.0'} + '@netlify/vite-plugin@2.7.4': + resolution: {integrity: sha512-Eid41kWWruhONKA7eS+bGMs+JjEXaBhQEkH82+SyjeSVj+FhHQGSHdrejMI0nj1jSgVUa3JMh+l57OgRB6Lvkg==} + engines: {node: ^20.6.1 || >=22} peerDependencies: - vite: ^8.3.4 + vite: ^8.0.14 - '@netlify/zip-it-and-ship-it@15.5.1': - resolution: {integrity: sha512-ECHwLIHkSgfkxqF+q40xLMTTSxir1/pDGK6d55oKvwKidrW4qyTyHCAkuKtjOTJ30A+E238X2iiRyI+SCDjTuA==} - engines: {node: '>=22.12.0'} + '@netlify/zip-it-and-ship-it@14.1.11': + resolution: {integrity: sha512-5Ed9XH1JVPL7pAdq9zpC2WHjqHhHkaghuV3r2bvTTpx9JrTdzZxPeNnjZRjJMkjQAi8xSped5hNFJuD0QYmOuw==} + engines: {node: '>=18.14.0'} hasBin: true - '@next/env@16.3.4': - resolution: {integrity: sha512-cjWZnUUa6jZq2kFaNe/ZyJdZonOZ/QoN0Zka2nz/FLOrfx14pQuM9c5RaSVkWMqgdt4ksgPAMWPyHSs/CyV48Q==} - - '@next/swc-darwin-arm64@16.3.4': - resolution: {integrity: sha512-iBr3I5LZNk5/bgl5//iTgD2tcym14MX0Xo7fD//u9dYAEgGzza1y9oywluPtf74YnOswVdH1908aK9xVz7zQTw==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [darwin] - - '@next/swc-darwin-x64@16.3.4': - resolution: {integrity: sha512-2dpiSyl2Jw/NrBPaU2MAKGSa+2MR82pJIn4Sm5Rjr+gxAeuh0z158Su3Z2O8zn7UNNq+ej4bToed6RcRN/Lydg==} - engines: {node: '>= 10'} - cpu: [x64] - os: [darwin] - - '@next/swc-linux-arm64-gnu@16.3.4': - resolution: {integrity: sha512-+t+U8HZT+fApePCS5h89CSH3datz29MkzyfCn+6fpsZBG/oiEOhINcb9rtkv6sdpToLGFn2e6146NzaKCXkqrA==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [linux] - libc: [glibc] - - '@next/swc-linux-arm64-musl@16.3.4': - resolution: {integrity: sha512-mx03GNs1ocQA5JQ4FxDMmIsNkdrZh8cuezKCrId28e5/gIPU/l7Kcy2+vmCCzdjnnmXJy+iOAu+7K0QppO6Urg==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [linux] - libc: [musl] - - '@next/swc-linux-x64-gnu@16.3.4': - resolution: {integrity: sha512-YIhGY6fSMfha52bnVxnzc9zaVBzJg+cqQTOD8tXIBSx4fuv0pVMxQTE0PaS59YhnMOiYiG09IMwxJAf/CFm/Dw==} - engines: {node: '>= 10'} - cpu: [x64] - os: [linux] - libc: [glibc] - - '@next/swc-linux-x64-musl@16.3.4': - resolution: {integrity: sha512-+eaaX6axpDb0yF1GCpiERe6njplvdC+nks/fKfcHu3XPGRrald8P3/X7yv7QLdjA51knnxwl9pxdIJsg+w1L+Q==} - engines: {node: '>= 10'} - cpu: [x64] - os: [linux] - libc: [musl] - - '@next/swc-win32-arm64-msvc@16.3.4': - resolution: {integrity: sha512-0jcXW7Xs/uzICrmgV3MhDYDeRy++1CqnpDIerlPIqYO4bhzB4WNbX/aRnQclustsAyTkFKB0z6rbcjmNg5tR8A==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [win32] - - '@next/swc-win32-x64-msvc@16.3.4': - resolution: {integrity: sha512-vvBzwu1pYQCp92maZCFCIw/XgOTMR5tur9GjakwIo2cmwRTMKajRZZDS9+e4KsUZWKu1E007WUeAFXRRjZeuzw==} - engines: {node: '>= 10'} - cpu: [x64] - os: [win32] - '@noble/ciphers@2.2.0': resolution: {integrity: sha512-Z6pjIZ/8IJcCGzb2S/0Px5J81yij85xASuk1teLNeg75bfT07MV3a/O2Mtn1I2se43k3lkVEcFaR10N4cgQcZA==} engines: {node: '>= 20.19.0'} @@ -19426,62 +18581,62 @@ packages: resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==} engines: {node: '>= 8'} - '@nx/devkit@24.0.0': - resolution: {integrity: sha512-t5E5VOCoNECLFMMp6qUczUx5kYduyvMMsHFGvuXPCKX32Ny4aFbeIrYNqCrsNKr9KgzMr0tOvRA+EMT0v7BXEA==} + '@nx/devkit@22.7.5': + resolution: {integrity: sha512-/63ziS7kdHXYTLLhwWBu9hFwoFFT8xf+PkcQjsNdPqc5JmkYkSew0cE/vp5ORgBpGLWWnFPJgmfqjbJoO2C7jA==} peerDependencies: - nx: '>= 23 <= 25 || ^24.0.0-0' + nx: '>= 21 <= 23 || ^22.0.0-0' - '@nx/nx-darwin-arm64@24.0.0': - resolution: {integrity: sha512-ZHXmqkMVF7aA6QShvc5lVkCU6JHjGV19m8eplw0pL06AFgNdQ9u16013HJPm+Ys6fKnltYDWl/Ef7meQjT+u3Q==} + '@nx/nx-darwin-arm64@22.7.5': + resolution: {integrity: sha512-eoPtwx0qZqvRUD+VVOHm150AlSYwYoPxkDHBBGqKCn5nzPspb0lLWw8q83crM/L1M928YgK0WmGf3C++7eqsTA==} cpu: [arm64] os: [darwin] - '@nx/nx-darwin-x64@24.0.0': - resolution: {integrity: sha512-a+cpg/VQvD/vF7BJsl70vulc1GxCamtU0XwzkGOzzDATn3JcKBNpBFx0Iqp5frJYN0X00Supz4zhgCEe9LpCow==} + '@nx/nx-darwin-x64@22.7.5': + resolution: {integrity: sha512-VLOn/ZoEn3HfjSj+yIHLCM56/el79r+9I28CkZNHaSXJQWZ3edSkcgcfYjVxCurpN2VEwDQHLBeFCH8M+lQ7wQ==} cpu: [x64] os: [darwin] - '@nx/nx-freebsd-x64@24.0.0': - resolution: {integrity: sha512-PAGVaLbJxEzBXSQvg82g/8mDoqoMQFIX/EchuJbJGekIiz3BM2Xgyiy5qAD2/2meLVOTFtbkBQR+4ZSymgqGWw==} + '@nx/nx-freebsd-x64@22.7.5': + resolution: {integrity: sha512-LEVer/E2xfGvK9Go+imMQoEninOoq/38Z2bhV1SD3AThXrp1xaLFVkW5jQ6juebeVkAeztEoMLFlr576egS0vw==} cpu: [x64] os: [freebsd] - '@nx/nx-linux-arm-gnueabihf@24.0.0': - resolution: {integrity: sha512-WOWBIlTb+1FNP86GcodUF4BHdjVyGCwrVH/lqUvNAmT/FPopirCzVLdoj1P5kfWC/F0II/qAu7X698yKzIu71A==} + '@nx/nx-linux-arm-gnueabihf@22.7.5': + resolution: {integrity: sha512-NP27EFGpmFJM6RL1Ey/AFJ7gA2xuqtIHaw6jjSNGvfrnZRUNaway30GrVaGGeODf0DsvAty/unqoBMPy6kDHbw==} cpu: [arm] os: [linux] - '@nx/nx-linux-arm64-gnu@24.0.0': - resolution: {integrity: sha512-vASWIfOijXd5cdOn0Z6Wcd2iwtFxlBoBre6w+c8wuLLLPN3r4SRQyL+jAEB+eHkUHz39mMxSwa8DY+VlS9luVw==} + '@nx/nx-linux-arm64-gnu@22.7.5': + resolution: {integrity: sha512-QLnkJl3HkHsPfpLiNiAiMfpfAeFpic0U1diAxF8RqChOkCpQ7ulvyBVgE1UrQxvhd+gFQ3ed5RNDxtCRw8nTiw==} cpu: [arm64] os: [linux] libc: [glibc] - '@nx/nx-linux-arm64-musl@24.0.0': - resolution: {integrity: sha512-ZiG9Kjq1AvYmFK3p03OOjCcYXwiBpF2Z7Ih/QnKsRMcnT7GbjDpfuO3FkSMtuE0OWoAdAt9Kb2yXBP3L9IZc6w==} + '@nx/nx-linux-arm64-musl@22.7.5': + resolution: {integrity: sha512-cEP6KmwBgnb38+jTTaibWCjwXcHmigqhTfy0tN1be7WZr6bHxbqNLsXqKRN70PSNA3HouZcxw1cdRL8tqbPBBA==} cpu: [arm64] os: [linux] libc: [musl] - '@nx/nx-linux-x64-gnu@24.0.0': - resolution: {integrity: sha512-FstnaQtRkxD0RGYtCJb7QYq9Sgzu+vCKYO+p3/uq+q2kKLwlu4ovvzUeDctTuCIjx1tFamp/Uu8n+bHavUE7KQ==} + '@nx/nx-linux-x64-gnu@22.7.5': + resolution: {integrity: sha512-tbaX1tZCSpGifDNBfDdEZAMxVF3Yg4bhFP/bm1needc0diqb+Zflc0u5tM5/6BWDMITQDwenJVsNiQ8ZdtJURA==} cpu: [x64] os: [linux] libc: [glibc] - '@nx/nx-linux-x64-musl@24.0.0': - resolution: {integrity: sha512-dBFcWaSOhl17ZzZ+ybi9ctPlYPwDTlJjGgkpV5e/O6D7V9MFziJ4xZG/mVgacYbW3f5HS6QRVno9yPtSyLj2MA==} + '@nx/nx-linux-x64-musl@22.7.5': + resolution: {integrity: sha512-H0M7csOZIgPT822LqjxSXzf4MXRND15vIkAQe3F3Jlr3Si8LC3tzbL52aVcRfgb8MF/xOB5U47mSwxWt1M2bPQ==} cpu: [x64] os: [linux] libc: [musl] - '@nx/nx-win32-arm64-msvc@24.0.0': - resolution: {integrity: sha512-u2t4v71qCT7Nj4QbxuJ8X3iii881goaXJ7fjTcYw4EhSk1FemF6lh7mlSaHSczQ+/JFbiVppu649NYaVlIxGcw==} + '@nx/nx-win32-arm64-msvc@22.7.5': + resolution: {integrity: sha512-JTcZch9YAnDL1gbhqePz3DZ4x7iYemLn1yJzrjbbXAmXju2eiiJiZvJJHbV06+SP9HKXDT8RjTKuAWTdVxnHug==} cpu: [arm64] os: [win32] - '@nx/nx-win32-x64-msvc@24.0.0': - resolution: {integrity: sha512-Rv464/mLVw3lKdsxhFJXk3WI2KyaCoGbTNUzLi8nlzEuZ0ZcBK4VKxAxlvVCAVrxPIZkbUFDYE7vRvdZ2DGikg==} + '@nx/nx-win32-x64-msvc@22.7.5': + resolution: {integrity: sha512-ngcMyHdBJ9FSz2nHdbZ7gtJlFq0O2b05sPAsVMkZ18CKzdaA1qrBDJfsMO49hPCny505eiT766+CkKdaCDl5kA==} cpu: [x64] os: [win32] @@ -19507,77 +18662,148 @@ packages: '@open-draft/deferred-promise@2.2.0': resolution: {integrity: sha512-CecwLWx3rhxVQF6V4bAgPS5t+So2sTbPgAzafKkVizyi7tlwpcFpdFqq+wqF2OwNBmqFuu6tOyouTuxgpMfzmA==} - '@open-draft/deferred-promise@3.0.0': - resolution: {integrity: sha512-XW375UK8/9SqUVNVa6M0yEy8+iTi4QN5VZ7aZuRFQmy76LRwI9wy5F4YIBU6T+eTe2/DNDo8tqu8RHlwLHM6RA==} - '@open-draft/logger@0.3.0': resolution: {integrity: sha512-X2g45fzhxH238HKO4xbSr7+wBS8Fvw6ixhTDuvLd5mqh6bJJCFAPwU9mPDxbcrRtfxv4u5IHCEH77BmxvXmmxQ==} '@open-draft/until@2.1.0': resolution: {integrity: sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==} - '@opentelemetry/api-logs@0.221.0': - resolution: {integrity: sha512-OlanaW1vv7ufTqQ3/fPLI4arGt5ZoM+P8abOMki6uEYnpRazepSWDwDnnw+la7kE26SHVC18//SMccrDvLKOXQ==} - engines: {node: '>=8.0.0'} - - '@opentelemetry/api@1.8.0': - resolution: {integrity: sha512-I/s6F7yKUDdtMsoBWXJe8Qz40Tui5vsuKCWJEWVL+5q9sSWRzzx6v2KeNsOBEwd94j0eWkpWCH4yB6rZg9Mf0w==} - engines: {node: '>=8.0.0'} - - '@opentelemetry/api@1.9.1': - resolution: {integrity: sha512-gLyJlPHPZYdAk1JENA9LeHejZe1Ti77/pTeFm/nMXmQH/HFZlcS/O2XJB+L8fkbrNSqhdtlvjBVjxwUYanNH5Q==} - engines: {node: '>=8.0.0'} - - '@opentelemetry/context-async-hooks@2.10.0': - resolution: {integrity: sha512-bvyMcgLEkozzSzpEEEo1OMoeQ97bxj6Qs2uN3mPrSdDvObMI1myffD/BPqcLlzZO9//d1SqQA/WPw7Cz2AiqhA==} - engines: {node: ^18.19.0 || >=20.6.0} - peerDependencies: - '@opentelemetry/api': '>=1.0.0 <1.10.0' - - '@opentelemetry/core@2.10.0': - resolution: {integrity: sha512-/wNZ8twnEQQA4HoHu22+vcsdru6pWPWxW+7w+FlxT6Id7PE/WIbZmVKkte+PF72e0F2dnImFeHD2syyE1Mw6MQ==} - engines: {node: ^18.19.0 || >=20.6.0} - peerDependencies: - '@opentelemetry/api': '>=1.0.0 <1.10.0' - - '@opentelemetry/instrumentation@0.221.0': - resolution: {integrity: sha512-cCk80Z/iRDf/5gfsKMB4f74LqVA5yKETB/9ojPzVW/6/f70iu89nJvGxsFCxx4XfSohaOofkU19kiYm84AiAlw==} - engines: {node: ^18.19.0 || >=20.6.0} - peerDependencies: - '@opentelemetry/api': ^1.3.0 - - '@opentelemetry/resources@2.10.0': - resolution: {integrity: sha512-q6MMm2zhggzsHVNbabYwut+a6nbuQQe3URUoxaojM/8K1IBfwwPzvxIjNi2/lI1TFe+fMHMW9MWhrtDLEXEnkA==} - engines: {node: ^18.19.0 || >=20.6.0} - peerDependencies: - '@opentelemetry/api': '>=1.3.0 <1.10.0' - - '@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' - - '@opentelemetry/sdk-trace@2.10.0': - resolution: {integrity: sha512-MfQGq3GRmTh5fM/y+OjaO0vj6+luCB1XO2gfXCalKCfgKw0eHL++sm75DNweC6ohlp+aFvACqeE0fYayqdRaoQ==} - engines: {node: ^18.19.0 || >=20.6.0} - peerDependencies: - '@opentelemetry/api': '>=1.3.0 <1.10.0' - '@opentelemetry/semantic-conventions@1.41.1': resolution: {integrity: sha512-/UhIkaZgPutTFmQ7RnIJGgDXZmtEJ7Dvi86xNTFWcnRxVRNk/aotsqDJYeEvDP+FSMB2SdW+pQzNMcWP0rwuNA==} engines: {node: '>=14'} - '@oxc-project/types@0.153.0': - resolution: {integrity: sha512-jSNrRIyvPVLL5E1z/tS5zLAprosGz/FuI1PWwEOz59j3E4TTTzSpqKb/RDGqJhhW0QHYISGXxq582wGx6T11Tw==} + '@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-resolver/binding-android-arm-eabi@11.19.1': resolution: {integrity: sha512-aUs47y+xyXHUKlbhqHUjBABjvycq6YSD7bpxSW7vplUmdzAlJ93yXY6ZR0c1o1x5A/QKbENCvs3+NlY8IpIVzg==} @@ -19687,6 +18913,133 @@ 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==} @@ -19756,6 +19109,12 @@ packages: os: [linux] libc: [musl] + '@parcel/watcher-wasm@2.5.1': + resolution: {integrity: sha512-RJxlQQLkaMMIuWRozy+z2vEqbaQlCuaCgVZIUCzQLYggY22LZbP5Y1+ia+FD724Ids9e+XIyOLXLrLgQSHIthw==} + engines: {node: '>= 10.0.0'} + bundledDependencies: + - napi-wasm + '@parcel/watcher-wasm@2.6.0': resolution: {integrity: sha512-dtjbDxKSDPQ8AmA+pS4OFaHE1FKrjtGpLGBxw85uKFkRorjNbvDM/aFPgqosu40wprbp1xw2ZSxIKqghCUHe2w==} engines: {node: '>= 10.0.0'} @@ -19838,9 +19197,9 @@ packages: engines: {node: '>=22.6.0'} hasBin: true - '@playwright/test@1.63.0': - resolution: {integrity: sha512-oxMK4vllB9RK5NQ2l1pq1IfOf2AvnEuj/vYGDj0H2nMtmtZpKtCwt/l00GEO6xjGfpBNAvjovvYdCm50dRQkpQ==} - engines: {node: '>=20'} + '@playwright/test@1.61.1': + resolution: {integrity: sha512-8nKv6+0RJSL9FE4jYOEGXnPeM/Hg12qZpmqzZjRh3qM0Y7c3z1mrOTfFLids72RDQYVh9WpLEfR5WdpNX4fkig==} + engines: {node: '>=18'} hasBin: true '@polka/url@1.0.0-next.28': @@ -19849,12 +19208,18 @@ 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==} @@ -19913,8 +19278,8 @@ packages: resolution: {integrity: sha512-SXCcgFvo/SC6/11kEOaQghJgCWNEWZUvPYKn/gpvMB9HLSG/5M8If7dWZtEQHhchvl8bh9A89Hw6mEKpsXFimA==} peerDependencies: '@types/react': ^19.2.8 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 '@protobufjs/aspromise@1.1.2': resolution: {integrity: sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==} @@ -19964,8 +19329,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -19977,8 +19342,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -19990,8 +19355,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20003,8 +19368,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20016,8 +19381,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20029,8 +19394,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20042,8 +19407,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20055,8 +19420,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20068,8 +19433,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20080,7 +19445,7 @@ packages: resolution: {integrity: sha512-z4eqJvfiNnFMHIIvXP3CY57y2WJs5g2v3X0zm9mEJkrkNv4rDxu+sg9Jh8EkXyeqBkB7SOcboo9dMVqhyrACIg==} peerDependencies: '@types/react': ^19.2.8 - react: ~19.2.9 + react: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20090,8 +19455,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20102,7 +19467,7 @@ packages: resolution: {integrity: sha512-jCi/QKUM2r1Ju5a3J64TH2A5SpKAgh0LpknyqdQ4m6DCV0xJ2HG1xARRwNGPQfi1SLdLWZ1OJz6F4OMBBNiGJA==} peerDependencies: '@types/react': ^19.2.8 - react: ~19.2.9 + react: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20112,8 +19477,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20124,7 +19489,7 @@ packages: resolution: {integrity: sha512-1UEWRX6jnOA2y4H5WczZ44gOOjTEmlqv1uNW4GAJEO5+bauCBhv8snY65Iw5/VOS/ghKN9gr2KjnLKxrsvoMVw==} peerDependencies: '@types/react': ^19.2.8 - react: ~19.2.9 + react: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20134,8 +19499,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20147,8 +19512,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20159,7 +19524,7 @@ packages: resolution: {integrity: sha512-fyjAACV62oPV925xFCrH8DR5xWhg9KYtJT4s3u54jxp+L/hbpTY2kIeEFFbFe+a/HCE94zGQMZLIpVTPVZDhaA==} peerDependencies: '@types/react': ^19.2.8 - react: ~19.2.9 + react: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20169,8 +19534,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20182,8 +19547,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20195,8 +19560,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20207,7 +19572,7 @@ packages: resolution: {integrity: sha512-kGkGegYIdQsOb4XjsfM97rXsiHaBwco+hFI66oO4s9LU+PLAC5oJ7khdOVFxkhsmlbpUqDAvXw11CluXP+jkHg==} peerDependencies: '@types/react': ^19.2.8 - react: ~19.2.9 + react: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20217,8 +19582,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20230,8 +19595,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20243,8 +19608,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20256,8 +19621,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20269,8 +19634,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20282,8 +19647,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20295,8 +19660,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20308,8 +19673,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20321,8 +19686,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20334,8 +19699,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20347,8 +19712,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20360,8 +19725,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20373,8 +19738,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20386,8 +19751,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20399,8 +19764,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20412,8 +19777,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20424,7 +19789,7 @@ packages: resolution: {integrity: sha512-ujc+V6r0HNDviYqIK3rW4ffgYiZ8g5DEHrGJVk4x7kTlLXRDILnKX9vAUYeIsLOoDpDJ0ujpqMkjH4w2ofuo6w==} peerDependencies: '@types/react': ^19.2.8 - react: ~19.2.9 + react: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20434,8 +19799,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20447,8 +19812,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20460,8 +19825,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20473,8 +19838,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20486,8 +19851,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20499,8 +19864,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20512,8 +19877,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20524,7 +19889,7 @@ packages: resolution: {integrity: sha512-FkBMwD+qbGQeMu1cOHnuGB6x4yzPjho8ap5WtbEJ26umhgqVXbhekKUQO+hZEL1vU92a3wHwdp0HAcqAUF5iDg==} peerDependencies: '@types/react': ^19.2.8 - react: ~19.2.9 + react: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20533,7 +19898,7 @@ packages: resolution: {integrity: sha512-YnEXIy8/ga01Y1PN0VfaNH//MhA91JlEGVBDxDzROqwrAtG5Yr2QGEPz8A/rJA3C7ZAHryOYGaUv8fLSW2H/mg==} peerDependencies: '@types/react': ^19.2.8 - react: ~19.2.9 + react: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20542,7 +19907,7 @@ packages: resolution: {integrity: sha512-Il0+boE7w/XebUHyBjroE+DbByORGR9KKmITzbR7MyQ4akpORYP/ZmbhAr0DG7RmmBqoOnZdy2QlvajJ2QA59g==} peerDependencies: '@types/react': ^19.2.8 - react: ~19.2.9 + react: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20551,7 +19916,7 @@ packages: resolution: {integrity: sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ==} peerDependencies: '@types/react': ^19.2.8 - react: ~19.2.9 + react: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20560,7 +19925,7 @@ packages: resolution: {integrity: sha512-2dHfToCj/pzca2Ck724OZ5L0EVrr3eHRNsG/b3xQJLA2hZpVCS99bLAX+hm1IHXDEnzU6by5z/5MIY794/a8NQ==} peerDependencies: '@types/react': ^19.2.8 - react: ~19.2.9 + react: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20569,7 +19934,7 @@ packages: resolution: {integrity: sha512-QTYuDesS0VtuHNNvMh+CjlKJ4LJickCMUAqjlE3+j8w+RlRpwyX3apEQKGFzbZGdo7XNG1tXa+bQqIE7HIXT2w==} peerDependencies: '@types/react': ^19.2.8 - react: ~19.2.9 + react: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20578,7 +19943,7 @@ packages: resolution: {integrity: sha512-ewrXRDTAqAXlkl6t/fkXWNAhFX9I+CkKlw6zjEwk86RSPKwZr3xpBRso655aqYafwtnbpHLj6toFzmd6xdVptQ==} peerDependencies: '@types/react': ^19.2.8 - react: ~19.2.9 + react: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20588,8 +19953,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -20604,106 +19969,200 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true '@types/react-dom': optional: true - '@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==} + '@rolldown/binding-android-arm64@1.0.0-rc.9': + resolution: {integrity: sha512-lcJL0bN5hpgJfSIz/8PIf02irmyL43P+j1pTCfbD1DbLkmGRuFIA4DD3B3ZOvGqG0XiVvRznbKtN0COQVaKUTg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [android] - '@rolldown/binding-darwin-arm64@1.2.13': - resolution: {integrity: sha512-CaJSRzlQ6Q+zkDMVA9OkVxBjVoPRCDEE3v0FSJ9kIQBgRjFApA3Si4ijhbNVUji7ZJt+PfO0e46qy4nPInHUPA==} + '@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==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [darwin] - '@rolldown/binding-darwin-x64@1.2.13': - resolution: {integrity: sha512-e4r340I5hxSzJkD3YJBxgzq/rJ3wwxwdLLb2FPt1Zpyem20nrQPT11DDEEkazwxaHumH8wpglsp/Ozgj/wT6mw==} + '@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==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [darwin] - '@rolldown/binding-freebsd-x64@1.2.13': - resolution: {integrity: sha512-hoBWDZ4/K/mJKVMbsgUd1jfpA2DiOrJ54mpegObU9TBHBBrtX4FLIXJJQRDPZ/2Dn91GvPob+Z2hwKJzf4E5SQ==} + '@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==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [freebsd] - '@rolldown/binding-linux-arm-gnueabihf@1.2.13': - resolution: {integrity: sha512-oF9fZu3vTWnTiVAkDFxU9PJLt1nh20K9RRpuHsR7ZnE2L7XookBbDBVLojCVSLGbvtSlxeUNnjAj6DbNsKyzbg==} + '@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==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm] os: [linux] - '@rolldown/binding-linux-arm64-gnu@1.2.13': - resolution: {integrity: sha512-DTpb/+jMiqWMPgphn4ksW1zW+XLJ6dJJ9FMvnIk9I291LhCctMPhMYJrP5t9p6C9qa3KXadDdUEZHBaPh3kNxQ==} + '@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==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] libc: [glibc] - '@rolldown/binding-linux-arm64-musl@1.2.13': - resolution: {integrity: sha512-xU+Kvv9N2A3SY35zFh1FWWNjxbadE/BKeqnkXe7vScU4GZsw757BlVmDLITZEq8DPpk6m7uoDYkK7P+x/uU5Ow==} + '@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==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] libc: [musl] - '@rolldown/binding-linux-ppc64-gnu@1.2.13': - resolution: {integrity: sha512-XMk/hnhh25oQ756Lclb1Q11h4ll0xC0Esa5w4Vzp+mAE2S3AGJgeM0SonrIgY8fHhjarb6hcoTuwoFG0VVP2ig==} + '@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==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [ppc64] os: [linux] libc: [glibc] - '@rolldown/binding-linux-s390x-gnu@1.2.13': - resolution: {integrity: sha512-U1BoTHYmlywE2n3HUWjzZ+8EQsKr+OwpxYuDWaubx42tUL8QSL7nOqRz/NVHanibbFP3M1Rxuprz/wNcbMKjqw==} + '@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==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [s390x] os: [linux] libc: [glibc] - '@rolldown/binding-linux-x64-gnu@1.2.13': - resolution: {integrity: sha512-J4cm80Pc6wEwV5AZ42o62sIQgDk+Y7R2s646jIwuvO+4V46QB58N4vVuMPWCBaNgursXLpmUWJV//WQAkPvHBQ==} + '@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==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] libc: [glibc] - '@rolldown/binding-linux-x64-musl@1.2.13': - resolution: {integrity: sha512-W0euZS40U4V6JkmEnVCIX9mcsL6cbXQ4X8c2w+MMOIjFg68TXUW+u3RT+2e1t1pv9mg/EP3pDtK3POXdQ7Rxyw==} + '@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==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] libc: [musl] - '@rolldown/binding-openharmony-arm64@1.2.13': - resolution: {integrity: sha512-do/AF/4n9MRshia3a5aXoy8xM2c6mgfT6D7H/dY6my5z+hfCIR4ab7mk4IRj++nsEQpKy39kd0DQnDq+r692tw==} + '@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==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [openharmony] - '@rolldown/binding-win32-arm64-msvc@1.2.13': - resolution: {integrity: sha512-6FtUf2cJZobutJdxnGYX8z0vtbgqU0b2v8vfBhkXb9wp2MppMFtkunE+IaOntyi01rkIQoPW2GHABtfzsC0BRQ==} + '@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==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [win32] - '@rolldown/binding-win32-x64-msvc@1.2.13': - resolution: {integrity: sha512-UKhFaZTeTcbKrb3iU82m17jVcPEAoqDkCN5MBqgPyZSwp/cQmib21crTS0DdH7T1B7wZRWEI89YQAOJMet5yhg==} + '@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==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [win32] @@ -20716,7 +20175,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.3.4 + vite: ^8.0.14 peerDependenciesMeta: '@babel/plugin-transform-runtime': optional: true @@ -20725,6 +20184,9 @@ 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==} @@ -20737,6 +20199,69 @@ 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'} @@ -20884,8 +20409,18 @@ packages: cpu: [x64] os: [win32] - '@rsbuild/core@2.3.1': - resolution: {integrity: sha512-dv5tL7djb8ex5z4sqnDmUbd5PnGNr/CXuFfiMD4RkUsF1JEZZkGH8lc+QW4fqYQIHM7RTvcMUakgvwVU/O9WMw==} + '@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: @@ -20910,14 +20445,6 @@ 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: @@ -20950,168 +20477,200 @@ packages: '@rsbuild/core': optional: true - '@rspack/binding-darwin-arm64@2.2.7': - resolution: {integrity: sha512-m0ijteZwZfUZeFcbyxwTe6N+I7aceV5/iW39b7fIIoMN/mSv9zL0ieeRzwuFe7mTYGwCuwNieDZHXfMFdp2Q2w==} + '@rspack/binding-darwin-arm64@2.0.0': + resolution: {integrity: sha512-ICBHDKYyndFqljLhjxvKfWWZu39RJSH2jkSmbceXl0kmptLSE0cLWpvk+eGSzLqtxKN0jVchwCw+5P5mWCzwAw==} cpu: [arm64] os: [darwin] - '@rspack/binding-darwin-arm64@2.3.1': - resolution: {integrity: sha512-koLyL2r8PUcLD0StjuZ/n5XM6GJ0C8dzJN0IuIV9d7nQcibJxwjjSAWEPGVz6bm8WuzypvuVKNoa1+GGAHeMQA==} + '@rspack/binding-darwin-arm64@2.0.8': + resolution: {integrity: sha512-vCgbgH7B7qom+uID+RCZsTCOYFb9wC4/4+1U6rMfytrXGVJ72eNQs2tbdjOl0lb18CT3N/n+VkWynUiLk84GwA==} cpu: [arm64] os: [darwin] - '@rspack/binding-darwin-x64@2.2.7': - resolution: {integrity: sha512-f27/OubIeCe5Hzze1bm+k/CQ2XX9hk3E/FuK4lym1bjqZ9spWSuolC3sK/yU/Pc3kwMPuf53byUm3FM+QC/blw==} + '@rspack/binding-darwin-arm64@2.1.1': + resolution: {integrity: sha512-6K8jA3pZphBwLt5DU78wl0IzY1myHrqNSvFVCd9CHa+szlOwv2iMQpZdYdpupIBxwiZ39rrDyQKtoZw7lsAG8w==} + cpu: [arm64] + os: [darwin] + + '@rspack/binding-darwin-x64@2.0.0': + resolution: {integrity: sha512-YQ96LMmzIzhZt9cZWUDWXSxS9UWWHWoLxJyZ5f42DSaVPVelBg5ThbVORDwOP5QDA2xFXj60rVnmmcZLzg/aDA==} cpu: [x64] os: [darwin] - '@rspack/binding-darwin-x64@2.3.1': - resolution: {integrity: sha512-YK39JLiu1YC6+3BMxkP7e848pHD7e2T/0OSNogDi7whfiZNg95wa9Ncd7I5ppAf0nhmV+FNew/sCBIFp5h67Jw==} + '@rspack/binding-darwin-x64@2.0.8': + resolution: {integrity: sha512-satPm2PD4B7jDTVlVAdvMVdUszwLvWUEnUDzLb77mvVkezKNDZmuhb+e8s+FfKs8hJpNbZ9VAejuA2rr8o985w==} cpu: [x64] os: [darwin] - '@rspack/binding-linux-arm64-gnu@2.2.7': - resolution: {integrity: sha512-uGEX6kY/Pi3wPZgaEk6vTevZOHjKw8qmd5pqWVwRmpLhwvPB7LGqVqx5BMnNYBjsndVUWJQQRlGL8DoVG5IXXQ==} + '@rspack/binding-darwin-x64@2.1.1': + resolution: {integrity: sha512-RdqtEfIbSe5ucLNVvMac1k88UwmL4Gil8uXqlEFcSZ3VC2jTOkecadd+B0RYqJ+PirSInrRmKm1cr0740zppOA==} + cpu: [x64] + os: [darwin] + + '@rspack/binding-linux-arm64-gnu@2.0.0': + resolution: {integrity: sha512-Ufn33gzkIV7JY69k6vJQEdOzRvBqThIgH46pwXksHSMwRZp8IbJhXfyYIAVsRWCk8fXpr9t1nAvCDvJXT2EeyA==} cpu: [arm64] os: [linux] libc: [glibc] - '@rspack/binding-linux-arm64-gnu@2.3.1': - resolution: {integrity: sha512-Q+RCA/KM2tn6m6R5U4lktXDs5cCRm3SyleQk86iqqUFX7wKzVRUvr5BTsreg6K9of3gpYmQ6+g1PGT5cwo0rLA==} + '@rspack/binding-linux-arm64-gnu@2.0.8': + resolution: {integrity: sha512-pSI+npPQE/uDtiboqvcOIRJbEV2+B+H1xffmko/gw50la92oTUW60kVULFwsb6L0+GVCzIcwX3yq60GtYIn+Ug==} cpu: [arm64] os: [linux] libc: [glibc] - '@rspack/binding-linux-arm64-musl@2.2.7': - resolution: {integrity: sha512-qBvztXsOgdi69zi8BhIUz+yc/alqR/wQVmcdCh+1SbhcsNpMsFUndxvVoR1tOboBsEo//gxOG4GxH8zlemhbUA==} + '@rspack/binding-linux-arm64-gnu@2.1.1': + resolution: {integrity: sha512-ROKtqXoLpbZO1vYEcNxQg6COvRhdlJcoib1Z4pzG1nIyctEAUuFmnD7pIvJiVe6M7YuJNXW+1p0BhpptT2XEUQ==} + cpu: [arm64] + os: [linux] + libc: [glibc] + + '@rspack/binding-linux-arm64-musl@2.0.0': + resolution: {integrity: sha512-CZbvFKlNY9UC0C+Czz6i8JFCzGpuL9oX8gEqcJA1+84Y6eEEBH50UiTzeCewxKW3dOofkZdvT5vgNMXz6aMUmg==} cpu: [arm64] os: [linux] libc: [musl] - '@rspack/binding-linux-arm64-musl@2.3.1': - resolution: {integrity: sha512-He+muVDON1fohGtdYamh3zHVwf6/E6fZu/+iEAkxjclE0P94bsCfYVcZW/a4/l1tJ2zvLZtB4jD7Qr6r4vG/WA==} + '@rspack/binding-linux-arm64-musl@2.0.8': + resolution: {integrity: sha512-igjJ43yxWQ72GZqjDDZSSHax9/Vg+6rLMmOvFglTJUkQpB4Tyvu/YjW+WRjYj2xRw6blOjLxUSJWASvuSqqlvg==} cpu: [arm64] os: [linux] libc: [musl] - '@rspack/binding-linux-ppc64-gnu@2.2.7': - resolution: {integrity: sha512-t+/tOPoMu3ZZF8I1Wvqd4Jrib1teOOgb0S4jGb4nSVryuDIWgjny0FLGv5xc8RC7e4esVF93D4wF62Kt9Pxfvw==} - cpu: [ppc64] + '@rspack/binding-linux-arm64-musl@2.1.1': + resolution: {integrity: sha512-QdQpG9dK0GfPASjBd/8rUwDNW0ShfFfYJfcoGLNTM6A8EqmgvWwklXDiCVF5dXALbZIksAuRznIKnLDsUoXi9Q==} + cpu: [arm64] os: [linux] - libc: [glibc] + libc: [musl] - '@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==} + '@rspack/binding-linux-riscv64-gnu@2.1.1': + resolution: {integrity: sha512-LGdYCAvblZp2qtHk9UseYftIRyaBzSWqEzd1toaS08sYESXERm+YBbrYKKiyq1yXiU1L7BkhMUxiWc3GCYmKcA==} cpu: [riscv64] os: [linux] libc: [glibc] - '@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.2.7': - resolution: {integrity: sha512-ywcmeNAC59HtVJ4a5jy5cEUA4JNa19QlVtTW09Pzh0+luNEasWaDfOaXJpYJTGWcycVwzMm3A9aNN3MqvO87EQ==} + '@rspack/binding-linux-riscv64-musl@2.1.1': + resolution: {integrity: sha512-87phiiPGFT1p4gy3Oz6YdNijCPXdjJy43LFdE8AFiZsV4ChFXQPqnVCF2aMRLybYa51A+9wGYlTvxt09yUQUww==} cpu: [riscv64] os: [linux] libc: [musl] - '@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.7': - resolution: {integrity: sha512-U/np+nOj9mka5CdM9FKNkrAShw0UoaarBLzOxbBHu4sqMt3iXQCi91fblLdhUDoWuIQrnV/WrqygFeIP2qAHIw==} - cpu: [s390x] - os: [linux] - libc: [glibc] - - '@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==} + '@rspack/binding-linux-x64-gnu@2.0.0': + resolution: {integrity: sha512-dPjFGpoCvZfFpJBsWAUR+PR7mWYxpou6L026qIOpAVkz7WiTzErwKD3P1jVrpP4dM9yLb3fVE+PHHjTglhTJ4g==} cpu: [x64] os: [linux] libc: [glibc] - '@rspack/binding-linux-x64-gnu@2.3.1': - resolution: {integrity: sha512-ffclKBuH8wwimOBd6xGUxrBfVKKY5Ow4E7OFdHZeg4xffm2O8auGszmOgvFu1eoDoOYHaVJn+cEV6UD0KwZk8A==} + '@rspack/binding-linux-x64-gnu@2.0.8': + resolution: {integrity: sha512-zrkoEOnqj1hOEBO5T2I/2Ts2HSJsYFh1qXwMpK4dMJFGGNWDfNeUa6/LF5uq3VINF3JUl7RL47AgrucoSZJXPA==} cpu: [x64] os: [linux] libc: [glibc] - '@rspack/binding-linux-x64-musl@2.2.7': - resolution: {integrity: sha512-atJn62IgXnc/RhWiFgEiNx7IHAJbHunttzjMpWJLjWiFuJ2c+tLQrTBIiqO3VAIXh+haN1jZLHXuMVj5/J+edA==} + '@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-musl@2.0.0': + resolution: {integrity: sha512-4fgDTMWt0mJDiugdia2mdOjTbnm7yM1Drzl1JpPqlUlOr113byOhc+qgN57LURSGypz2yz/h/Zad7/UnVAxYJw==} cpu: [x64] os: [linux] libc: [musl] - '@rspack/binding-linux-x64-musl@2.3.1': - resolution: {integrity: sha512-qcDwwuyxR7TMtrW+r5Y9RIW25boXd1Ip/9jz04jhdq/OiU/Am7rCP2X90CH8sWdzovIF9UNmsGjY4KklR0F2Mg==} + '@rspack/binding-linux-x64-musl@2.0.8': + resolution: {integrity: sha512-6CtDaGZjNDvJd9TBp7a9zABbrPORO21W96+3ZcGBn0YNUPUk4ARxIxrTTpeJ/1F41QDM8AYIkGDdqEYMqTYBsA==} cpu: [x64] os: [linux] libc: [musl] - '@rspack/binding-wasm32-wasi@2.2.7': - resolution: {integrity: sha512-SRDYrqWnD8Y+VNj8+11KggFaVMFSbyu+9WC2f9sygzjFu78GmF0kLKaHNQMaJv6MUMSBk/OhtEbUB4hmH7czVQ==} + '@rspack/binding-linux-x64-musl@2.1.1': + resolution: {integrity: sha512-YgAyTOM5ZWvWT0Exwcg7QkGUv9PsHT4yIsEyJbH+a99uAKliGMwkHIOP/aJgrCF8G+lTfigY2wyl9cWo4TA4aw==} + cpu: [x64] + os: [linux] + libc: [musl] + + '@rspack/binding-wasm32-wasi@2.0.0': + resolution: {integrity: sha512-ANk73ZKtPrZf9gdtyRK2nQUfhi1uXoC5P2KF89pyVAE8+zcoLBnYtZGYpWa/cmNi5BcO5g4Z+v2l1UA3bUPLQQ==} cpu: [wasm32] - '@rspack/binding-wasm32-wasi@2.3.1': - resolution: {integrity: sha512-3dr6zjFaCK3A920ftCriSJkiRhEfhHtat7LtBdj6g0mcV5Rt+iealmli0vjeAvD0UdpE1u8EKWlfw82JLgFLSQ==} + '@rspack/binding-wasm32-wasi@2.0.8': + resolution: {integrity: sha512-Yf4SiqTUroT5Ju+te0YAY2xxKOb35tECsO21v7hYyGa705wrgoAK/MmF7enOvs9GR1iZIqgiLD/wxsIxl8GjJw==} cpu: [wasm32] - '@rspack/binding-win32-arm64-msvc@2.2.7': - resolution: {integrity: sha512-etHFjzSP/jnnrVYuim9C/nhSlN0/tQowVz0CSJOUHtDH7ZZiUsvWtkH9Zx3tDaZOB7sAw9cbL36mbmdkb4U6cw==} + '@rspack/binding-wasm32-wasi@2.1.1': + resolution: {integrity: sha512-OicgaB3Dcd+KXsH/I3DkJG7XQyREJScg/jLkCtycFn9BhT0IVJvgi37F8QNJKl8Bp9YZIGehsqK9HpQWav6SLw==} + cpu: [wasm32] + + '@rspack/binding-win32-arm64-msvc@2.0.0': + resolution: {integrity: sha512-IHZFRtJ85ONbM+BCtF4TeYXS2Fu9X0IJS2phX1rPibYq9iEtHGfBt4cNlnsJPhbPAXVvi4Oli/yiLRJ1zxtCIg==} cpu: [arm64] os: [win32] - '@rspack/binding-win32-arm64-msvc@2.3.1': - resolution: {integrity: sha512-AZbuLPylt1xvWssN93AsirbYs3WgfcrA8tMsqHmVJIHahLu9E+JPKZ3Gmsw6IYEZk3EfnV3ujQzeQ1/VfF0Vsw==} + '@rspack/binding-win32-arm64-msvc@2.0.8': + resolution: {integrity: sha512-8NCuiQsAhXrwRBy57QZoypqrws/zLBkaQVGiB8hksr6v++8hNigNjqpQARLbd0iyMuHsQQ++8+auGk6xlDXmzw==} cpu: [arm64] os: [win32] - '@rspack/binding-win32-ia32-msvc@2.2.7': - resolution: {integrity: sha512-26HiMUQk8QKVw477gW9HorIQ3r0le3AL4OFigJr1/HAumi5qyOPazck+wWtUDh1R9bSf8etZjkuseBGtjN5+KQ==} + '@rspack/binding-win32-arm64-msvc@2.1.1': + resolution: {integrity: sha512-fwL4P3SsC0r/vVGgnmexnc4vkvf+9vWMcGw5fdlPBJNR/zWlZRSXR5V6eXcHrpYVLhBsLYvZYE3NZa9paIUGxw==} + cpu: [arm64] + os: [win32] + + '@rspack/binding-win32-ia32-msvc@2.0.0': + resolution: {integrity: sha512-n4tbIqacq/FhNJflMlgZV50AeQFTLh5hnDS3v4W+rJWa3IW1VfgB0+XppdeW+Dqhw7QcMIsCmro01kwNdlXZDQ==} cpu: [ia32] os: [win32] - '@rspack/binding-win32-ia32-msvc@2.3.1': - resolution: {integrity: sha512-R5NVU68TePZcgRdYUzrQX9YFNxmcyXZEPwaPv40AAgsqNyacG3iRaYVmV79jt3rWYfa0QJaqvRLUchDe2SZ6zQ==} + '@rspack/binding-win32-ia32-msvc@2.0.8': + resolution: {integrity: sha512-bxiekytbX7V9KFAra+HkwtNWC6pYfHEBBZFpiT0xUs3mCFOmAAFVBsBSQsoCP9AdCEXoMAvNdnrHNw3iov4OZw==} cpu: [ia32] os: [win32] - '@rspack/binding-win32-x64-msvc@2.2.7': - resolution: {integrity: sha512-ut8tVSXP8DWQE/JUwQ1oqwuAaAgySgYF66HpWmxfR9J4nLzGmhd7CnnaCTT3vUyQQNmLKFida/AbiqJ/gWmPrw==} + '@rspack/binding-win32-ia32-msvc@2.1.1': + resolution: {integrity: sha512-j3BISXbjPyI57HeHxW9Jx+UP7RebNQ4t62uCbRP29caf9aghYJP+ZA5nJ2X7pol7N5Je2/V6WNahuNd0zQFDOA==} + cpu: [ia32] + os: [win32] + + '@rspack/binding-win32-x64-msvc@2.0.0': + resolution: {integrity: sha512-cJOgikIW2t3S+42TQZsv+DJriJt2m6lnUk+pUFu/fO93rrMvNrx8gfMxR8W5zDTreBX0cfMx2pw6EVmyi/YzsQ==} cpu: [x64] os: [win32] - '@rspack/binding-win32-x64-msvc@2.3.1': - resolution: {integrity: sha512-5T9DYjNPQpLbrNXjCssGd2B6xMQPlc3LxVOKHGUA1O0GV+88vBkTXAcryJ+Fo+yVEMPCzp4VvwBMGAVDpCjcSA==} + '@rspack/binding-win32-x64-msvc@2.0.8': + resolution: {integrity: sha512-7zPs8YCe/ZVJTwd+5lpB0CP0tkn2pONf/T1ycmVY76u21Nrwt8mXQGc/2yH2eWP4B7fikYBr3hGr7mpR2fajqQ==} cpu: [x64] os: [win32] - '@rspack/binding@2.2.7': - resolution: {integrity: sha512-opY7Sw6iwtBa23CeNj18GOqKBlaJUZXp52kNIGyNq+7jpCQKrJYeX5wiK7uBn8/ZpHQfhwNL2xxu5yzG4JFH1g==} + '@rspack/binding-win32-x64-msvc@2.1.1': + resolution: {integrity: sha512-aPNNFuZT5iBM8+S9J4P5ywJbf3tUvZN3Ppe6mXJ8/jTVDUDhe0YVj3AgD/AuxnUvl+yHrLfQkN1nNwUfIcomfA==} + 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/core@2.2.7': - resolution: {integrity: sha512-kWKd4lYp13GPAQy2eQITLTvPbl+ST7ffG/MCGHoX138o5eTetMQMe/oc7UAZAfjervAM6UOzEhiiCirPTpRBUQ==} + '@rspack/binding@2.0.8': + resolution: {integrity: sha512-3uZ+y8aQxq33ty2srMxg2Nu0XuBI6vVrG50rkDaXqwWqOohfgGUSfFuQK7EnSUNy4aFUQlCG6NHialQHJov0wg==} + + '@rspack/binding@2.1.1': + resolution: {integrity: sha512-6062hZP33fn1w51ClpQnum19GGXl/3eS754xrRYbQ7wwBNZk94HVwfSyiqcNCtY/pB1lsFjnaTKiW/Q+jv0axQ==} + + '@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==} engines: {node: ^20.19.0 || >=22.12.0} peerDependencies: '@module-federation/runtime-tools': ^0.24.1 || ^2.0.0 @@ -21122,8 +20681,8 @@ packages: '@swc/helpers': optional: true - '@rspack/core@2.3.1': - resolution: {integrity: sha512-9BWfaiEJLgLK9U53Q4WVruBZ19Mu/XWHXHEu0UFla4lUtH8Z+/ET2m044tiqbtyIgqQyG58fMrxHeVIAiXMXHg==} + '@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 @@ -21264,7 +20823,7 @@ packages: resolution: {integrity: sha512-vMfGz7x3Ahplcdm0RlEtTNUZ08qpUSr3NRJMQ6duUDxxe0Mqo6DisyQWNQKSROZ7BtLCJUfio6/LRGpkRUoo8A==} engines: {node: '>=18'} peerDependencies: - react: ~19.2.9 + react: ^19.2.3 '@sentry/solid@10.32.0': resolution: {integrity: sha512-T+i0L+uB67Z+ttJJwETLQuXhBOor3mC82YqXBBxFX8H4hLZ0Idpbuw2Vmqd5+E1vQFxgsoHnuu3uBR6LblafFQ==} @@ -21319,6 +20878,10 @@ 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==} @@ -21462,11 +21025,6 @@ packages: '@supabase/supabase-js@2.48.1': resolution: {integrity: sha512-VMD+CYk/KxfwGbI4fqwSUVA7CLr1izXpqfFerhnYPSi6LEKD8GoR4kuO5Cc8a+N43LnfSQwLJu4kVm2e4etEmA==} - '@sveltejs/acorn-typescript@1.0.13': - resolution: {integrity: sha512-wgKggnhZVL9Bfx1OaKKTrYY9BFRk6C8UAkQNUcIv1+llzYrIqy+RZm5HPKzn0NpEBvTVhTqB4kQyllZywsRBRQ==} - peerDependencies: - acorn: ^8.9.0 - '@swc-node/core@1.14.1': resolution: {integrity: sha512-jrt5GUaZUU6cmMS+WTJEvGvaB6j1YNKPHPzC2PUi2BjaFbtxURHj6641Az6xN7b665hNniAIdvjxWcRml5yCnw==} engines: {node: '>= 10'} @@ -21766,7 +21324,7 @@ packages: '@tailwindcss/vite@4.2.2': resolution: {integrity: sha512-mEiF5HO1QqCLXoNEfXVA1Tzo+cYsrqV7w9Juj2wdUFyW07JRenqMG225MvPwr3ZD9N1bFQj46X7r33iHxLUW0w==} peerDependencies: - vite: ^8.3.4 + vite: ^8.0.14 '@tailwindcss/webpack@4.3.1': resolution: {integrity: sha512-HM33EjYPbkMlBGcYoVA/pk/hML3wAn2JOnjF79eDWVLuktOhRczDwWsSBQBOWV6LLBVAgGZS/pZ519OHUF8vKg==} @@ -21851,37 +21409,37 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 '@tanstack/react-query-devtools@5.67.2': resolution: {integrity: sha512-cmj2DxBc+/9btQ66n5xI8wTtAma2BLVa403K7zIYiguzJ/kV201jnGensYqJeu1Rd8uRMLLRM74jLVMLDWNRJA==} peerDependencies: '@tanstack/react-query': ^5.102.0 - react: ~19.2.9 + react: ^19.2.3 '@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.9 + react: ^19.2.3 '@tanstack/react-query@5.102.0': resolution: {integrity: sha512-0GyVyEcGt9M7jHPCua16hNVtstUXE2R4HsnNubFYcDs7DJaLzh1dSiXsADDU/cNn/SqrLfa0vRKyjUmbx4rZLA==} peerDependencies: - react: ~19.2.9 + react: ^19.2.3 - '@tanstack/react-store@0.11.2': - resolution: {integrity: sha512-oj5O5DmiMWE+ih+SioX2ayC1kbK7d3fpLx0B75fPJr9nY3zU+hoW010yr64qXsY/9fyiLVE2bn5mGNV3owm8RQ==} + '@tanstack/react-store@0.9.3': + resolution: {integrity: sha512-y2iHd/N9OkoQbFJLUX1T9vbc2O9tjH0pQRgTcx1/Nz4IlwLvkgpuglXUx+mXt0g5ZDFrEeDnONPqkbfxXJKwRg==} peerDependencies: - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 '@tanstack/react-virtual@3.13.0': resolution: {integrity: sha512-CchF0NlLIowiM2GxtsoKBkXA4uqSnY2KvnXo+kyUFD4a4ll6+J0qzoRsUPMwXV/H26lRsxgJIr/YmjYum2oEjg==} peerDependencies: - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 '@tanstack/solid-devtools@0.7.14': resolution: {integrity: sha512-hyaB29d1fU2n9v2XeFEB6t2k5gKionK8mxxb9MNtF7qJheZ6z9259jU8OsBdA/f6v2oYck1K1Ia9+ooJsdy4jg==} @@ -21905,8 +21463,8 @@ packages: peerDependencies: solid-js: 1.9.12 - '@tanstack/store@0.11.2': - resolution: {integrity: sha512-sJ4mjol8uQsHV0gOJzzjwXfh2Fwm+Sz0+8deqiTm4jGbMdjzNSW+xZCFm0kUa870uhd8yi+DpKnZb5Kc4apa0Q==} + '@tanstack/store@0.9.3': + resolution: {integrity: sha512-8reSzl/qGWGGVKhBoxXPMWzATSbZLZFWhwBAFO9NAyp0TxzfBP0mIrGb8CP8KrQTmvzXlR/vFPPUrHTLBGyFyw==} '@tanstack/virtual-core@3.13.0': resolution: {integrity: sha512-NBKJP3OIdmZY3COJdWkSonr50FMVIi+aj5ZJ7hI/DTpEKg2RMfo/KvP8A3B/zOSpMgIe52B5E2yn7rryULzA6g==} @@ -21921,7 +21479,7 @@ packages: resolution: {integrity: sha512-cTswDmoTn5UZA5pV2z/IWhGYgb8NS0zPRYYLv5q9JxHY4WxL/l/Riy6Aq76QttH8w6IHAIO/ZGwHBfF/OV0Kcw==} engines: {node: '>=18'} peerDependencies: - vite: ^8.3.4 + vite: ^8.0.14 '@tanstack/vue-query-devtools@5.91.0': resolution: {integrity: sha512-Kn6p5ffEKUj+YGEP+BapoPI8kUiPtNnFDyzjTvUx6GHbyfzfefQPhYoRtFiWeyrGHjUB/Mvtnr7Rosbzs/ngVg==} @@ -21944,8 +21502,8 @@ packages: '@vue/composition-api': optional: true - '@tanstack/vue-store@0.11.2': - resolution: {integrity: sha512-wZmkfsvc0dNvOg/Xb/a7uTPKejleI0dR3HHi0t3ZyVM/23MJ7AC0bH6C7rp2seSY4mIYo0pLLbGJGZ/UpO93Zw==} + '@tanstack/vue-store@0.9.3': + resolution: {integrity: sha512-YZb5SAR3f2kLt58Ip6gig2+z8vRAfSkJK30Bq7enZ7cG4epyygmRsbrrDMxvmoYSJu33CY5uJ6MvI74KGP0ZvQ==} peerDependencies: '@vue/composition-api': ^1.2.1 vue: ^2.5.0 || ^3.0.0 @@ -21970,16 +21528,6 @@ 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'} @@ -21987,8 +21535,8 @@ packages: '@testing-library/dom': ^10.0.0 '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -22002,8 +21550,8 @@ packages: '@testing-library/dom': ^10.0.0 '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -22037,10 +21585,13 @@ packages: '@tanstack/react-query': ^5.102.0 '@trpc/client': 11.4.3 '@trpc/server': 11.4.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 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==} @@ -22180,6 +21731,9 @@ 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==} @@ -22195,18 +21749,12 @@ packages: '@types/serve-static@2.2.0': resolution: {integrity: sha512-8mam4H1NHLtu7nmtalF7eyBH14QyOASmcxHhSfEoRyr0nP/YdoesEtU+uSRvMe96TW/HPTtkoKqQLl53N7UXMQ==} - '@types/set-cookie-parser@2.4.10': - resolution: {integrity: sha512-GGmQVGpQWUe5qglJozEjZV/5dyxbOOZ0LHe/lqyWssB88Y4svNfst0uqBVscdDeIKl5Jy5+aPSvy7mI9tYRguw==} - '@types/sockjs@0.3.36': resolution: {integrity: sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==} '@types/statuses@2.0.5': resolution: {integrity: sha512-jmIUGWrAiwu3dZpxntxieC+1n/5c3mjrImkmOSQ2NC5uP6cYO4aAZDdSmRcI5C1oiTmqlZGHC+/NmJrKogbP5A==} - '@types/statuses@2.0.6': - resolution: {integrity: sha512-xMAgYwceFhRA2zY+XbEA7mxYbA093wdiW8Vu6gZPGWy9cmOyU9XesH1tNcEWsKFd5Vzrqx5T3D38PWx1FIIXkA==} - '@types/tough-cookie@4.0.5': resolution: {integrity: sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==} @@ -22216,6 +21764,15 @@ 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==} + + '@types/yauzl@2.10.3': + resolution: {integrity: sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==} + '@typescript-eslint/eslint-plugin@8.44.1': resolution: {integrity: sha512-molgphGqOBT7t4YKCSkbasmu1tb1MgrZ2szGzHbclF7PNmOkSTQVHy+2jXOSnxvR3+Xe1yySHFZoqMpz3TfQsw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -22642,31 +22199,42 @@ packages: cpu: [x64] os: [win32] - '@vercel/nft@1.3.1': - resolution: {integrity: sha512-ihNT1rswiq3cy4WKQAV5kJi6UjWX1vLUzlLc+Vvq83G8CU9nMgfDWz5f1tOnSlS8LeC4Wp4qTB3+HGj/ccUrFQ==} + '@vercel/nft@0.29.4': + resolution: {integrity: sha512-6lLqMNX3TuycBPABycx7A9F1bHQR7kiQln6abjFbPrf5C/05qHM9M5E4PeTE59c7z8g6vHnx1Ioihb2AQl7BTA==} + engines: {node: '>=18'} + hasBin: true + + '@vercel/nft@1.11.0': + resolution: {integrity: sha512-m1QFg+U+3yPOnP1xSYJ73UIRxLOXdts1JOhiOiyPYqEsALgrXFFINvgUaD6R6iNvaBFAjHllBCbkfx4FuOdpaA==} 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.3.4 + vite: ^8.0.14 peerDependenciesMeta: '@rolldown/plugin-babel': optional: true babel-plugin-react-compiler: optional: true - '@vitejs/plugin-rsc@0.5.39': - resolution: {integrity: sha512-hRa6CK119r1NkwgPWlPRiDP8e4rELCsIZwjGmQK0sOnayAkYPBkyJMip0GhYEt2ukBZaO0Uw3ICHHO9T692OFw==} + '@vitejs/plugin-rsc@0.5.30': + resolution: {integrity: sha512-q4fje/9heG/Mx3m5hEC9fpP1bUcpVtpq1sSZ7pWcVrYVxkMNBEEfcILwmUIo2EtMwbBp0/aPzVBsXcA8mG777A==} peerDependencies: - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 react-server-dom-webpack: '*' - vite: ^8.3.4 + vite: ^8.0.14 peerDependenciesMeta: react-server-dom-webpack: optional: true @@ -22675,21 +22243,21 @@ packages: resolution: {integrity: sha512-DSTrmrdLp+0LDNF77fqrKfx7X0ErRbOcUAgJL/HbSesqQwoUvUQ4uYQqaex+rovqgGcoPqVk+AwUh3v9CuiYIw==} engines: {node: ^18.0.0 || >=20.0.0} peerDependencies: - vite: ^8.3.4 + vite: ^8.0.14 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.3.4 + vite: ^8.0.14 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.3.4 + vite: ^8.0.14 vue: ^3.2.25 '@vitest/expect@4.1.4': @@ -22699,18 +22267,7 @@ packages: resolution: {integrity: sha512-R9HTZBhW6yCSGbGQnDnH3QHfJxokKN4KB+Yvk9Q1le7eQNYwiCyKxmLmurSpFy6BzJanSLuEUDrD+j97Q+ZLPg==} peerDependencies: msw: ^2.4.9 - 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 + vite: ^8.0.14 peerDependenciesMeta: msw: optional: true @@ -22720,9 +22277,6 @@ 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==} @@ -22732,25 +22286,14 @@ 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==} @@ -22934,20 +22477,20 @@ packages: resolution: {integrity: sha512-LOtTn+JgJvX8WfBVJtF08TGrdjuFzGJc4mkP8EdDI8ADbvO7kiexYep1o8dwnt0okb0jYclCDXF13xU7Ge4zSw==} engines: {node: '>=18.0.0'} - '@whatwg-node/fetch@0.10.13': - resolution: {integrity: sha512-b4PhJ+zYj4357zwk4TTuF2nEe0vVtOrwdsrNo5hL+u1ojXNhh1FgJ6pg1jzDlwlT4oBdzfSwaBwMCtFCsIWg8Q==} + '@whatwg-node/fetch@0.10.11': + resolution: {integrity: sha512-eR8SYtf9Nem1Tnl0IWrY33qJ5wCtIWlt3Fs3c6V4aAaTFLtkEQErXu3SSZg/XCHrj9hXSJ8/8t+CdMk5Qec/ZA==} engines: {node: '>=18.0.0'} - '@whatwg-node/node-fetch@0.8.6': - resolution: {integrity: sha512-BDMdYFcerLQkwA2RTldxOqRCs6ZQD1S7UgP3pUdGUkcbgTrP/V5ko77ZkCww9DHmC4lpoYuwigGfQYj285gMvA==} + '@whatwg-node/node-fetch@0.8.1': + resolution: {integrity: sha512-cQmQEo7IsI0EPX9VrwygXVzrVlX43Jb7/DBZSmpnC7xH4xkyOnn/HykHpTaQk7TUs7zh59A5uTGqx3p2Ouzffw==} engines: {node: '>=18.0.0'} '@whatwg-node/promise-helpers@1.3.2': resolution: {integrity: sha512-Nst5JdK47VIl9UcGwtv2Rcgyn5lWtZ0/mhRQ4G8NN2isxpq2TO30iqHzmwoJycjWuyUfg3GFXqP/gFHXeV57IA==} engines: {node: '>=16.0.0'} - '@whatwg-node/server@0.11.0': - resolution: {integrity: sha512-VSdkwnJRr8Yv9UgB2aXB3VUPWwd6Oqnn0hycFwhg9pZgWxJXb7JmhsiXe9tmpMwjHFxli12PGcz9aI63YYloGQ==} + '@whatwg-node/server@0.10.13': + resolution: {integrity: sha512-Otmxo+0mp8az3B48pLI1I4msNOXPIoP7TLm6h5wOEQmynqHt8oP9nR6NJUeJk6iI5OtFpQtkbJFwfGkmplvc3Q==} engines: {node: '>=18.0.0'} '@workos-inc/node@8.0.0': @@ -22964,8 +22507,8 @@ packages: peerDependencies: '@tanstack/react-router': workspace:* '@tanstack/react-start': workspace:* - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 '@xtuc/ieee754@1.2.0': resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==} @@ -23107,6 +22650,7 @@ 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: @@ -23140,9 +22684,13 @@ packages: resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==} engines: {node: '>= 8'} - archiver@8.0.0: - resolution: {integrity: sha512-fV1orZfsnPn9BaSByR/qE67rJCLJEy2Ox5bq7nJh+jquWaNh6Sfec75kJ2T6PtdGUbPQlrVoSVCEOa5SdiTQ1g==} - engines: {node: '>=18'} + 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'} argparse@1.0.10: resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==} @@ -23205,9 +22753,6 @@ packages: resolution: {integrity: sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==} engines: {node: '>=8.0.0'} - atomically@2.1.1: - resolution: {integrity: sha512-P4w9o2dqARji6P7MHprklbfiArZAWvo07yW7qs3pdljb3BWr12FIB7W+p0zJiuiVsUpRO0iZn1kFFcpPegg0tQ==} - autocannon@8.0.0: resolution: {integrity: sha512-fMMcWc2JPFcUaqHeR6+PbmEpTxCrPZyBUM95oG4w3ngJ8NfBNas/ZXA+pTHXLqJ0UlFVTcy05GC25WxKx/M20A==} hasBin: true @@ -23223,8 +22768,11 @@ packages: resolution: {integrity: sha512-NZKeq9AfyQvEeNlN0zSYAaWrmBffJh3IELMZfRpJVWgrpEbtEpnjvzqBPf+mxoI287JohRDoa+/nsfqqiZmF6g==} engines: {node: '>= 6.0.0'} - axios@1.18.1: - resolution: {integrity: sha512-3nTvFlvpn9Zu/RkHUqtc7/+al4UpRW5az71ap5zccp6e8RAYEzhMTecX8Dz1wWDYrPpUoB1HAQEGEAEvUr7S9g==} + axios@1.16.0: + resolution: {integrity: sha512-6hp5CwvTPlN2A31g5dxnwAX0orzM7pmCRDLnZSX772mv8WDqICwFjowHuPs04Mc8deIld1+ejhtaMn5vp6b+1w==} + + axios@1.17.0: + resolution: {integrity: sha512-J8SwNxprqqpbfenehxWYXE7CW+wM1BB4w3+N+g+/Wx40xM4rsLrfPmHHxSWIxJLYDgSY/HqlFPIYb2/S3rxafw==} b4a@1.6.7: resolution: {integrity: sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==} @@ -23270,10 +22818,6 @@ packages: resolution: {integrity: sha512-1pHv8LX9CpKut1Zp4EXey7Z8OfH11ONNH6Dhi2WDUt31VVZFXZzKwXcysBgqSumFCmR+0dqjMK5v5JiFHzi0+g==} engines: {node: 20 || >=22} - balanced-match@4.0.4: - resolution: {integrity: sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==} - engines: {node: 18 || 20 || >=22} - bare-events@2.9.1: resolution: {integrity: sha512-Z0oHEHAFDZkffN8Qc39zNZjQlMDkPJRyyyZieU1VH7u8c5S+qHZ2S8ixdKIAxEjfHO7FJxXmJWgteOghVanIsg==} peerDependencies: @@ -23318,9 +22862,8 @@ packages: base64-js@1.5.1: resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==} - baseline-browser-mapping@2.11.23: - resolution: {integrity: sha512-le521dGVfxM7yRX0EikCoSz+rOK+hHzdDt/E7mG1jOJB/6WAAUuwVroLwaB7ApaUsz5Q0kFlDXLSA9MheUIfRQ==} - engines: {node: '>=6.0.0'} + baseline-browser-mapping@2.9.8: + resolution: {integrity: sha512-Y1fOuNDowLfgKOypdc9SPABfoWXuZHBOyCS4cD52IeZBhr4Md6CLLs6atcxVrzRmQ06E7hSlm5bHHApPKR/byA==} hasBin: true batch@0.6.1: @@ -23348,8 +22891,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.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 solid-js: 1.9.12 svelte: ^4.0.0 || ^5.0.0 vitest: ^2.0.0 || ^3.0.0 || ^4.0.0 @@ -23409,9 +22952,6 @@ 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'} @@ -23448,13 +22988,9 @@ 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} + brace-expansion@5.0.6: + resolution: {integrity: sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==} + engines: {node: 18 || 20 || >=22} braces@3.0.3: resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==} @@ -23470,6 +23006,9 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true + buffer-crc32@0.2.13: + resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==} + buffer-crc32@1.0.0: resolution: {integrity: sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w==} engines: {node: '>=8.0.0'} @@ -23511,9 +23050,13 @@ packages: magicast: optional: true - cac@7.1.0: - resolution: {integrity: sha512-LMDU/U2yA4IPIY8KT0NsNPWEYZvAMkbgyspxJ6btJaYV+WMDOHAZCmB0lsTObiHaRS1V/ztKAl7+TSkTqXyeoA==} - engines: {node: '>=20.19.0'} + c12@3.3.4: + resolution: {integrity: sha512-cM0ApFQSBXuourJejzwv/AuPRvAxordTyParRVcHjjtXirtkzM0uK2L9TTn9s0cXZbG7E55jCivRQzoxYmRAlA==} + peerDependencies: + magicast: '*' + peerDependenciesMeta: + magicast: + optional: true call-bind-apply-helpers@1.0.2: resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==} @@ -23543,13 +23086,8 @@ packages: caniuse-lite@1.0.30001760: resolution: {integrity: sha512-7AAMPcueWELt1p3mi13HR/LHH0TJLT11cnwDJEs3xA4+CK/PLKeO9Kl1oru24htkyUKtkGCvAx4ohB0Ttry8Dw==} - 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==} + chai@6.2.2: + resolution: {integrity: sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==} engines: {node: '>=18'} chalk@3.0.0: @@ -23564,10 +23102,6 @@ packages: resolution: {integrity: sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==} engines: {node: ^12.17.0 || ^14.13 || >=16.0.0} - chalk@6.0.0: - resolution: {integrity: sha512-2uNTXIuTTxk7ciZgAU1BQcgnchcG0xXnrs6jzkQfj9SsRa9M2s5zE8WT96hS6KmG4MzWHSrvH43DF1m4XRkrFg==} - engines: {node: '>=22'} - char-regex@1.0.2: resolution: {integrity: sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==} engines: {node: '>=10'} @@ -23617,9 +23151,6 @@ packages: cjs-module-lexer@1.4.3: resolution: {integrity: sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==} - cjs-module-lexer@2.2.1: - resolution: {integrity: sha512-Ca8swihM+/4yKecYHY52kgJd300hi2lADU/a1RxNTRe+RJ9jvqQlESpbz9DnG9mowez8qwXHB8qYdIUw9e+F5Q==} - classnames@2.5.1: resolution: {integrity: sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==} @@ -23640,10 +23171,6 @@ packages: resolution: {integrity: sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==} engines: {node: '>=6'} - cli-spinners@2.9.2: - resolution: {integrity: sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==} - engines: {node: '>=6'} - cli-table3@0.6.5: resolution: {integrity: sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==} engines: {node: 10.* || >= 12.*} @@ -23652,8 +23179,9 @@ packages: resolution: {integrity: sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==} engines: {node: '>= 12'} - client-only@0.0.1: - resolution: {integrity: sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==} + clipboardy@4.0.0: + resolution: {integrity: sha512-5mOlNS0mhX0707P2I0aZ2V/cmHUEO/fL7VFLqszkhUsxt7RwnmrInf/eEQKlf5GzvYeHIjT+Ov1HRfNmymlG0w==} + engines: {node: '>=18'} cliui@7.0.4: resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==} @@ -23662,6 +23190,10 @@ 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'} @@ -23708,9 +23240,6 @@ 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==} @@ -23752,12 +23281,18 @@ 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==} - compress-commons@7.0.1: - resolution: {integrity: sha512-g0S8KAD8qf4+V//pr3BfB1aBnARLXNz2Gx+jmHU0LEriUuoQUOPOulVquHKTJ8+EAIIO7fhseNDr9wK5Q9FKBQ==} - engines: {node: '>=18'} + compatx@0.2.0: + resolution: {integrity: sha512-6gLRNt4ygsi5NyMVhceOCFv14CIdDFN7fQjX1U4+47qVE/+kjPoXMK65KWK+dWxmFzMTuKazoQ9sch6pM0p5oA==} + + compress-commons@6.0.2: + resolution: {integrity: sha512-6FqVXeETqWPoGcfzrXb37E50NP0LXT8kAMu5ooZayhWWdgEY4lBEEcbQNXtkuKQsGduxiIcI4gOTsxTmuq/bSg==} + engines: {node: '>= 14'} compressible@2.0.18: resolution: {integrity: sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==} @@ -23793,6 +23328,12 @@ 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==} @@ -23833,7 +23374,7 @@ packages: '@standard-schema/spec': ^1.0.0 convex: ^1.24.0 hono: ^4.0.5 - react: ~19.2.9 + react: ^19.2.3 typescript: ^5.5 zod: ^3.22.4 || ^4.0.15 peerDependenciesMeta: @@ -23861,8 +23402,8 @@ packages: peerDependencies: '@auth0/auth0-react': ^2.0.1 '@clerk/clerk-react': ^4.12.8 || ^5.0.0 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@auth0/auth0-react': optional: true @@ -23880,7 +23421,7 @@ packages: peerDependencies: '@auth0/auth0-react': ^2.0.1 '@clerk/clerk-react': ^4.12.8 || ^5.0.0 - react: ~19.2.9 + react: ^19.2.3 peerDependenciesMeta: '@auth0/auth0-react': optional: true @@ -23889,9 +23430,15 @@ packages: react: optional: true + cookie-es@1.2.2: + resolution: {integrity: sha512-+W7VmiVINB+ywl1HGXJXmrqkOhpKrIiVZV6tQuV54ZyQC7MMuBt81Vc336GMLoHBq5hV/F9eXgt5Mnx0Rha5Fg==} + 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==} @@ -23910,14 +23457,6 @@ packages: resolution: {integrity: sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==} engines: {node: '>=18'} - cookie@1.1.1: - resolution: {integrity: sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ==} - engines: {node: '>=18'} - - cookie@2.0.1: - resolution: {integrity: sha512-yuToqVvRrj6pfDXREyQAAv8SkAEk/8GS3jQRTiUMm66TVtBYmqQeoEjL2Lmq8Rpo6271vH76InTChTitEAm65w==} - engines: {node: '>=22'} - copy-file@11.1.0: resolution: {integrity: sha512-X8XDzyvYaA6msMyAM575CUoygY5b44QzLcGRKsK3MFmXcOvQa518dNPLsKYwkYsn72g3EiW+LE0ytd/FlqWmyw==} engines: {node: '>=18'} @@ -23943,13 +23482,18 @@ packages: engines: {node: '>=0.8'} hasBin: true - crc32-stream@7.0.1: - resolution: {integrity: sha512-IBWsY8xznyQrcHn8h4bC8/4ErNke5elzgG8GcqF4RFPw6aHkWWRc7Tgw6upjaTX/CT/yQgqYENkxYsTYN+hW2g==} - engines: {node: '>=18'} + crc32-stream@6.0.0: + resolution: {integrity: sha512-piICUB6ei4IlTv1+653yq5+KoqfBYmj9bw6LqXoOneTMDXk5nM1qt12mFW1caG3LlJXEKW1Bp0WggEmIfQB34g==} + engines: {node: '>= 14'} - cron-parser@5.10.1: - resolution: {integrity: sha512-pKRrRagItwk9rGIStcUyMxFX34x56zoX3KDf9HJ4ttwkXIK1qxK63EvXvEDmlxI9AdPJ+Y7TEKRftRlW5eSS7A==} - engines: {node: '>=18'} + cron-parser@4.9.0: + resolution: {integrity: sha512-p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q==} + engines: {node: '>=12.0.0'} + deprecated: v4 is no longer maintained, upgrade to v5 + + croner@10.0.1: + resolution: {integrity: sha512-ixNtAJndqh173VQ4KodSdJEI6nuioBWI0V1ITNKhZZsO0pEMoDxz539T4FTTbSZ/xIOSuDnzxLVRqBVSvPNE2g==} + engines: {node: '>=18.0'} cross-argv@2.0.0: resolution: {integrity: sha512-YIaY9TR5Nxeb8SMdtrU8asWVM4jqJDNDYlKV21LxtYcfNJhp1kEsgSa6qXwXgzN0WQWGODps0+TlGp2xQSHwOg==} @@ -23974,6 +23518,30 @@ 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'} @@ -24056,8 +23624,28 @@ packages: resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==} engines: {node: '>=0.11'} - db0@0.4.1: - resolution: {integrity: sha512-6RBY/bSn42UrqATwsiULj2uYFyEykB3XeA/NLIVQeHNXlYV6D4Idxx3/aa6k5Y45Dwzx7sygeLotnqHWSeURYA==} + 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 de-indent@1.0.2: resolution: {integrity: sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==} @@ -24093,8 +23681,8 @@ packages: babel-plugin-macros: optional: true - dedent@1.7.2: - resolution: {integrity: sha512-WzMx3mW98SN+zn3hgemf4OzdmyNhhhKz5Ay0pUfQiMQ3e1g+xmTJWp/pKdwKVXhdSkAEGIIzqeuWrL3mV/AXbA==} + dedent@1.7.0: + resolution: {integrity: sha512-HGFtf8yhuhGhqO07SV79tRp+br4MnbdjeVxotpn1QBl30pcLLCQjX5b2295ll0fv8RKDKsmWYrl05usHM9CewQ==} peerDependencies: babel-plugin-macros: ^3.1.0 peerDependenciesMeta: @@ -24116,12 +23704,12 @@ packages: resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==} engines: {node: '>=0.10.0'} - default-browser-id@5.0.1: - resolution: {integrity: sha512-x1VCxdX4t+8wVfd1so/9w+vQ4vx7lKd2Qp5tDRutErwmR85OgmfX7RlLRMWafRMY7hbEiXIbudNrjOAPa/hL8Q==} + default-browser-id@5.0.0: + resolution: {integrity: sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA==} engines: {node: '>=18'} - default-browser@5.2.1: - resolution: {integrity: sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg==} + default-browser@5.5.1: + resolution: {integrity: sha512-m1pAzaJgZ/gssEqlOhJkPJp8Xly7QyW6xcrkUa2KKcDeDSEMP7X8xipU3snUcfisTQx0w1AGae+9UtJSfVnXGw==} engines: {node: '>=18'} defaults@1.0.4: @@ -24131,6 +23719,10 @@ packages: resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==} engines: {node: '>= 0.4'} + define-lazy-prop@2.0.0: + resolution: {integrity: sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==} + engines: {node: '>=8'} + define-lazy-prop@3.0.0: resolution: {integrity: sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==} engines: {node: '>=12'} @@ -24248,8 +23840,8 @@ packages: dexie@4.2.1: resolution: {integrity: sha512-Ckej0NS6jxQ4Po3OrSQBFddayRhTCic2DoCAG5zacOfOVB9P2Q5Xc5uL/nVa7ZVs+HdMnvUPzLFCB/JwpB6Csg==} - diff@9.0.0: - resolution: {integrity: sha512-svtcdpS8CgJyqAjEQIXdb3OjhFVVYjzGAPO8WGCmRbrml64SPw/jJD4GoE98aR7r25A0XcgrK3F02yw9R/vhQw==} + diff@8.0.4: + resolution: {integrity: sha512-DPi0FmjiSU5EvQV0++GFDOJ9ASQUVFh5kD+OzOnYdi7n3Wpm9hWWGfB/O2blfHcMVTL5WkQXSnRiK9makhrcnw==} engines: {node: '>=0.3.1'} dir-glob@3.0.1: @@ -24298,6 +23890,10 @@ 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'} @@ -24318,6 +23914,10 @@ 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'} @@ -24326,6 +23926,9 @@ 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==} @@ -24354,6 +23957,9 @@ 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==} @@ -24363,10 +23969,6 @@ 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'} @@ -24404,6 +24006,10 @@ packages: resolution: {integrity: sha512-L1l8TNvomm6UVW5B253AGxQagSQr+vGwhMlrrfRS2qmhx46AMpMVJKQYLvWYbysTMY8VoicOvzHzoHMbyzB+4A==} engines: {node: '>=10.13.0'} + enquirer@2.3.6: + resolution: {integrity: sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==} + engines: {node: '>=8.6'} + enquirer@2.4.1: resolution: {integrity: sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==} engines: {node: '>=8.6'} @@ -24431,9 +24037,14 @@ packages: resolution: {integrity: sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - env-runner@0.2.3: - resolution: {integrity: sha512-S8EFBKyznRwPVwayK187cYjvnpgC92xy+q0BIF++V965pfjMVVRbQ/HoTYGA/1EHmZ7E68k6Heq+4WnvVhOL5w==} + env-runner@0.1.6: + resolution: {integrity: sha512-fSb7X1zdda8k6611a6/SdSQpDe7a/bqMz2UWdbHjk9YWzpUR4/fn9YtE/hqgGQ2nhvVN0zUtcL1SRMKwIsDbAA==} hasBin: true + peerDependencies: + miniflare: ^4.0.0 + peerDependenciesMeta: + miniflare: + optional: true envinfo@7.14.0: resolution: {integrity: sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==} @@ -24467,14 +24078,12 @@ packages: es-module-lexer@1.7.0: resolution: {integrity: sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==} - es-module-lexer@2.3.2: - resolution: {integrity: sha512-poHGpORABojJJucnV9KbOavETW8lBVnphkW77ER5/BQ5Fz7oXSoCNek7IH3vR5nRjdsEz926ibFYX8KtLQmdyw==} + es-module-lexer@2.3.1: + resolution: {integrity: sha512-shc1dbU90Yl/xq1QrC7QRtfcwURZuVRfPhZbDoldJ1cn1gzDvBaBWlv0eFolj5+0znnPJz5TXLxsN77X/12KTA==} - es-module-lexer@3.0.3: - resolution: {integrity: sha512-yWGe1O/j+almnV4hOYrmZo8u58JdnmXEMneRQAYkWtqSiT86yoMIEKF4rpqEDj52tbYl3xceBD3DQIBwcsC9Pw==} - - es-module-lexer@3.0.4: - resolution: {integrity: sha512-BldNY5mwkVu+cQ5Ymn3e6hB9Sx8XHx4ZevWbiUyZbfKxJxYO27Hf0wfzkxIaD5CAJMaGl3YspKELj0ff/7nCMA==} + es-object-atoms@1.1.1: + resolution: {integrity: sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==} + engines: {node: '>= 0.4'} es-object-atoms@1.1.2: resolution: {integrity: sha512-HWcBoN6NileqtSydK2FqHbS/LoDd2pqrnQHLyJzBj4kOp/ky2MWMN694xOfkK8/SnUsW2DH7EfyVlydKCsm1Zw==} @@ -24533,8 +24142,8 @@ packages: engines: {node: '>=18'} hasBin: true - esbuild@0.28.1: - resolution: {integrity: sha512-HrJrvZv5ayxBzPfwphOoNzkzOIIlifzk0KJrGK2c8R4+LKpMtpYLQeUdjnwjWv/LZlkH2laZk+4w78pi99D4Vw==} + esbuild@0.28.2: + resolution: {integrity: sha512-HKVLS8dvII+xoKW9kmqxbRKrnWEXfJJr/FZhhJmiqIB0e053QNYFqOBouTMO/k5sID4MvCiUCvv8b9M4h32wIA==} engines: {node: '>=18'} hasBin: true @@ -24795,8 +24404,8 @@ packages: resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==} engines: {node: '>=16.17'} - expect-type@1.4.0: - resolution: {integrity: sha512-KfYbmpRm0VbLjEvVa9yGwCi9GI34xvi7A/HXYWQO65CSD2u3MczUJSuwXKFIxlGsgBQizV9q5J9NHj4VG0n+pA==} + expect-type@1.3.0: + resolution: {integrity: sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==} engines: {node: '>=12.0.0'} express@4.22.2: @@ -24810,12 +24419,14 @@ 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==} + extract-zip@2.0.1: + resolution: {integrity: sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==} + engines: {node: '>= 10.17.0'} + hasBin: true + fast-check@3.23.2: resolution: {integrity: sha512-h5+1OzzfCC3Ef7VbtKdcv7zsstUQwUDlYpUTvjeUsJAssPgLn7QzbboPtL5ro04Mq0rPOsMzl7q5hIbRs2wD1A==} engines: {node: '>=8.0.0'} @@ -24851,18 +24462,9 @@ packages: fast-sha256@1.3.0: resolution: {integrity: sha512-n11RGP/lrWEFI/bWdygLxhI+pVeo1ZYIVwvvPkW7azl/rOy+F3HYRZ2K5zeE9mmkhQppyv9sQFx0JM9UabnpPQ==} - fast-string-truncated-width@3.0.3: - resolution: {integrity: sha512-0jjjIEL6+0jag3l2XWWizO64/aZVtpiGE3t0Zgqxv0DPuxiMjvB3M24fCyhZUO4KomJQPj3LTSUnDP3GpdwC0g==} - - fast-string-width@3.0.2: - resolution: {integrity: sha512-gX8LrtNEI5hq8DVUfRQMbr5lpaS4nMIWV+7XEbXk2b8kiQIizgnlr12B4dA3ZEx3308ze0O4Q1R+cHts8kyUJg==} - fast-uri@3.0.6: resolution: {integrity: sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==} - fast-wrap-ansi@0.2.0: - resolution: {integrity: sha512-rLV8JHxTyhVmFYhBJuMujcrHqOT2cnO5Zxj37qROj23CP39GXubJRBUFF0z8KFK77Uc0SukZUf7JZhsVEQ6n8w==} - fastest-levenshtein@1.0.16: resolution: {integrity: sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==} engines: {node: '>= 4.9.1'} @@ -24877,6 +24479,9 @@ packages: resolution: {integrity: sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==} engines: {node: '>=0.8.0'} + fd-slicer@1.1.0: + resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==} + fdir@6.5.0: resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==} engines: {node: '>=12.0.0'} @@ -24893,8 +24498,8 @@ packages: resolution: {integrity: sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==} engines: {node: ^12.20 || >= 14.13} - fetchdts@0.2.0: - resolution: {integrity: sha512-PJb4ZTGT2/wK78RmVrxZITStWabhZlKBsL52VOgq+c7clEkdHdEB+0rtzrXCbZJqeYJj+IwNWYqB5/G6vouA6A==} + fetchdts@0.1.7: + resolution: {integrity: sha512-YoZjBdafyLIop9lSxXVI33oLD5kN31q4Td+CasofLLYeLXRFeOsuOw0Uo+XNRi9PZlbfdlN2GmRtm4tCEQ9/KA==} fflate@0.8.3: resolution: {integrity: sha512-tbZNuJrLwGUp3zshBtdy4W+ORxZuIh8a5ilyIEQDC5rY1f3U20JMry0Ll3WBzU58EZKsEuJFXhb5gwv8CsPvgA==} @@ -24949,6 +24554,10 @@ 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'} @@ -24967,9 +24576,6 @@ 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==} @@ -24994,10 +24600,6 @@ packages: resolution: {integrity: sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==} engines: {node: '>= 6'} - form-data@4.0.6: - resolution: {integrity: sha512-vKatAh4SlVfgbv+YtmhiRjhEMJsYpsG1Y2rMQtR+SVSbytsSD1YGzDIcrAJmdFec88u/+VoGmxnl+80gL1tRCQ==} - engines: {node: '>= 6'} - formdata-polyfill@4.0.10: resolution: {integrity: sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==} engines: {node: '>=12.20.0'} @@ -25010,8 +24612,8 @@ packages: resolution: {integrity: sha512-5F5Och7wrvtLVElIpclDT0CBzMVg3dL22B64aZwHtsIY8RB4mXICLrkajK4G9R+ieSAGcgrLeae2SeUTg2pr6w==} peerDependencies: '@emotion/is-prop-valid': '*' - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@emotion/is-prop-valid': optional: true @@ -25039,6 +24641,11 @@ packages: resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==} engines: {node: '>=6 <7 || >=8'} + fsevents@2.3.2: + resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==} + engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} + os: [darwin] + fsevents@2.3.3: resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==} engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} @@ -25065,6 +24672,10 @@ 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'} @@ -25087,6 +24698,10 @@ packages: resolution: {integrity: sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==} engines: {node: '>= 0.4'} + get-stream@5.2.0: + resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==} + engines: {node: '>=8'} + get-stream@8.0.1: resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==} engines: {node: '>=16'} @@ -25098,6 +24713,10 @@ 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==} @@ -25145,6 +24764,10 @@ 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==} @@ -25175,24 +24798,44 @@ packages: resolution: {integrity: sha512-AjqGKbDGUFRKIRCP9tCKiIGHyriz2oHEbPIbEtcSLSs4YjReZOIPQQWek4+6hjw62H9QShXHyaGivGiYVLeYFQ==} engines: {node: ^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0} - graphql@16.14.2: - 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.32: - resolution: {integrity: sha512-Epg1E85L8yIKd9UeAQAVdm6QVrnHbppMsQ641EjpNi4c0IlAg+PJlwp4Xw03Z1loRXPQaH9k64gJT5qDELqm+g==} + h3@1.15.5: + resolution: {integrity: sha512-xEyq3rSl+dhGX2Lm0+eFQIAzlDN6Fs0EcC4f7BNUmzaRX/PTzeuM+Tr2lHB8FoXggsQIeXLj8EDVgs5ywxyxmg==} + + h3@2.0.1-rc.14: + resolution: {integrity: sha512-163qbGmTr/9rqQRNuqMqtgXnOUAkE4KTdauiC9y0E5iG1I65kte9NyfWvZw5RTDMt6eY+DtyoNzrQ9wA2BfvGQ==} engines: {node: '>=20.11.1'} hasBin: true peerDependencies: - crossws: ^0.4.12 - ocache: '>=0.3.0' + crossws: ^0.4.1 peerDependenciesMeta: crossws: optional: true - ocache: + + 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: optional: true handle-thing@2.0.1: @@ -25246,9 +24889,6 @@ packages: headers-polyfill@4.0.3: resolution: {integrity: sha512-IScLbePpkvO846sIwOtOTDjutRMWdXdJmXdMvk6gCBHxFO8d+QKOQedyZSxFTTFYRSmlgSTDtXqqq4pcenBXLQ==} - headers-polyfill@5.0.1: - resolution: {integrity: sha512-1TJ6Fih/b8h5TIcv+1+Hw0PDQWJTKDKzFZzcKOiW1wJza3XoAQlkCuXLbymPYB8+ZQyw8mHvdw560e8zVFIWyA==} - hey-listen@1.0.8: resolution: {integrity: sha512-COpmrF2NOg4TBWUJ5UVyaCU2A88wEMkUPK4hNqyCkqHbxT92BbvfjoSozkAIIm6XhicGlJHhFdullInrdhwU8Q==} @@ -25258,30 +24898,20 @@ 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@6.1.2: - resolution: {integrity: sha512-+abwxtiEA52GCVIsQqut3S/uKTbUwYIp4Pe/vv+6py5XiXBCqMZHg6pA6Y5qhgLSEys0/cYuPbO0z1QFj5ZCmg==} + hookable@5.5.3: + resolution: {integrity: sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==} + + hookable@6.1.0: + resolution: {integrity: sha512-ZoKZSJgu8voGK2geJS+6YtYjvIzu9AOM/KZXsBxr83uhLL++e9pEv/dlgwgy3dvHg06kTz6JOh1hk3C8Ceiymw==} hosted-git-info@7.0.2: resolution: {integrity: sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==} engines: {node: ^16.14.0 || >=18.0.0} - hosted-git-info@9.0.3: - resolution: {integrity: sha512-Hc+ghLoSt6QaYZUv0WBiIvmMDZuZZ7oaDvdH8MbfOO4lOsxdXLEvuC6ePoGs9H1X9oCLyq6+NVN0MKqD+ydxyg==} - engines: {node: ^20.17.0 || >=22.9.0} - hpack.js@2.1.6: resolution: {integrity: sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==} @@ -25380,6 +25010,9 @@ 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==} @@ -25426,10 +25059,6 @@ 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'} @@ -25437,23 +25066,21 @@ 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'} - import-in-the-middle@3.5.1: - resolution: {integrity: sha512-mPKuL8bPQzecui2KK6Gb+M8JvJoHnhS1FeYGa22QopBmlevF5F0FE6ued/B5EgHDeIoMTONIpDWWFKUPOG0DBQ==} - engines: {node: '>=18'} - import-lazy@4.0.0: resolution: {integrity: sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==} engines: {node: '>=8'} @@ -25515,10 +25142,6 @@ packages: resolution: {integrity: sha512-7Xnt54Dco7uYkfdAw0r2vCly3z0rSaVhEXMzPvl3FndsTVm5p26j+PO+gyinkYmcsEUvX2Rh7OGK7KzYWRu6BA==} hasBin: true - iron-session@9.0.1: - resolution: {integrity: sha512-ELSZdcLvA0AMhxUCY+rwKCh42UV88SqEb1ia/bHLF9G+6kScikO6mShtlIq+OtF2UlkZP0dmI2dMdG9vh4rebA==} - engines: {node: '>=22.13.0'} - iron-webcrypto@1.2.1: resolution: {integrity: sha512-feOM6FaSr6rEABp/eDfVseKyTMDt+KGpeB35SkVn9Tyn0CqvVsY3EwI0v5i8nMHyJnzCIQf7nsy3p41TPkJZhg==} @@ -25560,6 +25183,11 @@ packages: resolution: {integrity: sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==} engines: {node: '>= 0.4'} + is-docker@2.2.1: + resolution: {integrity: sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==} + engines: {node: '>=8'} + hasBin: true + is-docker@3.0.0: resolution: {integrity: sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} @@ -25587,6 +25215,10 @@ 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'} @@ -25600,6 +25232,9 @@ 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'} @@ -25648,6 +25283,9 @@ 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'} @@ -25715,10 +25353,18 @@ packages: resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==} engines: {node: '>=0.10.0'} - is-wsl@3.1.0: - resolution: {integrity: sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==} + is-wsl@2.2.0: + resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==} + engines: {node: '>=8'} + + is-wsl@3.1.1: + resolution: {integrity: sha512-e6rvdUCiQCAuumZslxRJWR/Doq4VpPR82kqclvcS0efgt430SlGIk05vdCN58+VrzgtIcfNODjozVielycD4Sw==} engines: {node: '>=16'} + is64bit@2.0.0: + resolution: {integrity: sha512-jv+8jaWCl0g2lSBkNSVXdzfBA0npK1HGC2KtWM9FumFRoGS94g3NbCCLVnCYHLjp4GrW2KZeeSTMo5ddtznmGw==} + engines: {node: '>=18'} + isarray@1.0.0: resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==} @@ -25760,6 +25406,9 @@ 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==} @@ -25772,6 +25421,9 @@ 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==} @@ -25781,6 +25433,9 @@ 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 @@ -25848,8 +25503,8 @@ packages: engines: {node: '>=6'} hasBin: true - jsonc-parser@3.3.1: - resolution: {integrity: sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==} + jsonc-parser@3.2.0: + resolution: {integrity: sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==} jsonfile@4.0.0: resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==} @@ -25858,19 +25513,19 @@ packages: resolution: {integrity: sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==} engines: {node: '>=0.10.0'} - jsonwebtoken@9.0.3: - resolution: {integrity: sha512-MT/xP0CrubFRNLNKvxJ2BYfy53Zkm++5bX9dtuPbqAeQpTVe0MQTFhao8+Cp//EmJp244xt6Drw/GVEGCUj40g==} + jsonwebtoken@9.0.2: + resolution: {integrity: sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==} engines: {node: '>=12', npm: '>=6'} junk@4.0.1: resolution: {integrity: sha512-Qush0uP+G8ZScpGMZvHUiRfI0YBWuB3gVBYlI0v0vvOJt5FLicco+IkP0a50LqTTQhmts/m6tP5SWE+USyIvcQ==} engines: {node: '>=12.20'} - jwa@2.0.1: - resolution: {integrity: sha512-hRF04fqJIP8Abbkq5NKGN0Bbr3JxlQ+qhZufXVr0DvujKy93ZCbXZMHDL4EOtodSbCWxOqR8MS1tXA5hwqCXDg==} + jwa@1.4.2: + resolution: {integrity: sha512-eeH5JO+21J78qMvTIDdBXidBd6nG2kZjg5Ohz/1fpa28Z4CcsWUzJ1ZZyFq/3z3N17aZy+ZuBoHljASbL1WfOw==} - jws@4.0.1: - resolution: {integrity: sha512-EKI/M/yqPncGUUh44xz0PxSidXFr/+r0pA70+gIYhjv+et7yxM+s29Y+VGDkovRofQem0fs7Uvf4+YmAdyRduA==} + jws@3.2.2: + resolution: {integrity: sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==} jwt-decode@3.1.2: resolution: {integrity: sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A==} @@ -25893,6 +25548,13 @@ 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==} @@ -26115,18 +25777,22 @@ packages: '@parcel/watcher': optional: true + listhen@1.9.0: + resolution: {integrity: sha512-I8oW2+QL5KJo8zXNWX046M134WchxsXC7SawLPvRQpogCbkyQIaFxPE89A2HiwR7vAK2Dm2ERBAmyjTYGYEpBg==} + hasBin: true + loader-runner@4.3.0: 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'} @@ -26236,11 +25902,11 @@ packages: resolution: {integrity: sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==} engines: {node: '>=12'} - magic-string@1.4.3: - resolution: {integrity: sha512-z12OxmaPGE0F4xlpGdjuAUckipLpQlTAuAmyGhNoD7ODpYUzvDfvtxUbjM/jwznyP178oju/KDdyi220wNJ0RQ==} + magic-string@1.2.3: + resolution: {integrity: sha512-Bpb0W2TbLKOZ7vJnOUnVRGq3WL2p+ISV29M6hYPL1AFCpyKZpdr5ytiXoTSSxRVhg8YW7f65+6gbG8WG6PCa/g==} - magic-string@1.4.5: - resolution: {integrity: sha512-oLLC2+YvQUfAa+vxoufE/yc1icb87M9iXIRqAoR/2EhE/8cb3SF/+Gi0c2By1B+5Vz2e2vQtUvHiu1+63Znh+w==} + magicast@0.5.4: + resolution: {integrity: sha512-llBEhWm1SacoRwgHUoQJYtwp4PBLF4faQi5TCpIGyGs9n4y5+juI0tDgyKIfpqxckRHaHzouUEph3THklWh03w==} manage-path@2.0.0: resolution: {integrity: sha512-NJhyB+PJYTpxhxZJ3lecIGgh4kwIY2RAh44XvAz9UlqthlQwtPBf62uBVR8XaD8CRuSjQ6TnZH2lNJkbLPZM2A==} @@ -26345,6 +26011,11 @@ 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'} @@ -26362,10 +26033,6 @@ 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==} @@ -26379,6 +26046,10 @@ 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'} @@ -26453,10 +26124,6 @@ packages: resolution: {integrity: sha512-umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg==} engines: {node: '>= 18'} - minizlib@3.1.0: - resolution: {integrity: sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==} - engines: {node: '>= 18'} - mkdirp@3.0.1: resolution: {integrity: sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==} engines: {node: '>=10'} @@ -26465,14 +26132,14 @@ 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'} hasBin: true - module-details-from-path@1.0.4: - resolution: {integrity: sha512-EGWKgxALGMgzvxYF1UyGTy0HXX/2vHLkw6+NvDKW2jypWbHpjQuj4UMcqQWXHERJhVGKikolT06G3bcKe4fi7w==} - motion-dom@11.18.1: resolution: {integrity: sha512-g76KvA001z+atjfxczdRtw/RXOM3OMSdd1f4DL77qCTF/+avrRJiawSG4yDibEQ215sr9kpinSlX2pCTJ9zbhw==} @@ -26493,16 +26160,6 @@ packages: ms@2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} - msw@2.15.0: - resolution: {integrity: sha512-2wQAmKkQKxRuXvYJxVhPGG0wZNBQyD06oJvxqw90XqLvptdqxdlHrFUfEteKkpaNORX3Xzc+HtEl/q0nfmN2wQ==} - engines: {node: '>=18'} - hasBin: true - peerDependencies: - typescript: '>= 4.8.x' - peerDependenciesMeta: - typescript: - optional: true - msw@2.7.0: resolution: {integrity: sha512-BIodwZ19RWfCbYTxWTUfTXc+sg4OwjCAgxU1ZsgmggX/7S3LdUifsbUPJs61j0rWb19CZRGY5if77duhc0uXzw==} engines: {node: '>=18'} @@ -26524,10 +26181,6 @@ packages: resolution: {integrity: sha512-WWdIxpyjEn+FhQJQQv9aQAYlHoNVdzIzUySNV1gHUPDSdZJ3yZn7pAAbQcV7B56Mvu881q9FZV+0Vx2xC44VWA==} engines: {node: ^18.17.0 || >=20.5.0} - mute-stream@3.0.0: - resolution: {integrity: sha512-dkEJPVvun4FryqBmZ5KhDo0K9iDXAwn08tMLDinNdRBNPcYEDiWYysLcc6k3mjTMlbP9KyylvRpd4wFtwrT9rw==} - engines: {node: ^20.17.0 || >=22.9.0} - mysql2@3.15.3: resolution: {integrity: sha512-FBrGau0IXmuqg4haEZRBfHNWB5mUARw6hNwPDXXGg0XzVJ50mr/9hb267lvpVMnhZ1FON3qNd4Xfcez1rbFwSg==} engines: {node: '>= 8.0'} @@ -26544,13 +26197,8 @@ packages: 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==} - engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} - hasBin: true - - nanoid@3.3.19: - resolution: {integrity: sha512-Y2tUNy4ouw6tq5oDSKeQYGOyhkUBhNOcGV/02KC+6kd9eDGqdZd++mjMiIDilrBYvjEnCYvVtsuHCuP+okSfug==} + nanoid@3.3.12: + resolution: {integrity: sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true @@ -26584,34 +26232,68 @@ packages: netlify-redirector@0.5.0: resolution: {integrity: sha512-4zdzIP+6muqPCuE8avnrgDJ6KW/2+UpHTRcTbMXCIRxiRmyrX+IZ4WSJGZdHPWF3WmQpXpy603XxecZ9iygN7w==} - next@16.3.4: - resolution: {integrity: sha512-/Ztf6CeRH+ejEXUrYtqI4gkS66eFIHuSwqi60RgcpWKodxFZx2/dqVCMKBwILfAHXQ+F1b1vAudgj3mnxqtoIA==} - engines: {node: '>=20.9.0'} - hasBin: true - peerDependencies: - '@opentelemetry/api': ^1.1.0 - '@playwright/test': ^1.63.0 - babel-plugin-react-compiler: '*' - react: ~19.2.9 - react-dom: ~19.2.9 - sass: ^1.3.0 - peerDependenciesMeta: - '@opentelemetry/api': - optional: true - '@playwright/test': - optional: true - babel-plugin-react-compiler: - optional: true - 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.260903-beta: - resolution: {integrity: sha512-54gANPi62O8rfMvepiJUVuIzEIinYfpeHbebywlLxvVTgIYXDwSvpaU9Id+0sJOBjBx0wC1/CVYXJkH7SY+l0g==} + nitro@3.0.1-alpha.2: + resolution: {integrity: sha512-YviDY5J/trS821qQ1fpJtpXWIdPYiOizC/meHavlm1Hfuhx//H+Egd1+4C5SegJRgtWMnRPW9n//6Woaw81cTQ==} 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==} @@ -26691,10 +26373,6 @@ packages: resolution: {integrity: sha512-V6gygoYb/5EmNI+MEGrWkC+e6+Rr7mTmfHrxDbLzxQogBkgzo76rkok0Am6thgSF7Mv2nLOajAJj5vDJZEFn7g==} engines: {node: ^16.14.0 || >=18.0.0} - normalize-package-data@8.0.0: - resolution: {integrity: sha512-RWk+PI433eESQ7ounYxIp67CYuVsS1uYSonX3kA6ps/3LWfjVQa/ptEg6Y3T6uAMq1mWpX9PQ+qx+QaHpsc7gQ==} - engines: {node: ^20.17.0 || >=22.9.0} - normalize-path@2.1.1: resolution: {integrity: sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==} engines: {node: '>=0.10.0'} @@ -26717,8 +26395,8 @@ packages: nwsapi@2.2.16: resolution: {integrity: sha512-F1I/bimDpj3ncaNDhfyMWuFqmQDBwDB0Fogc2qpL3BWvkQteFD/8BzWuIRl83rq0DXfm8SGt/HFhLXZyljTXcQ==} - nx@24.0.0: - resolution: {integrity: sha512-LchM3SyEUYL6qjHUneiSuyYlUscv8t6qpAYWUqnUY5OoSQSLIOLT/xrerLCKUTTcu7Yq1o/TDo9TiwhaBLvM4Q==} + nx@22.7.5: + resolution: {integrity: sha512-zoxsJabb33jl1QYnalDn0bicryrEBgSzdKp90d7VGGv/jDgzKrcLg/hw2ZxeYiOjWPIT/o8QNT9G9vTs4dv3AQ==} hasBin: true peerDependencies: '@swc-node/register': ^1.11.1 @@ -26763,19 +26441,21 @@ packages: obug@2.1.1: resolution: {integrity: sha512-uTqF9MuPraAQ+IsnPf366RG4cP9RtUi7MLO1N3KEc+wb0a6yKpeL0lmk2IB1jY5KHPAlTc6T/JRdC/YqxHNwkQ==} - 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==} + ocache@0.1.2: + resolution: {integrity: sha512-lI34wjM7cahEdrq2I5obbF7MEdE97vULf6vNj6ZCzwEadzyXO1w7QOl2qzzG4IL8cyO7wDtXPj9CqW/aG3mn7g==} 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==} + omit.js@2.0.2: + resolution: {integrity: sha512-hJmu9D+bNB40YpL9jYebQl4lsTW6yEHRTroJzNLqQJYHm7c+NQnJGfZmIWh8S3q3KoaxV1aLhV6B3+0N0/kyJg==} + on-exit-leak-free@2.1.2: resolution: {integrity: sha512-0eJJY6hXLGf1udHwfNftBqH+g73EU4B504nZeKpz1sYRKafAghwxEJunB2O7rDZkL4PGfsMVnTXZ2EjibbqcsA==} engines: {node: '>=14.0.0'} @@ -26814,12 +26494,20 @@ 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'} + + open@8.4.2: + resolution: {integrity: sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==} + engines: {node: '>=12'} + optionator@0.9.4: resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==} engines: {node: '>= 0.8.0'} - ora@5.4.1: - resolution: {integrity: sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==} + ora@5.3.0: + resolution: {integrity: sha512-zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g==} engines: {node: '>=10'} outdent@0.5.0: @@ -26828,9 +26516,17 @@ 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'} @@ -26883,6 +26579,10 @@ packages: resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} engines: {node: '>=6'} + p-wait-for@5.0.2: + resolution: {integrity: sha512-lwx6u1CotQYPVju77R+D0vFomni/AqRfqLmqQ8hekklqZ6gAY9rONh7lBQ0uxWMkC2AuX9b2DVAl8To0NyP1JA==} + engines: {node: '>=12'} + package-json-from-dist@1.0.1: resolution: {integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==} @@ -26993,6 +26693,9 @@ packages: resolution: {integrity: sha512-Vj7sf++t5pBD637NSfkxpHSMfWaeig5+DKWLhcqIYx6mWQz5hdJTGDVMQiJcw1ZYkhs7AazKDGpRVji1LJCZUQ==} engines: {node: '>=18'} + pathe@1.1.2: + resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==} + pathe@2.0.3: resolution: {integrity: sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==} @@ -27002,8 +26705,8 @@ packages: perfect-debounce@1.0.0: resolution: {integrity: sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==} - pg-gateway@0.3.0-beta.4: - resolution: {integrity: sha512-CTjsM7Z+0Nx2/dyZ6r8zRsc3f9FScoD5UAOlfUx1Fdv/JOIWvRbF7gou6l6vP+uypXQVoYPgw8xZDXgMGvBa4Q==} + perfect-debounce@2.1.0: + resolution: {integrity: sha512-LjgdTytVFXeUgtHZr9WYViYSM/g8MkcTPYDlPa3cDqMirHjKiSZPYd6DoL7pK8AJQr+uWkQvCjHNdiMqsrJs+g==} picocolors@1.1.1: resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==} @@ -27016,6 +26719,10 @@ 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'} @@ -27051,18 +26758,21 @@ 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'} - playwright-core@1.63.0: - resolution: {integrity: sha512-rYCsBF/M5HjUch52bbtVONEFjv6Xu8sm8h72dNlR5bzIE1fvC/bxgspzkjSfU+MweEMmPM8KJebG6nnyxo5mCg==} - engines: {node: '>=20'} + playwright-core@1.61.1: + resolution: {integrity: sha512-h7Qlt6m4REp25qvIdvbDtVmD4LqVXfpRxhORv9L0jzETM05p4fuPJ3dKyuSXQxDSbXnmS79HAgi9589lGSpLkg==} + engines: {node: '>=18'} hasBin: true - playwright@1.63.0: - resolution: {integrity: sha512-+7ziBLidS4NaNCdt57SUDT+wYmmd5fmiQejUic/kb+YsYSCPyOOE9sebzMjNmQrsnNpDJqd4WHvV/8lfKfUDUg==} - engines: {node: '>=20'} + playwright@1.61.1: + resolution: {integrity: sha512-DWnY5o3YbLWK4GovuAVwpqL+1VwGNdUGrRr++8j8PtQQzvAVZUIMjKQ90fY689sEJZJBbZVw1rXaOKSTitkzPQ==} + engines: {node: '>=18'} hasBin: true possible-typed-array-names@1.1.0: @@ -27123,12 +26833,8 @@ packages: peerDependencies: postcss: ^8.2.9 - postcss@8.5.23: - resolution: {integrity: sha512-g50586zr4bZmwFiTlflMu8E0bDTb5I5gertgwAKmsdUlTQIhZtunzUlD1WSzwcVWPoAVpsrA6vlfCD7oXvRwgg==} - engines: {node: ^10 || ^12 || >=14} - - postcss@8.5.29: - resolution: {integrity: sha512-49cGhUbXj8Qenv0iTMxA1cFBzxXoctpC9Ujd77t1WcbJIr6nF/eI7g/8MgxrYldFRuAXvja7xQRwavoW7kgrxQ==} + postcss@8.5.15: + resolution: {integrity: sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==} engines: {node: ^10 || ^12 || >=14} postcss@8.5.3: @@ -27147,6 +26853,10 @@ 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==} @@ -27206,6 +26916,10 @@ 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==} @@ -27282,6 +26996,9 @@ packages: engines: {node: '>=18'} hasBin: true + pump@3.0.3: + resolution: {integrity: sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==} + punycode@2.3.1: resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==} engines: {node: '>=6'} @@ -27324,8 +27041,8 @@ packages: peerDependencies: '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -27353,17 +27070,20 @@ packages: rc9@2.1.2: resolution: {integrity: sha512-btXCnMmRIBINM2LDZoEmOogIZU7Qe7zn4BpomSKZ/ykbLObuBdvG+mFq11DL6fjH1DRwHhrlgtYWG96bJiC7Cg==} - react-dom@19.2.9: - resolution: {integrity: sha512-YceU74W21fXEHszKBLj16MY0CmvpFKOs60iVrIyW/cCgOPsZJNaB6GVJEtIUqt6AG6EjzKLui5lPRrxAeS328Q==} + 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==} peerDependencies: - react: ~19.2.9 + react: ^19.2.3 react-hot-toast@2.5.1: resolution: {integrity: sha512-54Gq1ZD1JbmAb4psp9bvFHjS7lje+8ubboUmvKZkCsQBLH6AOpZ9JemfRvIdHcfb9AZXRaFLrb3qUobGYDJhFQ==} engines: {node: '>=10'} peerDependencies: - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 react-is@16.13.1: resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==} @@ -27378,6 +27098,10 @@ 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'} @@ -27387,7 +27111,7 @@ packages: engines: {node: '>=10'} peerDependencies: '@types/react': ^19.2.8 - react: ~19.2.9 + react: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -27397,25 +27121,25 @@ packages: engines: {node: '>=10'} peerDependencies: '@types/react': ^19.2.8 - react: ~19.2.9 + react: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true - react-server-dom-rspack@0.1.1: - resolution: {integrity: sha512-pgL4M/D3jFzn/2Dv8ppgFPrauyJjP29sFCV5EjSCLI29+NHIhumkhxnkiK8x0h5SQLPqUVVZfiAu3dn7Bl1RNg==} + react-server-dom-rspack@0.0.2: + resolution: {integrity: sha512-PowIm+Z65LkvC3yk4t3YrH2nMejwL361jiBT0BMW2bQCDUaNQknDHMPH0aTgMtJ9ZZ1Gc7KFgBvwB0itSzzELQ==} engines: {node: '>=0.10.0'} peerDependencies: - '@rspack/core': ^2.2.0-0 - react: ~19.2.9 - react-dom: ~19.2.9 + '@rspack/core': ^2.0.0-0 + react: ^19.2.3 + react-dom: ^19.2.3 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.9 + react: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -27423,31 +27147,23 @@ packages: react-transition-group@4.4.5: resolution: {integrity: sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==} peerDependencies: - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 react-tweet@3.3.0: resolution: {integrity: sha512-gSIG2169ZK7UH6rBzuU+j1xnQbH3IlOTLEkuGrRiJJTMgETik+h+26yHyyVKrLkzwrOaYPk4K3OtEKycqKgNLw==} peerDependencies: - react: ~19.2.9 - react-dom: ~19.2.9 + react: ^19.2.3 + react-dom: ^19.2.3 - react@19.2.9: - resolution: {integrity: sha512-RuLdAokXv3sRmZa2/N8QH0KmTBIgDKC+buRUikGqow31+mGSGidLCX2o4XFq8OV+xBFWfhM9DVgTq1PPHADH4w==} + react@19.2.3: + resolution: {integrity: sha512-Ku/hhYbVjOQnXDZFv2+RibmLFGwFdeeKHFcOTlrt7xplBnya5OGn/hIRDsqDiSUcfORsDC7MPxwork8jBwsIWA==} engines: {node: '>=0.10.0'} read-package-up@11.0.0: resolution: {integrity: sha512-MbgfoNPANMdb4oRBNg5eqLbB2t2r+o5Ua1pNt8BqGp4I0FJZhuVSOj3PaBPni4azWuSzEdNn2evevzVmEk1ohQ==} engines: {node: '>=18'} - read-package-up@12.0.0: - resolution: {integrity: sha512-Q5hMVBYur/eQNWDdbF4/Wqqr9Bjvtrw2kjGxxBbKLbx8bVCL8gcArjTy8zDUuLGQicftpMuU0riQNcAsbtOVsw==} - engines: {node: '>=20'} - - read-pkg@10.1.0: - resolution: {integrity: sha512-I8g2lArQiP78ll51UeMZojewtYgIRCKCWqZEgOO8c/uefTI+XDXvCSXu3+YNUaTNvZzobrL5+SqHjBrByRRTdg==} - engines: {node: '>=20'} - read-pkg@9.0.1: resolution: {integrity: sha512-9viLL4/n1BJUCT1NXVTdS1jtm80yDEgR5T4yCelII49Mbj0v1rZdKqj7zCiYdbB0CuCgdrvHcNogAKTFPBocFA==} engines: {node: '>=18'} @@ -27467,9 +27183,8 @@ packages: resolution: {integrity: sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - readdir-glob@3.0.0: - resolution: {integrity: sha512-AhNB2KgKeVJr16nK9LLZbJNWnYoT23ZrumNKFDebHBdkC8KHSqWo871JAUhoWC/RtjEVdqNMFpM6qrwRbaUqpw==} - engines: {node: '>=18'} + readdir-glob@1.1.3: + resolution: {integrity: sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==} readdirp@3.6.0: resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} @@ -27509,9 +27224,6 @@ 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==} @@ -27559,10 +27271,6 @@ packages: resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==} engines: {node: '>=0.10.0'} - require-in-the-middle@8.0.1: - resolution: {integrity: sha512-QT7FVMXfWOYFbeRBF6nu+I6tr2Tf3u0q8RIEjNob/heKY/nh7drD/k7eeMFmSQgnTtCzLDcCu/XEnpW2wk4xCQ==} - engines: {node: '>=9.3.0 || >=8.10.0 <9.0.0'} - require-package-name@2.0.1: resolution: {integrity: sha512-uuoJ1hU/k6M0779t3VMVIYpb2VMJk05cehCaABFhXaibcbvfgR8wKiozLjVFSzJPmQMRqIcO0HMyTFqfV09V6Q==} @@ -27616,9 +27324,6 @@ packages: resolution: {integrity: sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==} engines: {node: '>= 4'} - rettime@0.11.11: - resolution: {integrity: sha512-ILJRqVWBCTlg9r42fFgwVZx1gnFAcQF8mRoMkbgQfIrjEDf9nbBFDFx00oloOa+Q869FUtaYDXZvEfnecQSCoQ==} - reusify@1.0.4: resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==} engines: {iojs: '>=1.0.0', node: '>=0.10.0'} @@ -27635,11 +27340,29 @@ packages: engines: {node: 20 || >=22} hasBin: true - rolldown@1.2.13: - resolution: {integrity: sha512-/5apOkwWxtACcQtZ5WlrAsKS4JwXVThQPJZ3RqIruRY9UG9M8e0VlXN068xum/JRKA4aIUoJ13ghe/kGCvidiQ==} + rolldown@1.0.0-rc.9: + resolution: {integrity: sha512-9EbgWge7ZH+yqb4d2EnELAntgPTWbfL8ajiTW+SyhJEC4qhBbkCKbqFV4Ge4zmu5ziQuVbWxb/XwLZ+RIO7E8Q==} 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'} @@ -27648,8 +27371,8 @@ packages: rou3@0.7.12: resolution: {integrity: sha512-iFE4hLDuloSWcD7mjdCDhx2bKcIsYbtOTpfH5MHHLSKMOUyjqQXTeZVa289uuwEGEKFoE/BAPbhaU4B774nceg==} - rou3@0.9.2: - resolution: {integrity: sha512-3SOzvaAg8rkHrXtRjpCvCvbyO5to9oOO27Z/XqHEYXfMRVSw/qMIVdmaOk9W2lcRLtR6dlqTjo9hDeJk70QBYQ==} + rou3@0.8.1: + resolution: {integrity: sha512-ePa+XGk00/3HuCqrEnK3LxJW7I0SdNg6EFzKUJG73hMAdDcOUC/i/aSz7LSDwLrGr33kal/rqOGydzwl6U7zBA==} router@2.2.0: resolution: {integrity: sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==} @@ -27661,11 +27384,6 @@ 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: @@ -27680,8 +27398,8 @@ packages: vue: optional: true - run-applescript@7.1.0: - resolution: {integrity: sha512-DPe5pVFaAsinSaV6QjQ6gdiedWDcRCbUuiQfQa2wmWV7+xC9bGulGI8+TdRmoFkAPaBXk8CrAbnlY2ISniJ47Q==} + run-applescript@7.0.0: + resolution: {integrity: sha512-9by4Ij99JUr/MCFBUkDKLWK3G9HVXmabKz9U5MlIAIuvuzkiOicRYs8XJLxX+xahD+mLiiCYDqF9dKAgtzKP1A==} engines: {node: '>=18'} run-parallel@1.2.0: @@ -27717,128 +27435,6 @@ 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'} @@ -27862,6 +27458,9 @@ 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==} @@ -27891,13 +27490,13 @@ packages: engines: {node: '>=10'} hasBin: true - semver@7.8.2: - resolution: {integrity: sha512-c8jsqUZm3omBOI66G90z1Dyw5z622G8oLG+omfsHBJf3CWQTlOcwOjvOG6wtiNfW6anKm/eA39LMwMtMez2TiQ==} + semver@7.7.4: + resolution: {integrity: sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==} engines: {node: '>=10'} hasBin: true - semver@7.8.5: - resolution: {integrity: sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==} + semver@7.8.2: + resolution: {integrity: sha512-c8jsqUZm3omBOI66G90z1Dyw5z622G8oLG+omfsHBJf3CWQTlOcwOjvOG6wtiNfW6anKm/eA39LMwMtMez2TiQ==} engines: {node: '>=10'} hasBin: true @@ -27915,14 +27514,18 @@ 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'} peerDependencies: seroval: ^1.0 - seroval-plugins@1.6.7: - resolution: {integrity: sha512-4Nk35ttD3DTDJW4hgw5StsVAPeU6qnDFnULAouw6tQ7oLTV/ICXrWpsXo2EE52eSP2joUMazbVf52mFEcADqRw==} + seroval-plugins@1.6.2: + resolution: {integrity: sha512-TfxuUjlbBESzUOWdTkTKqvSmav0ABym+itetDXLK6mDz8SmrpdI30aF8RTXE8Bvq+tH/1yIDkvy3W0lfQb1ipQ==} engines: {node: '>=10'} peerDependencies: seroval: ^1.0 @@ -27931,14 +27534,17 @@ packages: resolution: {integrity: sha512-46uFvgrXTVxZcUorgSSRZ4y+ieqLLQRMlG4bnCZKW3qI6BZm7Rg4ntMW4p1mILEEBZWrFlcpp0AyIIlM6jD9iw==} engines: {node: '>=10'} - seroval@1.6.7: - resolution: {integrity: sha512-AeDcLh0yO2SFm9W71essgnSzLV9DI8ZH0x0knXn2DMnUZj728mpLbxjlbB6IqKCmqh8JA3cEqRyGoNkt584JcQ==} + seroval@1.6.2: + resolution: {integrity: sha512-mPT+SD2TrlB6wvte1KkYOYUkubaTbd6pZ/6Kk3C9nxzrHmCZyhxOO7XGAeL7f+yLKZglzGtM9odUVvg/EhO+vQ==} engines: {node: '>=10'} serve-index@1.9.1: 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'} @@ -27971,28 +27577,14 @@ packages: resolution: {integrity: sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==} engines: {node: '>=8'} + sharp@0.34.4: + resolution: {integrity: sha512-FUH39xp3SBPnxWvd5iib1X8XY7J0K0X7d93sie9CJg2PO8/7gmg89Nve6OjItK53/MlAushNNxteBYfM6DEuoA==} + engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} + sharp@0.34.5: resolution: {integrity: sha512-Ou9I5Ft9WNcCbXrU9cMgPBcCK8LiwLqcbywW3t4oDV37n1pzpuNLsYiAV8eODnjbtQlSDwZ2cUEeQz4E54Hltg==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} - sharp@0.35.4: - resolution: {integrity: sha512-n++8XWcj+jCOr2IOl7h8LbKnGBDY4aPbmprMONBNFdn0ImXqpGVv5zliDs0V9HbmbCQLpbuo2ej9rAoOQTvMDA==} - engines: {node: '>=20.9.0'} - peerDependencies: - '@types/node': '*' - peerDependenciesMeta: - '@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'} @@ -28043,9 +27635,6 @@ packages: resolution: {integrity: sha512-2wcC/oGxHis/BoHkkPwldgiPSYcpZK3JU28WoMVv55yHJgcZ8rlXvuG9iZggz+sU1d4bRgIGASwyWqjxu3FM0g==} engines: {node: '>=18'} - sisteransi@1.0.5: - resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==} - skin-tone@2.0.0: resolution: {integrity: sha512-kUMbT1oBJCpgrnKoSr0o6wPtvRWT9W9UKvGLwfJYO2WuahZRHOpEyL1ckyMGgMWh0UdpmaoFqKKD29WTomNEGA==} engines: {node: '>=8'} @@ -28054,17 +27643,20 @@ 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==} @@ -28093,10 +27685,6 @@ 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==} @@ -28112,6 +27700,10 @@ 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==} @@ -28153,13 +27745,33 @@ packages: resolution: {integrity: sha512-qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg==} engines: {node: '>= 0.6'} - srvx@1.0.5: - resolution: {integrity: sha512-KvSKRpgPG/oaq3cyT614OQ2bAa7DynuGamivCZeoZzIUULOdbQz6wUtnnVuC4+DCx2Zglzo8v5gBYmWIWYhDxA==} + srvx@0.10.0: + resolution: {integrity: sha512-NqIsR+wQCfkvvwczBh8J8uM4wTZx41K2lLSEp/3oMp917ODVVMtW5Me4epCmQ3gH8D+0b+/t4xxkUKutyhimTA==} engines: {node: '>=20.16.0'} hasBin: true - srvx@1.0.8: - resolution: {integrity: sha512-ngFS/J6St4PJfHRHGjr78xkPPtbyXtdMOLNE4x/XZunEK3OhV7aGUWMHf9WTUEy6wm1U0W4okkd82ZFFWRVQTw==} + 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==} engines: {node: '>=20.16.0'} hasBin: true @@ -28207,12 +27819,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'} @@ -28238,6 +27850,14 @@ 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==} @@ -28268,15 +27888,12 @@ 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==} - stubborn-fs@2.0.0: - resolution: {integrity: sha512-Y0AvSwDw8y+nlSNFXMm2g6L51rBGdAQT20J3YSOqxC53Lo3bjWRtr2BKcfYoAf352WYpsZSTURrA0tqhfgudPA==} - - stubborn-utils@1.0.2: - resolution: {integrity: sha512-zOh9jPYI+xrNOyisSelgym4tolKTJCQd5GBhK0+0xJvcYDcwlOoxF/rnFKQ2KRZknXSG9jWAp66fwP6AxN9STg==} - style-loader@4.0.0: resolution: {integrity: sha512-1V4WqhhZZgjVAVJyt7TdDPZoPBPNHbekX4fWnCJL1yQukhCeZhJySUL+gL9y6sNdN95uEOS83Y55SqHcP7MzLA==} engines: {node: '>= 18.12.0'} @@ -28286,19 +27903,6 @@ packages: style-to-object@1.0.8: resolution: {integrity: sha512-xT47I/Eo0rwJmaXC4oilDGDWLohVhR6o/xAQcPQN8q6QBuZVL8qMYL85kLmST5cPjAorwvqIA4qXTRQoYHaL6g==} - styled-jsx@5.1.6: - resolution: {integrity: sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA==} - engines: {node: '>= 12.0.0'} - peerDependencies: - '@babel/core': '*' - babel-plugin-macros: '*' - react: ~19.2.9 - peerDependenciesMeta: - '@babel/core': - optional: true - babel-plugin-macros: - optional: true - stylis@4.2.0: resolution: {integrity: sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==} @@ -28336,18 +27940,14 @@ packages: swr@2.3.4: resolution: {integrity: sha512-bYd2lrhc+VarcpkgWclcUi92wYCpOgMws9Sd1hG1ntAu0NEy+14CbotuFjshBU2kt9rYj9TSmDcybpxpeTU1fg==} peerDependencies: - react: ~19.2.9 + react: ^19.2.3 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'} + system-architecture@0.1.0: + resolution: {integrity: sha512-ulAk51I9UVUyJgxlv9M6lFot2WP3e7t8Kz9+IS6D4rVba1tR9kON+Ey69f+1R4Q8cd45Lod6a4IcJIxnzGc/zA==} + engines: {node: '>=18'} tagged-tag@1.0.0: resolution: {integrity: sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng==} @@ -28385,10 +27985,6 @@ packages: engines: {node: '>=18'} deprecated: Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me - tar@7.5.22: - resolution: {integrity: sha512-MFO/QzvtAOmJbkhOaCTvbGcFN9L9b+JunIsDwaKljSOdcLMea3NJ1k9Usz/rjdfSXTq4dfzfeS7W4p4YOAAHeA==} - engines: {node: '>=18'} - teex@1.0.1: resolution: {integrity: sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==} @@ -28455,10 +28051,6 @@ 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} @@ -28466,20 +28058,24 @@ packages: tinyexec@0.3.2: resolution: {integrity: sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==} - tinyexec@1.3.1: - resolution: {integrity: sha512-GCvB3aoys96IuDFBMcTB46JOR6mdMtAToqwiW8JlWhsoh1mhHi/xn9ss/Dg7N555GiJyEt2qzoG/NHCwM6h1EA==} + tinyexec@1.0.2: + resolution: {integrity: sha512-W/KYk+NFhkmsYpuHq5JykngiOCnxeVL8v8dFnqxSD8qEEdRfXk1SDM6JzNqcERbcGYj9tMrDQBYV9cjgnunFIg==} 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.2.0: - resolution: {integrity: sha512-LgO3D9yZJjApUiuUfl9iFAwrtaX4+lok3wJIqttGoKCHlWUqHqbQpnxCf82L8FjgKsh4iGo78hqJwgL8F6To2A==} + tinyrainbow@3.1.0: + resolution: {integrity: sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==} engines: {node: '>=14.0.0'} tldts-core@6.1.76: @@ -28499,6 +28095,10 @@ packages: tmp-promise@3.0.3: resolution: {integrity: sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ==} + tmp@0.2.6: + resolution: {integrity: sha512-5sJPdPjfI5Kx+qbrDesxkglRBxW//g7hCsqspEjwkewGvBMGIKMOTKzLt1hFVJzyadba3lDUN20O9qhvbQUSTA==} + engines: {node: '>=14.14'} + tmp@0.2.7: resolution: {integrity: sha512-e0votIpp4Uo2AJYSzVHV6xCcawuiez3DzqDAbrTc3YxBkplN6e+dM13ZeIcZnDg/QpSuU2zfZ3rzwY8ukEnaXw==} engines: {node: '>=14.14'} @@ -28515,9 +28115,8 @@ packages: resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==} engines: {node: '>=0.6'} - toml@4.3.0: - resolution: {integrity: sha512-lVb8X9BsPVuH0M4BKeS91tXAmJvCjQ5UIyAbQFaxkKGyUFK2RPkhwaFSQH8vbpl1d23eu/IBH+dwVMHWaq9A5A==} - engines: {node: '>=20'} + toml@3.0.0: + resolution: {integrity: sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==} tomlify-j0.4@3.0.0: resolution: {integrity: sha512-2Ulkc8T7mXJ2l0W476YC/A209PR38Nw8PuaCNtk9uI3t1zzFdGQeWYGQvmj2PZkVvRC/Yoi4xQKMRnWc/N29tQ==} @@ -28613,8 +28212,8 @@ packages: resolution: {integrity: sha512-axr3IdNuVIxnaK5XGEUFTu3YmAQ6lllgrvqfEoR16g/HGnYY/6We4oWENtAnzK6/LpJ2ur9PAb80RBt7/U4ugw==} engines: {node: '>= 6.0.0'} - turbo-stream@3.2.1: - resolution: {integrity: sha512-BaX0eWz3IrypOVDFqPv3VGD6uZZW8y3oFAOJqZQ+oopmOyQ8/xNm7IMwAJFvxax2DBa8zSk+/AeqA6D6b1PXGg==} + turbo-stream@3.2.0: + resolution: {integrity: sha512-EK+bZ9UVrVh7JLslVFOV0GEMsociOqVOvEMTAd4ixMyffN5YNIEdLZWXUx5PJqDbTxSIBWw04HS9gCY4frYQDQ==} type-check@0.4.0: resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} @@ -28632,8 +28231,8 @@ packages: resolution: {integrity: sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==} engines: {node: '>=16'} - type-fest@5.9.0: - resolution: {integrity: sha512-yANm3Jr3GiJ1qgJlxGAVxTOIcEOk1rhQHamlXtnrCK7EHP4HeM9OGxtMg/W7HFdrVzw/ZWJKGVIJusVH85sLtw==} + type-fest@5.4.1: + resolution: {integrity: sha512-xygQcmneDyzsEuKZrFbRMne5HDqMs++aFzefrJTgEIKjQ3rekM+RPfFCVq2Gp1VIDqddoYeppCj4Pcb+RZW0GQ==} engines: {node: '>=20'} type-is@1.6.18: @@ -28719,9 +28318,15 @@ 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==} @@ -28740,14 +28345,6 @@ 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==} @@ -28763,6 +28360,18 @@ 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'} @@ -28779,6 +28388,14 @@ 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==} @@ -28786,25 +28403,22 @@ packages: resolution: {integrity: sha512-5uKD0nqiYVzlmCRs01Fhs2BdkEgBS3SAVP6ndrBsuK42iC2+JHyxM05Rm9G8+5mkmRtzMZGY8Ct5+mliZxU/Ww==} engines: {node: '>=18.12.0'} - unplugin@3.7.0: - resolution: {integrity: sha512-GrM2uq3DQo3hvLU2FjeYhooJ8BY9N6j1Fbzgx7Pta3VVJevsD3VP4dPjZkZOS0mLvN8w9zzr9OlP+31bSMyuLw==} + unplugin@3.3.0: + resolution: {integrity: sha512-qa66K+crbfyE6JK10GjvbJeRrOsuC/JpbnHctfyp/i4oBTxWOzJfRZyDiOk1PtErMFRu8JhsU/wPvOdBNWe5Rg==} 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.3.4 + vite: ^8.0.14 webpack: '*' peerDependenciesMeta: '@farmfe/core': optional: true - '@rsbuild/core': - optional: true '@rspack/core': optional: true bun-types-no-globals: @@ -28825,6 +28439,68 @@ packages: unrs-resolver@1.11.1: resolution: {integrity: sha512-bSjt9pjaEBnNiGgc9rUiHGKv5l4/TGzDmYw3RhnkJGtLhbnnA/5qJj7x3dNDCRx/PJxu774LlH8lCOlB4hEfKg==} + unstorage@1.17.4: + resolution: {integrity: sha512-fHK0yNg38tBiJKp/Vgsq4j0JEsCmgqH58HAn707S7zGkArbZsVr/CwINoi+nh3h98BRCwKvx1K3Xg9u3VV83sw==} + peerDependencies: + '@azure/app-configuration': ^1.8.0 + '@azure/cosmos': ^4.2.0 + '@azure/data-tables': ^13.3.0 + '@azure/identity': ^4.6.0 + '@azure/keyvault-secrets': ^4.9.0 + '@azure/storage-blob': ^12.26.0 + '@capacitor/preferences': ^6 || ^7 || ^8 + '@deno/kv': '>=0.9.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.34.3 + '@vercel/blob': '>=0.27.1' + '@vercel/functions': ^2.2.12 || ^3.0.0 + '@vercel/kv': ^1 || ^2 || ^3 + aws4fetch: ^1.0.20 + db0: '>=0.2.1' + idb-keyval: ^6.2.1 + ioredis: ^5.4.2 + uploadthing: ^7.4.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 + db0: + optional: true + idb-keyval: + optional: true + ioredis: + optional: true + uploadthing: + optional: true + unstorage@1.17.5: resolution: {integrity: sha512-0i3iqvRfx29hkNntHyQvJTpf5W9dQ9ZadSoRU8+xVlhVtT7jAX57fazYO9EHvcRCfBCyi5YRya7XCDOsbTgkPg==} peerDependencies: @@ -28887,16 +28563,169 @@ packages: uploadthing: optional: true - unstorage@2.0.0-alpha.10: - resolution: {integrity: sha512-6h1veZp8gnp4dGllf0tDijoXxDYymJu251IpKKkrSVH+QHL6tXFbwG85KM+CBHSgpkkgtPuIiZ9oLCLP5+1Evw==} + 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 - until-async@3.0.2: - resolution: {integrity: sha512-IiSk4HlzAMqTUseHHe3VhIGyuFmN90zMTpD3Z3y8jeQbzLIq500MVM7Jq2vUAnTKAFPJrqwkzr6PoTcPhGcOiw==} + 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 + + untun@0.1.3: + resolution: {integrity: sha512-4luGP9LMYszMRZwsvyUd9MrxgEGZdZuZgpVQHEEX0lCYFESasVRvZd0EYpCkOIbJKHMuv0LskpXc/8Un+MJzEQ==} + hasBin: true untun@0.2.2: 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 @@ -28909,6 +28738,9 @@ packages: peerDependencies: browserslist: '>= 4.21.0' + uqr@0.1.2: + resolution: {integrity: sha512-MJu7ypHq6QasgF5YRTjqscSzQp/W11zoUk6kvmlH+fmWEs63Y0Eib13hYFwAzagRJcVY8WVnlV+eBDUGMJ5IbA==} + uqr@0.1.3: resolution: {integrity: sha512-0rjE8iEJe4YmT9TOhwsZtqCMRLc5DXZUI2UEYUUg63ikBkqqE5EYWaI0etFe/5KUcmcYwLih2RND1kq+hrUJXA==} @@ -28929,7 +28761,7 @@ packages: engines: {node: '>=10'} peerDependencies: '@types/react': ^19.2.8 - react: ~19.2.9 + react: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -28939,7 +28771,7 @@ packages: engines: {node: '>=10'} peerDependencies: '@types/react': ^19.2.8 - react: ~19.2.9 + react: ^19.2.3 peerDependenciesMeta: '@types/react': optional: true @@ -28947,7 +28779,7 @@ packages: use-sync-external-store@1.6.0: resolution: {integrity: sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==} peerDependencies: - react: ~19.2.9 + react: ^19.2.3 util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} @@ -28967,6 +28799,10 @@ 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). @@ -28995,9 +28831,6 @@ 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'} @@ -29007,7 +28840,7 @@ packages: engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: typescript: '*' - vite: ^8.3.4 + vite: ^8.0.14 peerDependenciesMeta: vite: optional: true @@ -29015,14 +28848,14 @@ packages: vite-plugin-externalize-deps@0.10.0: resolution: {integrity: sha512-eQrtpT/Do7AvDn76l1yL6ZHyXJ+UWH2LaHVqhAes9go54qaAnPZuMbgxcroQ/7WY3ZyetZzYW2quQnDF0DV5qg==} peerDependencies: - vite: ^8.3.4 + vite: ^8.0.14 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.3.4 + vite: ^8.0.14 peerDependenciesMeta: '@testing-library/jest-dom': optional: true @@ -29032,7 +28865,7 @@ packages: peerDependencies: '@testing-library/jest-dom': ^5.16.6 || ^5.17.0 || ^6.* solid-js: 1.9.12 - vite: ^8.3.4 + vite: ^8.0.14 peerDependenciesMeta: '@testing-library/jest-dom': optional: true @@ -29040,15 +28873,15 @@ packages: vite-tsconfig-paths@6.1.1: resolution: {integrity: sha512-2cihq7zliibCCZ8P9cKJrQBkfgdvcFkOOc3Y02o3GWUDLgqjWsZudaoiuOwO/gzTzy17cS5F7ZPo4bsnS4DGkg==} peerDependencies: - vite: ^8.3.4 + vite: ^8.0.14 - vite@8.3.4: - resolution: {integrity: sha512-IftLE8phJhdNRIGNEV4JCCvfNScoZQVfcXaN8TQropWGJtOHcu+iAB9pHcuGvmEb/kddw0LBe/jS8ztdC6xdiQ==} + vite@8.0.14: + resolution: {integrity: sha512-s4BJJ+5y1pYL6Otw51FHhVJQhPnuRinKig64g/1+EUNaJsd3gCKdD31IPFvswUgW9/60QT9oFHbZHbQK5imcxw==} engines: {node: ^20.19.0 || >=22.12.0} hasBin: true peerDependencies: '@types/node': 25.0.9 - '@vitejs/devtools': ^0.7.1 + '@vitejs/devtools': ^0.1.18 esbuild: ^0.27.0 || ^0.28.0 jiti: '>=1.21.0' less: ^4.0.0 @@ -29088,7 +28921,7 @@ packages: vitefu@1.1.1: resolution: {integrity: sha512-B/Fegf3i8zh0yFbpzZ21amWzHmuNlLlmJT6n7bu5e+pCHUKQIfXSYokrqOBGEMMe9UG2sostKQF9mml/vYaWJQ==} peerDependencies: - vite: ^8.3.4 + vite: ^8.0.14 peerDependenciesMeta: vite: optional: true @@ -29096,7 +28929,7 @@ packages: vitefu@1.1.3: resolution: {integrity: sha512-ub4okH7Z5KLjb6hDyjqrGXqWtWvoYdU3IGm/NorpgHncKoLTCfRIbvlhBm7r0YstIaQRYlp4yEbFqDcKSzXSSg==} peerDependencies: - vite: ^8.3.4 + vite: ^8.0.14 peerDependenciesMeta: vite: optional: true @@ -29117,48 +28950,7 @@ packages: '@vitest/ui': 4.1.4 happy-dom: '*' jsdom: '*' - 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 + vite: ^8.0.14 peerDependenciesMeta: '@edge-runtime/vm': optional: true @@ -29388,9 +29180,6 @@ packages: whatwg-url@5.0.0: resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==} - when-exit@2.1.5: - resolution: {integrity: sha512-VGkKJ564kzt6Ms1dbgPP/yuIoQCrsFAnRbptpC5wOEsDaNsbCB2bnfnaA8i/vRs5tjUSEOtIuvl9/MyVsvQZCg==} - which-boxed-primitive@1.1.1: resolution: {integrity: sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==} engines: {node: '>= 0.4'} @@ -29408,21 +29197,11 @@ packages: engines: {node: '>= 8'} hasBin: true - which@3.0.1: - resolution: {integrity: sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - hasBin: true - why-is-node-running@2.3.0: resolution: {integrity: sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==} 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==} @@ -29443,11 +29222,6 @@ 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'} @@ -29470,9 +29244,17 @@ 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'} @@ -29497,17 +29279,9 @@ packages: utf-8-validate: optional: true - 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 + wsl-utils@0.3.1: + resolution: {integrity: sha512-g/eziiSUNBSsdDJtCLB8bdYEUMj4jR7AGeUo96p/3dTafgjHhpF4RiCFPiRILwjQoDXx5MqkBr4fwWtR3Ky4Wg==} + engines: {node: '>=20'} xml-name-validator@4.0.0: resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==} @@ -29560,6 +29334,10 @@ 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'} @@ -29568,9 +29346,12 @@ packages: resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==} engines: {node: '>=12'} - yauzl@3.4.0: - resolution: {integrity: sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==} - engines: {node: '>=12'} + yargs@18.1.0: + resolution: {integrity: sha512-2rAgRKu54VsHkqI0/tYkmluGXHD4KW7yZoycuqDQ15QOTnc2VVfy0nN/1eMhnQLO00A+dwtK20xuCnc1YGeUyg==} + engines: {node: ^20.19.0 || ^22.12.0 || >=23} + + yauzl@2.10.0: + resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==} yocto-queue@0.1.0: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} @@ -29590,12 +29371,15 @@ 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@7.0.5: - resolution: {integrity: sha512-dSvYKdvLsAHCDqPOhIwk/q5CvuWtTB3Dgpoe0uVEFjTzIOAmsQpprX25InCvrvJsirEbu1OHyy67n/kAj1Sw/w==} - engines: {node: '>=18'} + zip-stream@6.0.1: + resolution: {integrity: sha512-zK7YHHz4ZXpW89AHXUPbQVGKI7uvkd3hzusTdotCg1UxyaVtg0zFJSTfW/Dq5f7OBBVnq6cZIaC8Ti4hb6dtCA==} + engines: {node: '>= 14'} zod@3.25.57: resolution: {integrity: sha512-6tgzLuwVST5oLUxXTmBqoinKMd3JeesgbgseXeFasKKj8Q1FCZrHnbqJOyiEvr4cVAlbug+CgIsmJ8cl/pU5FA==} @@ -29609,16 +29393,13 @@ 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.9 + react: ^19.2.3 use-sync-external-store: '>=1.2.0' peerDependenciesMeta: '@types/react': @@ -29655,7 +29436,7 @@ snapshots: cjs-module-lexer: 1.4.3 fflate: 0.8.3 lru-cache: 11.5.1 - semver: 7.8.5 + semver: 7.8.2 typescript: 5.6.1-rc validate-npm-package-name: 5.0.1 @@ -30081,6 +29862,16 @@ snapshots: 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) @@ -30193,12 +29984,17 @@ snapshots: transitivePeerDependencies: - supports-color + '@babel/types@7.28.4': + dependencies: + '@babel/helper-string-parser': 7.29.7 + '@babel/helper-validator-identifier': 7.29.7 + '@babel/types@7.29.8': dependencies: '@babel/helper-string-parser': 7.29.7 '@babel/helper-validator-identifier': 7.29.7 - '@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/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.6(zod@4.5.4))(jose@6.1.3)(kysely@0.29.2)(nanostores@1.3.0)': dependencies: '@better-auth/utils': 0.4.2 '@better-fetch/fetch': 1.3.1 @@ -30209,42 +30005,40 @@ snapshots: kysely: 0.29.2 nanostores: 1.3.0 zod: 4.5.4 - optionalDependencies: - '@opentelemetry/api': 1.9.1 - '@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/drizzle-adapter@1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.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)': 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/core': 1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.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/kysely-adapter@1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.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)': 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/core': 1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.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: 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/memory-adapter@1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.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)': 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/core': 1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.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/mongo-adapter@1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.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)': 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/core': 1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.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.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/prisma-adapter@1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.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))': 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/core': 1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.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.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) + '@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/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/telemetry@1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.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: - '@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/core': 1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.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 @@ -30260,8 +30054,6 @@ snapshots: dependencies: css-tree: 3.2.1 - '@bufbuild/protobuf@2.16.0': {} - '@bundled-es-modules/cookie@2.0.1': dependencies: cookie: 0.7.2 @@ -30289,7 +30081,7 @@ snapshots: outdent: 0.5.0 prettier: 2.8.8 resolve-from: 5.0.0 - semver: 7.8.5 + semver: 7.8.2 '@changesets/assemble-release-plan@6.0.9': dependencies: @@ -30298,7 +30090,7 @@ snapshots: '@changesets/should-skip-package': 0.1.2 '@changesets/types': 6.1.0 '@manypkg/get-packages': 1.1.3 - semver: 7.8.5 + semver: 7.8.2 '@changesets/changelog-git@0.2.1': dependencies: @@ -30363,7 +30155,7 @@ snapshots: '@changesets/types': 6.1.0 '@manypkg/get-packages': 1.1.3 picocolors: 1.1.1 - semver: 7.8.5 + semver: 7.8.2 '@changesets/get-github-info@0.8.0': dependencies: @@ -30448,21 +30240,9 @@ snapshots: '@chevrotain/utils@10.5.0': {} - '@clack/core@1.4.3': + '@clerk/backend@2.18.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': dependencies: - fast-wrap-ansi: 0.2.0 - sisteransi: 1.0.5 - - '@clack/prompts@1.7.0': - dependencies: - '@clack/core': 1.4.3 - fast-string-width: 3.0.2 - fast-wrap-ansi: 0.2.0 - sisteransi: 1.0.5 - - '@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.9(react@19.2.9))(react@19.2.9) + '@clerk/shared': 3.28.2(react-dom@19.2.3(react@19.2.3))(react@19.2.3) '@clerk/types': 4.95.0 cookie: 1.0.2 standardwebhooks: 1.0.0 @@ -30471,82 +30251,82 @@ snapshots: - react - react-dom - '@clerk/backend@2.29.2(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': + '@clerk/backend@2.29.2(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': dependencies: - '@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) + '@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) standardwebhooks: 1.0.0 tslib: 2.8.1 transitivePeerDependencies: - react - react-dom - '@clerk/clerk-react@5.53.2(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': + '@clerk/clerk-react@5.53.2(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': dependencies: - '@clerk/shared': 3.28.2(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + '@clerk/shared': 3.28.2(react-dom@19.2.3(react@19.2.3))(react@19.2.3) '@clerk/types': 4.95.0 - react: 19.2.9 - react-dom: 19.2.9(react@19.2.9) + react: 19.2.3 + react-dom: 19.2.3(react@19.2.3) tslib: 2.8.1 - '@clerk/clerk-react@5.59.3(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': + '@clerk/clerk-react@5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': dependencies: - '@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) + '@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) tslib: 2.8.1 - '@clerk/shared@3.28.2(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': + '@clerk/shared@3.28.2(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': 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.9) + swr: 2.3.4(react@19.2.3) optionalDependencies: - react: 19.2.9 - react-dom: 19.2.9(react@19.2.9) + 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)': + '@clerk/shared@3.42.0(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': 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.9) + swr: 2.3.4(react@19.2.3) optionalDependencies: - react: 19.2.9 - react-dom: 19.2.9(react@19.2.9) + react: 19.2.3 + react-dom: 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)': + '@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)': dependencies: - '@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/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/types': 4.95.0 '@tanstack/react-router': link:packages/react-router '@tanstack/react-start': link:packages/react-start - react: 19.2.9 - react-dom: 19.2.9(react@19.2.9) + react: 19.2.3 + react-dom: 19.2.3(react@19.2.3) 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.9(react@19.2.9))(react@19.2.9)': + '@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)': dependencies: - '@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) + '@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) '@tanstack/react-router': link:packages/react-router '@tanstack/react-start': link:packages/react-start - react: 19.2.9 - react-dom: 19.2.9(react@19.2.9) + react: 19.2.3 + react-dom: 19.2.3(react@19.2.3) tslib: 2.8.1 - '@clerk/types@4.101.10(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': + '@clerk/types@4.101.10(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': dependencies: - '@clerk/shared': 3.42.0(react-dom@19.2.9(react@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) transitivePeerDependencies: - react - react-dom @@ -30555,62 +30335,20 @@ 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/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)': + '@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)': 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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@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) + vite: 8.0.14(@types/node@25.0.9)(esbuild@0.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(tsx@4.20.3)(yaml@2.9.0) wrangler: 4.75.0 ws: 8.18.0 transitivePeerDependencies: @@ -30621,49 +30359,35 @@ 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 - '@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)': + '@codspeed/core@5.5.0(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@10.2.2))(supports-color@10.2.2) - form-data: 4.0.6 + axios: 1.17.0(debug@4.4.3(supports-color@10.2.2))(supports-color@10.2.2) + find-up: 6.3.0 + form-data: 4.0.5 node-gyp-build: 4.8.4 stack-trace: 1.0.0-pre2 transitivePeerDependencies: - debug - supports-color - '@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)': + '@codspeed/vitest-plugin@5.5.0(debug@4.4.3(supports-color@10.2.2))(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)': dependencies: - '@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)) + '@codspeed/core': 5.5.0(debug@4.4.3(supports-color@10.2.2))(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(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.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)) transitivePeerDependencies: - debug - supports-color @@ -30673,15 +30397,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.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)': + '@convex-dev/better-auth@0.9.7(@standard-schema/spec@1.1.0)(@typescript/typescript6@6.0.2)(better-auth@1.6.19(@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)(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)': 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.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)) + better-auth: 1.6.19(@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)(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)) common-tags: 1.8.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) - 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) + 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) jose: 6.1.0 - react: 19.2.9 - react-dom: 19.2.9(react@19.2.9) + react: 19.2.3 + react-dom: 19.2.3(react@19.2.3) remeda: 2.32.0 semver: 7.7.3 type-fest: 4.41.0 @@ -30691,10 +30415,10 @@ snapshots: - hono - typescript - '@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))': + '@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))': dependencies: - '@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': 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) '@cspotcode/source-map-support@0.8.1': dependencies: @@ -30779,23 +30503,34 @@ snapshots: dependencies: '@electric-sql/pglite': 0.3.2 - '@electric-sql/pglite@0.3.16': {} - '@electric-sql/pglite@0.3.2': {} - '@emnapi/core@1.11.3': + '@emnapi/core@1.10.0': dependencies: - '@emnapi/wasi-threads': 1.2.3 + '@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.4.5': dependencies: '@emnapi/wasi-threads': 1.0.4 tslib: 2.8.1 - '@emnapi/runtime@1.11.3': + '@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.4.5': dependencies: @@ -30805,9 +30540,15 @@ snapshots: dependencies: tslib: 2.8.1 - '@emnapi/wasi-threads@1.2.3': + '@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 '@emotion/babel-plugin@11.13.5(supports-color@10.2.2)': dependencies: @@ -30841,17 +30582,17 @@ snapshots: '@emotion/memoize@0.9.0': {} - '@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.9)(supports-color@10.2.2)': + '@emotion/react@11.14.0(@types/react@19.2.9)(react@19.2.3)(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.9) + '@emotion/use-insertion-effect-with-fallbacks': 1.2.0(react@19.2.3) '@emotion/utils': 1.4.2 '@emotion/weak-memoize': 0.4.0 hoist-non-react-statics: 3.3.2 - react: 19.2.9 + react: 19.2.3 optionalDependencies: '@types/react': 19.2.9 transitivePeerDependencies: @@ -30867,16 +30608,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.9)(supports-color@10.2.2))(@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.3)(supports-color@10.2.2))(@types/react@19.2.9)(react@19.2.3)(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.9)(supports-color@10.2.2) + '@emotion/react': 11.14.0(@types/react@19.2.9)(react@19.2.3)(supports-color@10.2.2) '@emotion/serialize': 1.3.3 - '@emotion/use-insertion-effect-with-fallbacks': 1.2.0(react@19.2.9) + '@emotion/use-insertion-effect-with-fallbacks': 1.2.0(react@19.2.3) '@emotion/utils': 1.4.2 - react: 19.2.9 + react: 19.2.3 optionalDependencies: '@types/react': 19.2.9 transitivePeerDependencies: @@ -30884,9 +30625,9 @@ snapshots: '@emotion/unitless@0.10.0': {} - '@emotion/use-insertion-effect-with-fallbacks@1.2.0(react@19.2.9)': + '@emotion/use-insertion-effect-with-fallbacks@1.2.0(react@19.2.3)': dependencies: - react: 19.2.9 + react: 19.2.3 '@emotion/utils@1.4.2': {} @@ -30914,7 +30655,7 @@ snapshots: '@esbuild/aix-ppc64@0.27.4': optional: true - '@esbuild/aix-ppc64@0.28.1': + '@esbuild/aix-ppc64@0.28.2': optional: true '@esbuild/android-arm64@0.23.0': @@ -30932,7 +30673,7 @@ snapshots: '@esbuild/android-arm64@0.27.4': optional: true - '@esbuild/android-arm64@0.28.1': + '@esbuild/android-arm64@0.28.2': optional: true '@esbuild/android-arm@0.23.0': @@ -30950,7 +30691,7 @@ snapshots: '@esbuild/android-arm@0.27.4': optional: true - '@esbuild/android-arm@0.28.1': + '@esbuild/android-arm@0.28.2': optional: true '@esbuild/android-x64@0.23.0': @@ -30968,7 +30709,7 @@ snapshots: '@esbuild/android-x64@0.27.4': optional: true - '@esbuild/android-x64@0.28.1': + '@esbuild/android-x64@0.28.2': optional: true '@esbuild/darwin-arm64@0.23.0': @@ -30986,7 +30727,7 @@ snapshots: '@esbuild/darwin-arm64@0.27.4': optional: true - '@esbuild/darwin-arm64@0.28.1': + '@esbuild/darwin-arm64@0.28.2': optional: true '@esbuild/darwin-x64@0.23.0': @@ -31004,7 +30745,7 @@ snapshots: '@esbuild/darwin-x64@0.27.4': optional: true - '@esbuild/darwin-x64@0.28.1': + '@esbuild/darwin-x64@0.28.2': optional: true '@esbuild/freebsd-arm64@0.23.0': @@ -31022,7 +30763,7 @@ snapshots: '@esbuild/freebsd-arm64@0.27.4': optional: true - '@esbuild/freebsd-arm64@0.28.1': + '@esbuild/freebsd-arm64@0.28.2': optional: true '@esbuild/freebsd-x64@0.23.0': @@ -31040,7 +30781,7 @@ snapshots: '@esbuild/freebsd-x64@0.27.4': optional: true - '@esbuild/freebsd-x64@0.28.1': + '@esbuild/freebsd-x64@0.28.2': optional: true '@esbuild/linux-arm64@0.23.0': @@ -31058,7 +30799,7 @@ snapshots: '@esbuild/linux-arm64@0.27.4': optional: true - '@esbuild/linux-arm64@0.28.1': + '@esbuild/linux-arm64@0.28.2': optional: true '@esbuild/linux-arm@0.23.0': @@ -31076,7 +30817,7 @@ snapshots: '@esbuild/linux-arm@0.27.4': optional: true - '@esbuild/linux-arm@0.28.1': + '@esbuild/linux-arm@0.28.2': optional: true '@esbuild/linux-ia32@0.23.0': @@ -31094,7 +30835,7 @@ snapshots: '@esbuild/linux-ia32@0.27.4': optional: true - '@esbuild/linux-ia32@0.28.1': + '@esbuild/linux-ia32@0.28.2': optional: true '@esbuild/linux-loong64@0.23.0': @@ -31112,7 +30853,7 @@ snapshots: '@esbuild/linux-loong64@0.27.4': optional: true - '@esbuild/linux-loong64@0.28.1': + '@esbuild/linux-loong64@0.28.2': optional: true '@esbuild/linux-mips64el@0.23.0': @@ -31130,7 +30871,7 @@ snapshots: '@esbuild/linux-mips64el@0.27.4': optional: true - '@esbuild/linux-mips64el@0.28.1': + '@esbuild/linux-mips64el@0.28.2': optional: true '@esbuild/linux-ppc64@0.23.0': @@ -31148,7 +30889,7 @@ snapshots: '@esbuild/linux-ppc64@0.27.4': optional: true - '@esbuild/linux-ppc64@0.28.1': + '@esbuild/linux-ppc64@0.28.2': optional: true '@esbuild/linux-riscv64@0.23.0': @@ -31166,7 +30907,7 @@ snapshots: '@esbuild/linux-riscv64@0.27.4': optional: true - '@esbuild/linux-riscv64@0.28.1': + '@esbuild/linux-riscv64@0.28.2': optional: true '@esbuild/linux-s390x@0.23.0': @@ -31184,7 +30925,7 @@ snapshots: '@esbuild/linux-s390x@0.27.4': optional: true - '@esbuild/linux-s390x@0.28.1': + '@esbuild/linux-s390x@0.28.2': optional: true '@esbuild/linux-x64@0.23.0': @@ -31202,7 +30943,7 @@ snapshots: '@esbuild/linux-x64@0.27.4': optional: true - '@esbuild/linux-x64@0.28.1': + '@esbuild/linux-x64@0.28.2': optional: true '@esbuild/netbsd-arm64@0.25.10': @@ -31217,7 +30958,7 @@ snapshots: '@esbuild/netbsd-arm64@0.27.4': optional: true - '@esbuild/netbsd-arm64@0.28.1': + '@esbuild/netbsd-arm64@0.28.2': optional: true '@esbuild/netbsd-x64@0.23.0': @@ -31235,7 +30976,7 @@ snapshots: '@esbuild/netbsd-x64@0.27.4': optional: true - '@esbuild/netbsd-x64@0.28.1': + '@esbuild/netbsd-x64@0.28.2': optional: true '@esbuild/openbsd-arm64@0.23.0': @@ -31253,7 +30994,7 @@ snapshots: '@esbuild/openbsd-arm64@0.27.4': optional: true - '@esbuild/openbsd-arm64@0.28.1': + '@esbuild/openbsd-arm64@0.28.2': optional: true '@esbuild/openbsd-x64@0.23.0': @@ -31271,7 +31012,7 @@ snapshots: '@esbuild/openbsd-x64@0.27.4': optional: true - '@esbuild/openbsd-x64@0.28.1': + '@esbuild/openbsd-x64@0.28.2': optional: true '@esbuild/openharmony-arm64@0.25.10': @@ -31283,7 +31024,7 @@ snapshots: '@esbuild/openharmony-arm64@0.27.4': optional: true - '@esbuild/openharmony-arm64@0.28.1': + '@esbuild/openharmony-arm64@0.28.2': optional: true '@esbuild/sunos-x64@0.23.0': @@ -31301,7 +31042,7 @@ snapshots: '@esbuild/sunos-x64@0.27.4': optional: true - '@esbuild/sunos-x64@0.28.1': + '@esbuild/sunos-x64@0.28.2': optional: true '@esbuild/win32-arm64@0.23.0': @@ -31319,7 +31060,7 @@ snapshots: '@esbuild/win32-arm64@0.27.4': optional: true - '@esbuild/win32-arm64@0.28.1': + '@esbuild/win32-arm64@0.28.2': optional: true '@esbuild/win32-ia32@0.23.0': @@ -31337,7 +31078,7 @@ snapshots: '@esbuild/win32-ia32@0.27.4': optional: true - '@esbuild/win32-ia32@0.28.1': + '@esbuild/win32-ia32@0.28.2': optional: true '@esbuild/win32-x64@0.23.0': @@ -31355,7 +31096,7 @@ snapshots: '@esbuild/win32-x64@0.27.4': optional: true - '@esbuild/win32-x64@0.28.1': + '@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))': @@ -31522,7 +31263,7 @@ snapshots: '@fastify/ajv-compiler@4.0.5': dependencies: ajv: 8.17.1 - ajv-formats: 3.0.1 + ajv-formats: 3.0.1(ajv@8.17.1) fast-uri: 3.0.6 '@fastify/busboy@3.1.1': {} @@ -31871,11 +31612,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.9(react@19.2.9))(react@19.2.9)': + '@floating-ui/react-dom@2.1.2(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': dependencies: '@floating-ui/dom': 1.6.13 - react: 19.2.9 - react-dom: 19.2.9(react@19.2.9) + react: 19.2.3 + react-dom: 19.2.3(react@19.2.3) '@floating-ui/utils@0.2.9': {} @@ -31897,11 +31638,6 @@ 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': @@ -31917,21 +31653,23 @@ snapshots: '@humanwhocodes/retry@0.4.2': {} - '@img/colour@1.1.0': {} + '@iarna/toml@2.2.5': {} + + '@img/colour@1.0.0': {} + + '@img/sharp-darwin-arm64@0.34.4': + optionalDependencies: + '@img/sharp-libvips-darwin-arm64': 1.2.3 + optional: true '@img/sharp-darwin-arm64@0.34.5': optionalDependencies: '@img/sharp-libvips-darwin-arm64': 1.2.4 optional: true - '@img/sharp-darwin-arm64@0.35.4': + '@img/sharp-darwin-x64@0.34.4': optionalDependencies: - '@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 + '@img/sharp-libvips-darwin-x64': 1.2.3 optional: true '@img/sharp-darwin-x64@0.34.5': @@ -31939,114 +31677,66 @@ snapshots: '@img/sharp-libvips-darwin-x64': 1.2.4 optional: true - '@img/sharp-darwin-x64@0.35.4': - optionalDependencies: - '@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 + '@img/sharp-libvips-darwin-arm64@1.2.3': 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': + '@img/sharp-libvips-darwin-x64@1.2.3': 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': + '@img/sharp-libvips-linux-arm64@1.2.3': 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': + '@img/sharp-libvips-linux-arm@1.2.3': 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': + '@img/sharp-libvips-linux-ppc64@1.2.3': 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': + '@img/sharp-libvips-linux-s390x@1.2.3': 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': + '@img/sharp-libvips-linux-x64@1.2.3': 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': + '@img/sharp-libvips-linuxmusl-arm64@1.2.3': 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': + '@img/sharp-libvips-linuxmusl-x64@1.2.3': 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': + '@img/sharp-linux-arm64@0.34.4': + optionalDependencies: + '@img/sharp-libvips-linux-arm64': 1.2.3 optional: true '@img/sharp-linux-arm64@0.34.5': @@ -32054,14 +31744,9 @@ snapshots: '@img/sharp-libvips-linux-arm64': 1.2.4 optional: true - '@img/sharp-linux-arm64@0.35.4': + '@img/sharp-linux-arm@0.34.4': optionalDependencies: - '@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 + '@img/sharp-libvips-linux-arm': 1.2.3 optional: true '@img/sharp-linux-arm@0.34.5': @@ -32069,14 +31754,9 @@ snapshots: '@img/sharp-libvips-linux-arm': 1.2.4 optional: true - '@img/sharp-linux-arm@0.35.4': + '@img/sharp-linux-ppc64@0.34.4': optionalDependencies: - '@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 + '@img/sharp-libvips-linux-ppc64': 1.2.3 optional: true '@img/sharp-linux-ppc64@0.34.5': @@ -32084,29 +31764,14 @@ snapshots: '@img/sharp-libvips-linux-ppc64': 1.2.4 optional: true - '@img/sharp-linux-ppc64@0.35.4': - optionalDependencies: - '@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 optional: true - '@img/sharp-linux-riscv64@0.35.4': + '@img/sharp-linux-s390x@0.34.4': optionalDependencies: - '@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 + '@img/sharp-libvips-linux-s390x': 1.2.3 optional: true '@img/sharp-linux-s390x@0.34.5': @@ -32114,14 +31779,9 @@ snapshots: '@img/sharp-libvips-linux-s390x': 1.2.4 optional: true - '@img/sharp-linux-s390x@0.35.4': + '@img/sharp-linux-x64@0.34.4': optionalDependencies: - '@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 + '@img/sharp-libvips-linux-x64': 1.2.3 optional: true '@img/sharp-linux-x64@0.34.5': @@ -32129,14 +31789,9 @@ snapshots: '@img/sharp-libvips-linux-x64': 1.2.4 optional: true - '@img/sharp-linux-x64@0.35.4': + '@img/sharp-linuxmusl-arm64@0.34.4': optionalDependencies: - '@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 + '@img/sharp-libvips-linuxmusl-arm64': 1.2.3 optional: true '@img/sharp-linuxmusl-arm64@0.34.5': @@ -32144,14 +31799,9 @@ snapshots: '@img/sharp-libvips-linuxmusl-arm64': 1.2.4 optional: true - '@img/sharp-linuxmusl-arm64@0.35.4': + '@img/sharp-linuxmusl-x64@0.34.4': optionalDependencies: - '@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 + '@img/sharp-libvips-linuxmusl-x64': 1.2.3 optional: true '@img/sharp-linuxmusl-x64@0.34.5': @@ -32159,68 +31809,34 @@ snapshots: '@img/sharp-libvips-linuxmusl-x64': 1.2.4 optional: true - '@img/sharp-linuxmusl-x64@0.35.4': - optionalDependencies: - '@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 + '@img/sharp-wasm32@0.34.4': + dependencies: + '@emnapi/runtime': 1.11.1 optional: true '@img/sharp-wasm32@0.34.5': dependencies: - '@emnapi/runtime': 1.11.3 + '@emnapi/runtime': 1.11.1 optional: true - '@img/sharp-wasm32@0.35.4': - dependencies: - '@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 + '@img/sharp-win32-arm64@0.34.4': 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': + '@img/sharp-win32-ia32@0.34.4': 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': + '@img/sharp-win32-x64@0.34.4': 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)': @@ -32249,21 +31865,12 @@ snapshots: transitivePeerDependencies: - babel-plugin-macros - '@inquirer/ansi@2.0.8': {} - '@inquirer/confirm@5.1.4(@types/node@25.0.9)': dependencies: '@inquirer/core': 10.1.5(@types/node@25.0.9) '@inquirer/type': 3.0.4(@types/node@25.0.9) '@types/node': 25.0.9 - '@inquirer/confirm@6.3.2(@types/node@25.0.9)': - dependencies: - '@inquirer/core': 12.0.3(@types/node@25.0.9) - '@inquirer/type': 4.1.1(@types/node@25.0.9) - optionalDependencies: - '@types/node': 25.0.9 - '@inquirer/core@10.1.5(@types/node@25.0.9)': dependencies: '@inquirer/figures': 1.0.10 @@ -32277,18 +31884,6 @@ snapshots: transitivePeerDependencies: - '@types/node' - '@inquirer/core@12.0.3(@types/node@25.0.9)': - dependencies: - '@inquirer/ansi': 2.0.8 - '@inquirer/figures': 2.0.9 - '@inquirer/type': 4.1.1(@types/node@25.0.9) - cli-width: 4.1.0 - fast-wrap-ansi: 0.2.0 - mute-stream: 3.0.0 - signal-exit: 4.1.0 - optionalDependencies: - '@types/node': 25.0.9 - '@inquirer/external-editor@1.0.3(@types/node@25.0.9)': dependencies: chardet: 2.1.1 @@ -32298,18 +31893,11 @@ snapshots: '@inquirer/figures@1.0.10': {} - '@inquirer/figures@2.0.9': {} - '@inquirer/type@3.0.4(@types/node@25.0.9)': optionalDependencies: '@types/node': 25.0.9 - '@inquirer/type@4.1.1(@types/node@25.0.9)': - optionalDependencies: - '@types/node': 25.0.9 - - '@ioredis/commands@1.10.0': - optional: true + '@ioredis/commands@1.10.0': {} '@isaacs/cliui@8.0.2': dependencies: @@ -32345,8 +31933,6 @@ 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 @@ -32355,7 +31941,7 @@ snapshots: '@jridgewell/trace-mapping@0.3.9': dependencies: '@jridgewell/resolve-uri': 3.1.2 - '@jridgewell/sourcemap-codec': 1.6.0 + '@jridgewell/sourcemap-codec': 1.5.5 '@jsonjoy.com/base64@1.1.2(tslib@2.8.1)': dependencies: @@ -32526,7 +32112,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.5 + semver: 7.8.2 tar: 7.4.3 transitivePeerDependencies: - encoding @@ -32611,12 +32197,6 @@ snapshots: chevrotain: 10.5.0 lilconfig: 2.1.0 - '@msw/playwright@0.6.7(msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2))': - dependencies: - '@mswjs/interceptors': 0.41.9 - msw: 2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2) - outvariant: 1.4.3 - '@mswjs/interceptors@0.37.6': dependencies: '@open-draft/deferred-promise': 2.2.0 @@ -32626,48 +32206,39 @@ snapshots: outvariant: 1.4.3 strict-event-emitter: 0.5.1 - '@mswjs/interceptors@0.41.9': - dependencies: - '@open-draft/deferred-promise': 2.2.0 - '@open-draft/logger': 0.3.0 - '@open-draft/until': 2.1.0 - is-node-process: 1.2.0 - outvariant: 1.4.3 - strict-event-emitter: 0.5.1 - '@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.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)': + '@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)': 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.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/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/types': 7.2.21(@types/react@19.2.9) - '@mui/utils': 6.4.6(@types/react@19.2.9)(react@19.2.9) + '@mui/utils': 6.4.6(@types/react@19.2.9)(react@19.2.3) '@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.9 - react-dom: 19.2.9(react@19.2.9) + react: 19.2.3 + react-dom: 19.2.3(react@19.2.3) react-is: 19.0.0 - react-transition-group: 4.4.5(react-dom@19.2.9(react@19.2.9))(react@19.2.9) + react-transition-group: 4.4.5(react-dom@19.2.3(react@19.2.3))(react@19.2.3) optionalDependencies: - '@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) + '@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 - '@mui/private-theming@6.4.6(@types/react@19.2.9)(react@19.2.9)': + '@mui/private-theming@6.4.6(@types/react@19.2.9)(react@19.2.3)': dependencies: '@babel/runtime': 7.26.7 - '@mui/utils': 6.4.6(@types/react@19.2.9)(react@19.2.9) + '@mui/utils': 6.4.6(@types/react@19.2.9)(react@19.2.3) prop-types: 15.8.1 - react: 19.2.9 + react: 19.2.3 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.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/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)': dependencies: '@babel/runtime': 7.26.7 '@emotion/cache': 11.14.0 @@ -32675,39 +32246,39 @@ snapshots: '@emotion/sheet': 1.4.0 csstype: 3.2.3 prop-types: 15.8.1 - react: 19.2.9 + react: 19.2.3 optionalDependencies: - '@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) + '@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) - '@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/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)': dependencies: '@babel/runtime': 7.26.7 - '@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/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/types': 7.2.21(@types/react@19.2.9) - '@mui/utils': 6.4.6(@types/react@19.2.9)(react@19.2.9) + '@mui/utils': 6.4.6(@types/react@19.2.9)(react@19.2.3) clsx: 2.1.1 csstype: 3.2.3 prop-types: 15.8.1 - react: 19.2.9 + react: 19.2.3 optionalDependencies: - '@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) + '@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 '@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.9)': + '@mui/utils@6.4.6(@types/react@19.2.9)(react@19.2.3)': 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.9 + react: 19.2.3 react-is: 19.0.0 optionalDependencies: '@types/react': 19.2.9 @@ -32717,57 +32288,73 @@ snapshots: '@napi-rs/wasm-runtime@0.2.12': dependencies: - '@emnapi/core': 1.11.3 - '@emnapi/runtime': 1.11.3 - '@tybys/wasm-util': 0.10.3 + '@emnapi/core': 1.11.1 + '@emnapi/runtime': 1.11.1 + '@tybys/wasm-util': 0.10.2 optional: true '@napi-rs/wasm-runtime@0.2.4': dependencies: - '@emnapi/core': 1.11.3 - '@emnapi/runtime': 1.11.3 + '@emnapi/core': 1.4.5 + '@emnapi/runtime': 1.4.5 '@tybys/wasm-util': 0.9.0 - '@napi-rs/wasm-runtime@1.1.6(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)': + '@napi-rs/wasm-runtime@1.1.4(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)': dependencies: - '@emnapi/core': 1.11.3 - '@emnapi/runtime': 1.11.3 + '@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.1)': + dependencies: + '@emnapi/core': 1.11.1 + '@emnapi/runtime': 1.11.1 + '@tybys/wasm-util': 0.10.2 + optional: true + + '@napi-rs/wasm-runtime@1.1.5(@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.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 '@neon-rs/load@0.0.4': {} - '@netlify/ai@1.0.1': + '@netlify/api@14.0.7': dependencies: - '@netlify/api': 15.1.2 - - '@netlify/api@15.1.2': - dependencies: - '@netlify/open-api': 2.57.1 + '@netlify/open-api': 2.40.0 node-fetch: 3.3.2 + p-wait-for: 5.0.2 picoquery: 2.5.0 '@netlify/binary-info@1.0.0': {} - '@netlify/blobs@11.0.3(supports-color@10.2.2)': + '@netlify/blobs@10.1.0': dependencies: - '@netlify/dev-utils': 6.0.1 - '@netlify/otel': 7.0.2(supports-color@10.2.2) - '@netlify/runtime-utils': 3.0.0 - transitivePeerDependencies: - - supports-color + '@netlify/dev-utils': 4.3.0 + '@netlify/runtime-utils': 2.2.0 - '@netlify/cache@4.0.0': + '@netlify/cache@3.3.0': dependencies: - '@netlify/runtime-utils': 3.0.0 + '@netlify/runtime-utils': 2.2.0 - '@netlify/config@25.2.5': + '@netlify/config@23.2.0': dependencies: - '@netlify/api': 15.1.2 - '@netlify/headers-parser': 10.1.1 - '@netlify/redirect-parser': 16.1.1 - chalk: 6.0.0 - cron-parser: 5.10.1 + '@iarna/toml': 2.2.5 + '@netlify/api': 14.0.7 + '@netlify/headers-parser': 9.0.2 + '@netlify/redirect-parser': 15.0.3 + chalk: 5.6.2 + cron-parser: 4.9.0 deepmerge: 4.3.1 dot-prop: 9.0.0 execa: 8.0.1 @@ -32778,50 +32365,45 @@ snapshots: indent-string: 5.0.0 is-plain-obj: 4.1.0 map-obj: 5.0.2 + omit.js: 2.0.2 p-locate: 6.0.0 path-type: 6.0.0 read-package-up: 11.0.0 - smol-toml: 1.6.1 tomlify-j0.4: 3.0.0 validate-npm-package-name: 5.0.1 yaml: 2.9.0 yargs: 17.7.2 - zod: 4.6.6 - '@netlify/database-dev@1.0.1': + '@netlify/dev-utils@4.3.0': dependencies: - '@electric-sql/pglite': 0.3.16 - pg-gateway: 0.3.0-beta.4 - - '@netlify/dev-utils@6.0.1': - dependencies: - '@whatwg-node/server': 0.11.0 + '@whatwg-node/server': 0.10.13 ansis: 4.3.1 - atomically: 2.1.1 - chokidar: 5.0.0 + 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 + semver: 7.8.2 + tmp-promise: 3.0.3 + uuid: 11.1.0 + write-file-atomic: 5.0.1 - '@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@4.6.3(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))(rollup@4.63.1)(supports-color@10.2.2)': dependencies: - '@netlify/ai': 1.0.1 - '@netlify/blobs': 11.0.3(supports-color@10.2.2) - '@netlify/config': 25.2.5 - '@netlify/database-dev': 1.0.1 - '@netlify/dev-utils': 6.0.1 - '@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.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 - '@netlify/static': 4.0.0 + '@netlify/blobs': 10.1.0 + '@netlify/config': 23.2.0 + '@netlify/dev-utils': 4.3.0 + '@netlify/edge-functions-dev': 1.0.0 + '@netlify/functions-dev': 1.0.0(rollup@4.63.1)(supports-color@10.2.2) + '@netlify/headers': 2.1.0 + '@netlify/images': 1.3.0(@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)) + '@netlify/redirects': 3.1.0 + '@netlify/runtime': 4.1.1 + '@netlify/static': 3.1.0 ulid: 3.0.1 transitivePeerDependencies: - '@azure/app-configuration' @@ -32832,7 +32414,6 @@ snapshots: - '@azure/storage-blob' - '@capacitor/preferences' - '@deno/kv' - - '@parcel/watcher' - '@planetscale/database' - '@upstash/redis' - '@vercel/blob' @@ -32846,60 +32427,62 @@ snapshots: - idb-keyval - ioredis - rollup - - srvx - supports-color - uploadthing - '@netlify/edge-bundler@16.0.4': + '@netlify/edge-bundler@14.7.0': dependencies: '@import-maps/resolve': 2.0.0 - '@sveltejs/acorn-typescript': 1.0.13(acorn@8.18.0) - acorn: 8.18.0 ajv: 8.18.0 ajv-errors: 3.0.0(ajv@8.18.0) better-ajv-errors: 1.2.0(ajv@8.18.0) common-path-prefix: 3.0.0 - esbuild: 0.28.1 + env-paths: 3.0.0 + esbuild: 0.25.10 execa: 8.0.1 find-up: 7.0.0 + get-port: 7.1.0 node-stream-zip: 1.15.0 p-retry: 6.2.1 + p-wait-for: 5.0.2 parse-imports: 2.2.1 - semver: 7.8.5 - tar: 7.5.22 + path-key: 4.0.0 + semver: 7.8.2 + tar: 7.4.3 tmp-promise: 3.0.3 urlpattern-polyfill: 8.0.2 + uuid: 11.1.0 '@netlify/edge-functions-bootstrap@2.16.0': {} - '@netlify/edge-functions-dev@2.0.1': + '@netlify/edge-functions-dev@1.0.0': dependencies: - '@netlify/dev-utils': 6.0.1 - '@netlify/edge-bundler': 16.0.4 - '@netlify/edge-functions': 4.0.0 + '@netlify/dev-utils': 4.3.0 + '@netlify/edge-bundler': 14.7.0 + '@netlify/edge-functions': 3.0.0 '@netlify/edge-functions-bootstrap': 2.16.0 - '@netlify/runtime-utils': 3.0.0 + '@netlify/runtime-utils': 2.2.0 get-port: 7.1.0 - '@netlify/edge-functions@4.0.0': + '@netlify/edge-functions@3.0.0': dependencies: - '@netlify/types': 3.0.0 + '@netlify/types': 2.1.0 - '@netlify/functions-dev@2.0.5(rollup@4.63.1)(supports-color@10.2.2)': + '@netlify/functions-dev@1.0.0(rollup@4.63.1)(supports-color@10.2.2)': dependencies: - '@netlify/blobs': 11.0.3(supports-color@10.2.2) - '@netlify/dev-utils': 6.0.1 - '@netlify/functions': 6.0.0 - '@netlify/zip-it-and-ship-it': 15.5.1(rollup@4.63.1)(supports-color@10.2.2) - cron-parser: 5.10.1 + '@netlify/blobs': 10.1.0 + '@netlify/dev-utils': 4.3.0 + '@netlify/functions': 5.0.0 + '@netlify/zip-it-and-ship-it': 14.1.11(rollup@4.63.1)(supports-color@10.2.2) + cron-parser: 4.9.0 decache: 4.6.2 + extract-zip: 2.0.1(supports-color@10.2.2) is-stream: 4.0.1 jwt-decode: 4.0.0 lambda-local: 2.2.0 - read-package-up: 12.0.0 - semver: 7.8.5 + read-package-up: 11.0.0 + semver: 7.8.2 source-map-support: 0.5.21 - yauzl: 3.4.0 transitivePeerDependencies: - bare-abort-controller - bare-buffer @@ -32907,22 +32490,26 @@ snapshots: - rollup - supports-color - '@netlify/functions@6.0.0': + '@netlify/functions@5.0.0': dependencies: - '@netlify/types': 3.0.0 + '@netlify/types': 2.1.0 - '@netlify/headers-parser@10.1.1': + '@netlify/headers-parser@9.0.2': dependencies: + '@iarna/toml': 2.2.5 escape-string-regexp: 5.0.0 - smol-toml: 1.6.1 + fast-safe-stringify: 2.1.1 + is-plain-obj: 4.1.0 + map-obj: 5.0.2 + path-exists: 5.0.0 - '@netlify/headers@3.0.1': + '@netlify/headers@2.1.0': dependencies: - '@netlify/headers-parser': 10.1.1 + '@netlify/headers-parser': 9.0.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/images@1.3.0(@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: - 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) + ipx: 3.1.1(@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)) transitivePeerDependencies: - '@azure/app-configuration' - '@azure/cosmos' @@ -32933,7 +32520,6 @@ snapshots: - '@capacitor/preferences' - '@deno/kv' - '@netlify/blobs' - - '@parcel/watcher' - '@planetscale/database' - '@upstash/redis' - '@vercel/blob' @@ -32943,71 +32529,46 @@ snapshots: - db0 - idb-keyval - ioredis - - srvx - uploadthing - '@netlify/open-api@2.57.1': {} + '@netlify/open-api@2.40.0': {} - '@netlify/otel@7.0.2(supports-color@10.2.2)': - dependencies: - '@opentelemetry/api': 1.9.1 - '@opentelemetry/core': 2.10.0(@opentelemetry/api@1.9.1) - '@opentelemetry/instrumentation': 0.221.0(@opentelemetry/api@1.9.1)(supports-color@10.2.2) - '@opentelemetry/resources': 2.10.0(@opentelemetry/api@1.9.1) - '@opentelemetry/sdk-trace-node': 2.10.0(@opentelemetry/api@1.9.1) - transitivePeerDependencies: - - supports-color - - '@netlify/redirect-parser@16.1.1': + '@netlify/redirect-parser@15.0.3': dependencies: + '@iarna/toml': 2.2.5 fast-safe-stringify: 2.1.1 - smol-toml: 1.6.1 + is-plain-obj: 4.1.0 + path-exists: 5.0.0 - '@netlify/redirects@4.0.2': + '@netlify/redirects@3.1.0': dependencies: - '@netlify/dev-utils': 6.0.1 - '@netlify/redirect-parser': 16.1.1 - cookie: 2.0.1 - jsonwebtoken: 9.0.3 + '@netlify/dev-utils': 4.3.0 + '@netlify/redirect-parser': 15.0.3 + cookie: 1.0.2 + jsonwebtoken: 9.0.2 netlify-redirector: 0.5.0 - '@netlify/runtime-utils@3.0.0': {} + '@netlify/runtime-utils@2.2.0': {} - '@netlify/runtime@5.0.3(supports-color@10.2.2)': + '@netlify/runtime@4.1.1': dependencies: - '@netlify/blobs': 11.0.3(supports-color@10.2.2) - '@netlify/cache': 4.0.0 - '@netlify/runtime-utils': 3.0.0 - '@netlify/types': 3.0.0 - transitivePeerDependencies: - - supports-color + '@netlify/blobs': 10.1.0 + '@netlify/cache': 3.3.0 + '@netlify/runtime-utils': 2.2.0 + '@netlify/types': 2.1.0 - '@netlify/server-dev@0.1.1': - dependencies: - '@netlify/dev-utils': 6.0.1 - '@netlify/serverless-functions-api': 2.21.2 - get-port: 7.1.0 + '@netlify/serverless-functions-api@2.7.1': {} - '@netlify/serverless-functions-api@2.18.0': - dependencies: - '@netlify/types': 2.8.0 - - '@netlify/serverless-functions-api@2.21.2': - dependencies: - '@netlify/types': 2.8.0 - - '@netlify/static@4.0.0': + '@netlify/static@3.1.0': dependencies: mime-types: 3.0.2 - '@netlify/types@2.8.0': {} + '@netlify/types@2.1.0': {} - '@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.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))': + '@netlify/vite-plugin-tanstack-start@1.1.4(@tanstack/solid-start@packages+solid-start)(babel-plugin-macros@3.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))(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))': dependencies: - '@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) + '@netlify/vite-plugin': 2.7.4(babel-plugin-macros@3.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))(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) optionalDependencies: '@tanstack/solid-start': link:packages/solid-start transitivePeerDependencies: @@ -33019,7 +32580,6 @@ snapshots: - '@azure/storage-blob' - '@capacitor/preferences' - '@deno/kv' - - '@parcel/watcher' - '@planetscale/database' - '@upstash/redis' - '@vercel/blob' @@ -33034,16 +32594,15 @@ snapshots: - idb-keyval - ioredis - rollup - - srvx - supports-color - uploadthing - '@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))': + '@netlify/vite-plugin@2.7.4(babel-plugin-macros@3.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))(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))': dependencies: - '@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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@2.7.0)(sass-embedded@1.105.1)(sass@1.97.2)(terser@5.51.2)(tsx@4.20.3)(yaml@2.9.0) + '@netlify/dev': 4.6.3(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))(rollup@4.63.1)(supports-color@10.2.2) + '@netlify/dev-utils': 4.3.0 + dedent: 1.7.0(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) transitivePeerDependencies: - '@azure/app-configuration' - '@azure/cosmos' @@ -33053,7 +32612,6 @@ snapshots: - '@azure/storage-blob' - '@capacitor/preferences' - '@deno/kv' - - '@parcel/watcher' - '@planetscale/database' - '@upstash/redis' - '@vercel/blob' @@ -33068,23 +32626,21 @@ snapshots: - idb-keyval - ioredis - rollup - - srvx - supports-color - uploadthing - '@netlify/zip-it-and-ship-it@15.5.1(rollup@4.63.1)(supports-color@10.2.2)': + '@netlify/zip-it-and-ship-it@14.1.11(rollup@4.63.1)(supports-color@10.2.2)': dependencies: '@babel/parser': 7.29.8 - '@babel/types': 7.29.8 + '@babel/types': 7.28.4 '@netlify/binary-info': 1.0.0 - '@netlify/serverless-functions-api': 2.18.0 - '@opentelemetry/api': 1.8.0 - '@vercel/nft': 1.3.1(rollup@4.63.1)(supports-color@10.2.2) - archiver: 8.0.0 + '@netlify/serverless-functions-api': 2.7.1 + '@vercel/nft': 0.29.4(rollup@4.63.1)(supports-color@10.2.2) + archiver: 7.0.1 common-path-prefix: 3.0.0 copy-file: 11.1.0 es-module-lexer: 1.7.0 - esbuild: 0.28.1 + esbuild: 0.25.10 execa: 8.0.1 fast-glob: 3.3.3 filter-obj: 6.1.0 @@ -33093,20 +32649,20 @@ snapshots: junk: 4.0.1 locate-path: 7.2.0 merge-options: 3.0.4 - minimatch: 10.2.5 + minimatch: 9.0.9 normalize-path: 3.0.0 p-map: 7.0.3 path-exists: 5.0.0 precinct: 12.2.0(supports-color@10.2.2) require-package-name: 2.0.1 resolve: 2.0.0-next.5 - semver: 7.8.5 + semver: 7.8.2 tmp-promise: 3.0.3 - toml: 4.3.0 + toml: 3.0.0 unixify: 1.0.0 urlpattern-polyfill: 8.0.2 yargs: 17.7.2 - zod: 4.6.6 + zod: 3.25.76 transitivePeerDependencies: - bare-abort-controller - bare-buffer @@ -33114,32 +32670,6 @@ snapshots: - rollup - supports-color - '@next/env@16.3.4': {} - - '@next/swc-darwin-arm64@16.3.4': - optional: true - - '@next/swc-darwin-x64@16.3.4': - optional: true - - '@next/swc-linux-arm64-gnu@16.3.4': - optional: true - - '@next/swc-linux-arm64-musl@16.3.4': - optional: true - - '@next/swc-linux-x64-gnu@16.3.4': - optional: true - - '@next/swc-linux-x64-musl@16.3.4': - optional: true - - '@next/swc-win32-arm64-msvc@16.3.4': - optional: true - - '@next/swc-win32-x64-msvc@16.3.4': - optional: true - '@noble/ciphers@2.2.0': {} '@noble/hashes@1.4.0': {} @@ -33158,43 +32688,45 @@ snapshots: '@nodelib/fs.scandir': 2.1.5 fastq: 1.19.0 - '@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)))': + '@nx/devkit@22.7.5(nx@22.7.5(@swc-node/register@1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)(@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))(debug@4.4.3(supports-color@10.2.2)))': dependencies: + '@zkochan/js-yaml': 0.0.7 ejs: 5.0.1 + enquirer: 2.3.6 minimatch: 10.2.5 - 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 + nx: 22.7.5(@swc-node/register@1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)(@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))(debug@4.4.3(supports-color@10.2.2)) + semver: 7.8.2 tslib: 2.8.1 yargs-parser: 21.1.1 - '@nx/nx-darwin-arm64@24.0.0': + '@nx/nx-darwin-arm64@22.7.5': optional: true - '@nx/nx-darwin-x64@24.0.0': + '@nx/nx-darwin-x64@22.7.5': optional: true - '@nx/nx-freebsd-x64@24.0.0': + '@nx/nx-freebsd-x64@22.7.5': optional: true - '@nx/nx-linux-arm-gnueabihf@24.0.0': + '@nx/nx-linux-arm-gnueabihf@22.7.5': optional: true - '@nx/nx-linux-arm64-gnu@24.0.0': + '@nx/nx-linux-arm64-gnu@22.7.5': optional: true - '@nx/nx-linux-arm64-musl@24.0.0': + '@nx/nx-linux-arm64-musl@22.7.5': optional: true - '@nx/nx-linux-x64-gnu@24.0.0': + '@nx/nx-linux-x64-gnu@22.7.5': optional: true - '@nx/nx-linux-x64-musl@24.0.0': + '@nx/nx-linux-x64-musl@22.7.5': optional: true - '@nx/nx-win32-arm64-msvc@24.0.0': + '@nx/nx-win32-arm64-msvc@22.7.5': optional: true - '@nx/nx-win32-x64-msvc@24.0.0': + '@nx/nx-win32-x64-msvc@22.7.5': optional: true '@one-ini/wasm@0.1.1': {} @@ -33218,8 +32750,6 @@ snapshots: '@open-draft/deferred-promise@2.2.0': {} - '@open-draft/deferred-promise@3.0.0': {} - '@open-draft/logger@0.3.0': dependencies: is-node-process: 1.2.0 @@ -33227,63 +32757,76 @@ snapshots: '@open-draft/until@2.1.0': {} - '@opentelemetry/api-logs@0.221.0': - dependencies: - '@opentelemetry/api': 1.9.1 - - '@opentelemetry/api@1.8.0': {} - - '@opentelemetry/api@1.9.1': {} - - '@opentelemetry/context-async-hooks@2.10.0(@opentelemetry/api@1.9.1)': - dependencies: - '@opentelemetry/api': 1.9.1 - - '@opentelemetry/core@2.10.0(@opentelemetry/api@1.9.1)': - dependencies: - '@opentelemetry/api': 1.9.1 - '@opentelemetry/semantic-conventions': 1.41.1 - - '@opentelemetry/instrumentation@0.221.0(@opentelemetry/api@1.9.1)(supports-color@10.2.2)': - dependencies: - '@opentelemetry/api': 1.9.1 - '@opentelemetry/api-logs': 0.221.0 - import-in-the-middle: 3.5.1 - require-in-the-middle: 8.0.1(supports-color@10.2.2) - transitivePeerDependencies: - - supports-color - - '@opentelemetry/resources@2.10.0(@opentelemetry/api@1.9.1)': - dependencies: - '@opentelemetry/api': 1.9.1 - '@opentelemetry/core': 2.10.0(@opentelemetry/api@1.9.1) - '@opentelemetry/semantic-conventions': 1.41.1 - - '@opentelemetry/sdk-trace-base@2.10.0(@opentelemetry/api@1.9.1)': - dependencies: - '@opentelemetry/api': 1.9.1 - '@opentelemetry/core': 2.10.0(@opentelemetry/api@1.9.1) - '@opentelemetry/resources': 2.10.0(@opentelemetry/api@1.9.1) - '@opentelemetry/sdk-trace': 2.10.0(@opentelemetry/api@1.9.1) - '@opentelemetry/semantic-conventions': 1.41.1 - - '@opentelemetry/sdk-trace-node@2.10.0(@opentelemetry/api@1.9.1)': - dependencies: - '@opentelemetry/api': 1.9.1 - '@opentelemetry/context-async-hooks': 2.10.0(@opentelemetry/api@1.9.1) - '@opentelemetry/core': 2.10.0(@opentelemetry/api@1.9.1) - '@opentelemetry/sdk-trace-base': 2.10.0(@opentelemetry/api@1.9.1) - - '@opentelemetry/sdk-trace@2.10.0(@opentelemetry/api@1.9.1)': - dependencies: - '@opentelemetry/api': 1.9.1 - '@opentelemetry/core': 2.10.0(@opentelemetry/api@1.9.1) - '@opentelemetry/resources': 2.10.0(@opentelemetry/api@1.9.1) - '@opentelemetry/semantic-conventions': 1.41.1 - '@opentelemetry/semantic-conventions@1.41.1': {} - '@oxc-project/types@0.153.0': {} + '@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.1)': + dependencies: + '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1) + 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-resolver/binding-android-arm-eabi@11.19.1': optional: true @@ -33333,9 +32876,9 @@ snapshots: '@oxc-resolver/binding-openharmony-arm64@11.19.1': optional: true - '@oxc-resolver/binding-wasm32-wasi@11.19.1(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)': + '@oxc-resolver/binding-wasm32-wasi@11.19.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)': dependencies: - '@napi-rs/wasm-runtime': 1.1.6(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) + '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1) transitivePeerDependencies: - '@emnapi/core' - '@emnapi/runtime' @@ -33350,6 +32893,71 @@ 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.1)': + dependencies: + '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1) + 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': @@ -33382,6 +32990,11 @@ snapshots: '@parcel/watcher-linux-x64-musl@2.5.1': optional: true + '@parcel/watcher-wasm@2.5.1': + dependencies: + is-glob: 4.0.3 + micromatch: 4.0.8 + '@parcel/watcher-wasm@2.6.0': dependencies: is-glob: 4.0.3 @@ -33416,7 +33029,6 @@ snapshots: '@parcel/watcher-win32-arm64': 2.5.1 '@parcel/watcher-win32-ia32': 2.5.1 '@parcel/watcher-win32-x64': 2.5.1 - optional: true '@peculiar/asn1-cms@2.7.0': dependencies: @@ -33533,14 +33145,18 @@ snapshots: pprof-to-md: 0.2.0 react-pprof: 1.4.0 - '@playwright/test@1.63.0': + '@playwright/test@1.61.1': dependencies: - playwright: 1.63.0 + playwright: 1.61.1 '@polka/url@1.0.0-next.28': {} '@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 @@ -33551,6 +33167,12 @@ 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': @@ -33564,11 +33186,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.9(react@19.2.9))(react@19.2.9))': + '@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))': 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.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.3(react@19.2.3))(react@19.2.3) typescript: '@typescript/typescript6@6.0.2' '@prisma/config@7.0.0': @@ -33635,11 +33257,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.9(react@19.2.9))(react@19.2.9)': + '@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)': dependencies: '@types/react': 19.2.9 - react: 19.2.9 - react-dom: 19.2.9(react@19.2.9) + react: 19.2.3 + react-dom: 19.2.3(react@19.2.3) '@protobufjs/aspromise@1.1.2': {} @@ -33672,779 +33294,826 @@ 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.9(react@19.2.9))(react@19.2.9)': + '@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)': 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.9(react@19.2.9))(react@19.2.9) - react: 19.2.9 - react-dom: 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.3(react@19.2.3))(react@19.2.3) + react: 19.2.3 + react-dom: 19.2.3(react@19.2.3) 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.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.3(react@19.2.3))(react@19.2.3)': 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.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) + '@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) 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.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.3(react@19.2.3))(react@19.2.3)': dependencies: '@radix-ui/primitive': 1.1.2 - '@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) + '@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) 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.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.3(react@19.2.3))(react@19.2.3)': 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.9(react@19.2.9))(react@19.2.9) - react: 19.2.9 - react-dom: 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.3(react@19.2.3))(react@19.2.3) + react: 19.2.3 + react-dom: 19.2.3(react@19.2.3) 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.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.3(react@19.2.3))(react@19.2.3)': 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.9(react@19.2.9))(react@19.2.9) - react: 19.2.9 - react-dom: 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.3(react@19.2.3))(react@19.2.3) + react: 19.2.3 + react-dom: 19.2.3(react@19.2.3) 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.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.3(react@19.2.3))(react@19.2.3)': dependencies: - '@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) + '@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) 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.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.3(react@19.2.3))(react@19.2.3)': dependencies: '@radix-ui/primitive': 1.1.2 - '@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) + '@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) 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.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.3(react@19.2.3))(react@19.2.3)': dependencies: '@radix-ui/primitive': 1.1.2 - '@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) + '@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) 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.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.3(react@19.2.3))(react@19.2.3)': dependencies: - '@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) + '@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) 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.9)': + '@radix-ui/react-compose-refs@1.1.2(@types/react@19.2.9)(react@19.2.3)': dependencies: - react: 19.2.9 + react: 19.2.3 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.9(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.3(react@19.2.3))(react@19.2.3)': dependencies: '@radix-ui/primitive': 1.1.2 - '@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) + '@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) 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.9)': + '@radix-ui/react-context@1.1.2(@types/react@19.2.9)(react@19.2.3)': dependencies: - react: 19.2.9 + react: 19.2.3 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.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.3(react@19.2.3))(react@19.2.3)': dependencies: '@radix-ui/primitive': 1.1.2 - '@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) + '@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) aria-hidden: 1.2.4 - 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) + 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) 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.9)': + '@radix-ui/react-direction@1.1.1(@types/react@19.2.9)(react@19.2.3)': dependencies: - react: 19.2.9 + react: 19.2.3 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.9(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.3(react@19.2.3))(react@19.2.3)': dependencies: '@radix-ui/primitive': 1.1.2 - '@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) + '@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) 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.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.3(react@19.2.3))(react@19.2.3)': dependencies: '@radix-ui/primitive': 1.1.2 - '@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) + '@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) 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.9)': + '@radix-ui/react-focus-guards@1.1.2(@types/react@19.2.9)(react@19.2.3)': dependencies: - react: 19.2.9 + react: 19.2.3 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.9(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.3(react@19.2.3))(react@19.2.3)': dependencies: - '@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) + '@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) 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.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.3(react@19.2.3))(react@19.2.3)': dependencies: '@radix-ui/primitive': 1.1.2 - '@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) + '@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) 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.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.3(react@19.2.3))(react@19.2.3)': dependencies: '@radix-ui/primitive': 1.1.2 - '@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) + '@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) 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.9)': + '@radix-ui/react-id@1.1.1(@types/react@19.2.9)(react@19.2.3)': dependencies: - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@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.3) + react: 19.2.3 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.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.3(react@19.2.3))(react@19.2.3)': 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.9(react@19.2.9))(react@19.2.9) - react: 19.2.9 - react-dom: 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.3(react@19.2.3))(react@19.2.3) + react: 19.2.3 + react-dom: 19.2.3(react@19.2.3) 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.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.3(react@19.2.3))(react@19.2.3)': 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.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) + '@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) aria-hidden: 1.2.4 - 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) + 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) 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.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.3(react@19.2.3))(react@19.2.3)': 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.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) + '@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) 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.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.3(react@19.2.3))(react@19.2.3)': 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.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) + '@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) 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.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.3(react@19.2.3))(react@19.2.3)': dependencies: '@radix-ui/primitive': 1.1.2 - '@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) + '@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) aria-hidden: 1.2.4 - 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) + 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) 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.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.3(react@19.2.3))(react@19.2.3)': dependencies: - '@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) + '@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) '@radix-ui/rect': 1.1.1 - react: 19.2.9 - react-dom: 19.2.9(react@19.2.9) + react: 19.2.3 + react-dom: 19.2.3(react@19.2.3) 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.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.3(react@19.2.3))(react@19.2.3)': 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.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) + '@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) 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.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.3(react@19.2.3))(react@19.2.3)': dependencies: - '@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) + '@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) 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.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.3(react@19.2.3))(react@19.2.3)': dependencies: - '@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) + '@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) 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.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.3(react@19.2.3))(react@19.2.3)': dependencies: - '@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) + '@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) 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.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.3(react@19.2.3))(react@19.2.3)': dependencies: '@radix-ui/primitive': 1.1.2 - '@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) + '@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) 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.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.3(react@19.2.3))(react@19.2.3)': 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.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) + '@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) 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.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.3(react@19.2.3))(react@19.2.3)': 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.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) + '@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) 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.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.3(react@19.2.3))(react@19.2.3)': 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.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) + '@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) aria-hidden: 1.2.4 - 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) + 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) 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.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.3(react@19.2.3))(react@19.2.3)': 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.9(react@19.2.9))(react@19.2.9) - react: 19.2.9 - react-dom: 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.3(react@19.2.3))(react@19.2.3) + react: 19.2.3 + react-dom: 19.2.3(react@19.2.3) 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.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.3(react@19.2.3))(react@19.2.3)': 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.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) + '@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) 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.9)': + '@radix-ui/react-slot@1.2.0(@types/react@19.2.9)(react@19.2.3)': dependencies: - '@radix-ui/react-compose-refs': 1.1.2(@types/react@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.3) + react: 19.2.3 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.9(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.3(react@19.2.3))(react@19.2.3)': dependencies: '@radix-ui/primitive': 1.1.2 - '@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) + '@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) 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.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.3(react@19.2.3))(react@19.2.3)': dependencies: '@radix-ui/primitive': 1.1.2 - '@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) + '@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) 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.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.3(react@19.2.3))(react@19.2.3)': 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.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) + '@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) 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.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.3(react@19.2.3))(react@19.2.3)': dependencies: '@radix-ui/primitive': 1.1.2 - '@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) + '@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) 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.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.3(react@19.2.3))(react@19.2.3)': 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.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) + '@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) 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.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.3(react@19.2.3))(react@19.2.3)': dependencies: '@radix-ui/primitive': 1.1.2 - '@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) + '@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) 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.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.3(react@19.2.3))(react@19.2.3)': dependencies: '@radix-ui/primitive': 1.1.2 - '@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) + '@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) 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.9)': + '@radix-ui/react-use-callback-ref@1.1.1(@types/react@19.2.9)(react@19.2.3)': dependencies: - react: 19.2.9 + react: 19.2.3 optionalDependencies: '@types/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-controllable-state@1.1.1(@types/react@19.2.9)(react@19.2.3)': dependencies: - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@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.3) + react: 19.2.3 optionalDependencies: '@types/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-escape-keydown@1.1.1(@types/react@19.2.9)(react@19.2.3)': dependencies: - '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@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.3) + react: 19.2.3 optionalDependencies: '@types/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-layout-effect@1.1.1(@types/react@19.2.9)(react@19.2.3)': dependencies: - react: 19.2.9 + react: 19.2.3 optionalDependencies: '@types/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-previous@1.1.1(@types/react@19.2.9)(react@19.2.3)': dependencies: - react: 19.2.9 + react: 19.2.3 optionalDependencies: '@types/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-rect@1.1.1(@types/react@19.2.9)(react@19.2.3)': dependencies: '@radix-ui/rect': 1.1.1 - react: 19.2.9 + react: 19.2.3 optionalDependencies: '@types/react': 19.2.9 - '@radix-ui/react-use-size@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.3)': dependencies: - '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@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.3) + react: 19.2.3 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.9(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.3(react@19.2.3))(react@19.2.3)': 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.9(react@19.2.9))(react@19.2.9) - react: 19.2.9 - react-dom: 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.3(react@19.2.3))(react@19.2.3) + react: 19.2.3 + react-dom: 19.2.3(react@19.2.3) 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.9(react@19.2.9))(react@19.2.9)': + '@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)': 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.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) + 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) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) - '@rolldown/binding-android-arm-eabi@1.2.13': + '@rolldown/binding-android-arm64@1.0.0-rc.9': optional: true - '@rolldown/binding-android-arm64@1.2.13': + '@rolldown/binding-android-arm64@1.0.2': optional: true - '@rolldown/binding-darwin-arm64@1.2.13': + '@rolldown/binding-darwin-arm64@1.0.0-rc.9': optional: true - '@rolldown/binding-darwin-x64@1.2.13': + '@rolldown/binding-darwin-arm64@1.0.2': optional: true - '@rolldown/binding-freebsd-x64@1.2.13': + '@rolldown/binding-darwin-x64@1.0.0-rc.9': optional: true - '@rolldown/binding-linux-arm-gnueabihf@1.2.13': + '@rolldown/binding-darwin-x64@1.0.2': optional: true - '@rolldown/binding-linux-arm64-gnu@1.2.13': + '@rolldown/binding-freebsd-x64@1.0.0-rc.9': optional: true - '@rolldown/binding-linux-arm64-musl@1.2.13': + '@rolldown/binding-freebsd-x64@1.0.2': optional: true - '@rolldown/binding-linux-ppc64-gnu@1.2.13': + '@rolldown/binding-linux-arm-gnueabihf@1.0.0-rc.9': optional: true - '@rolldown/binding-linux-s390x-gnu@1.2.13': + '@rolldown/binding-linux-arm-gnueabihf@1.0.2': optional: true - '@rolldown/binding-linux-x64-gnu@1.2.13': + '@rolldown/binding-linux-arm64-gnu@1.0.0-rc.9': optional: true - '@rolldown/binding-linux-x64-musl@1.2.13': + '@rolldown/binding-linux-arm64-gnu@1.0.2': optional: true - '@rolldown/binding-openharmony-arm64@1.2.13': + '@rolldown/binding-linux-arm64-musl@1.0.0-rc.9': optional: true - '@rolldown/binding-win32-arm64-msvc@1.2.13': + '@rolldown/binding-linux-arm64-musl@1.0.2': optional: true - '@rolldown/binding-win32-x64-msvc@1.2.13': + '@rolldown/binding-linux-ppc64-gnu@1.0.0-rc.9': optional: true - '@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))': + '@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.1)(@emnapi/runtime@1.11.1)': + dependencies: + '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1) + 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.5(@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))': dependencies: '@babel/core': 7.29.0(supports-color@10.2.2) picomatch: 4.0.7 - rolldown: 1.2.13 + rolldown: 1.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) + vite: 8.0.14(@types/node@25.0.9)(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))': + '@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))': dependencies: '@babel/core': 7.29.7(supports-color@10.2.2) picomatch: 4.0.7 - rolldown: 1.2.13 + rolldown: 1.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.105.1)(terser@5.51.2)(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) optional: true - '@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.2.13 - 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) - optional: true + '@rolldown/pluginutils@1.0.0-beta.27': {} '@rolldown/pluginutils@1.0.0-rc.2': {} @@ -34454,6 +34123,61 @@ 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 @@ -34537,14 +34261,21 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.63.1': optional: true - '@rsbuild/core@2.3.1': + '@rsbuild/core@2.0.14': dependencies: - '@rspack/core': 2.3.1(@swc/helpers@0.5.23) + '@rspack/core': 2.0.8(@swc/helpers@0.5.23) '@swc/helpers': 0.5.23 transitivePeerDependencies: - '@module-federation/runtime-tools' - '@rsbuild/plugin-babel@1.1.2(@rsbuild/core@2.3.1)(supports-color@10.2.2)': + '@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/plugin-babel@1.1.2(@rsbuild/core@2.1.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) @@ -34553,222 +34284,250 @@ snapshots: '@types/babel__core': 7.20.5 reduce-configs: 1.1.1 optionalDependencies: - '@rsbuild/core': 2.3.1 + '@rsbuild/core': 2.1.1 transitivePeerDependencies: - supports-color - '@rsbuild/plugin-react@2.0.0(@rsbuild/core@2.3.1)(@rspack/core@2.3.1(@swc/helpers@0.5.23))': + '@rsbuild/plugin-react@2.0.0(@rsbuild/core@2.0.14)(@rspack/core@2.1.1(@swc/helpers@0.5.23))': dependencies: - '@rspack/plugin-react-refresh': 2.0.0(@rspack/core@2.3.1(@swc/helpers@0.5.23))(react-refresh@0.18.0) + '@rspack/plugin-react-refresh': 2.0.0(@rspack/core@2.1.1(@swc/helpers@0.5.23))(react-refresh@0.18.0) react-refresh: 0.18.0 optionalDependencies: - '@rsbuild/core': 2.3.1 + '@rsbuild/core': 2.0.14 transitivePeerDependencies: - '@rspack/core' - '@rsbuild/plugin-sass@2.0.1(@rsbuild/core@2.3.1)': + '@rsbuild/plugin-react@2.0.0(@rsbuild/core@2.1.1)(@rspack/core@2.1.1(@swc/helpers@0.5.23))': dependencies: - deepmerge: 4.3.1 - loader-utils: 2.0.4 - postcss: 8.5.29 - reduce-configs: 2.0.1 - sass-embedded: 1.105.1 + '@rspack/plugin-react-refresh': 2.0.0(@rspack/core@2.1.1(@swc/helpers@0.5.23))(react-refresh@0.18.0) + react-refresh: 0.18.0 optionalDependencies: - '@rsbuild/core': 2.3.1 + '@rsbuild/core': 2.1.1 + transitivePeerDependencies: + - '@rspack/core' - '@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)': + '@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)': dependencies: - '@rsbuild/plugin-babel': 1.1.2(@rsbuild/core@2.3.1)(supports-color@10.2.2) + '@rsbuild/plugin-babel': 1.1.2(@rsbuild/core@2.1.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.3.1 + '@rsbuild/core': 2.1.1 transitivePeerDependencies: - '@babel/core' - solid-js - supports-color - '@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)': + '@rsbuild/plugin-tailwindcss@2.0.3(@rsbuild/core@2.0.14)(@rspack/core@2.1.1(@swc/helpers@0.5.23))(webpack@5.110.3)': dependencies: - '@tailwindcss/webpack': 4.3.1(@rspack/core@2.3.1(@swc/helpers@0.5.23))(webpack@5.110.3) + '@tailwindcss/webpack': 4.3.1(@rspack/core@2.1.1(@swc/helpers@0.5.23))(webpack@5.110.3) optionalDependencies: - '@rsbuild/core': 2.3.1 + '@rsbuild/core': 2.0.14 transitivePeerDependencies: - '@rspack/core' - webpack - '@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)': + '@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)': dependencies: - '@rsbuild/plugin-babel': 1.1.2(@rsbuild/core@2.3.1)(supports-color@10.2.2) + '@rsbuild/plugin-babel': 1.1.2(@rsbuild/core@2.1.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.3.1 + '@rsbuild/core': 2.1.1 transitivePeerDependencies: - '@babel/core' - supports-color - '@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))': + '@rsbuild/plugin-vue@1.2.7(@rsbuild/core@2.1.1)(@rspack/core@2.1.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.3.1(@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.1.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.3.1 + '@rsbuild/core': 2.1.1 transitivePeerDependencies: - '@rspack/core' - '@vue/compiler-sfc' - vue - '@rspack/binding-darwin-arm64@2.2.7': + '@rspack/binding-darwin-arm64@2.0.0': optional: true - '@rspack/binding-darwin-arm64@2.3.1': + '@rspack/binding-darwin-arm64@2.0.8': optional: true - '@rspack/binding-darwin-x64@2.2.7': + '@rspack/binding-darwin-arm64@2.1.1': optional: true - '@rspack/binding-darwin-x64@2.3.1': + '@rspack/binding-darwin-x64@2.0.0': optional: true - '@rspack/binding-linux-arm64-gnu@2.2.7': + '@rspack/binding-darwin-x64@2.0.8': optional: true - '@rspack/binding-linux-arm64-gnu@2.3.1': + '@rspack/binding-darwin-x64@2.1.1': optional: true - '@rspack/binding-linux-arm64-musl@2.2.7': + '@rspack/binding-linux-arm64-gnu@2.0.0': optional: true - '@rspack/binding-linux-arm64-musl@2.3.1': + '@rspack/binding-linux-arm64-gnu@2.0.8': optional: true - '@rspack/binding-linux-ppc64-gnu@2.2.7': + '@rspack/binding-linux-arm64-gnu@2.1.1': optional: true - '@rspack/binding-linux-ppc64-gnu@2.3.1': + '@rspack/binding-linux-arm64-musl@2.0.0': optional: true - '@rspack/binding-linux-riscv64-gnu@2.2.7': + '@rspack/binding-linux-arm64-musl@2.0.8': optional: true - '@rspack/binding-linux-riscv64-gnu@2.3.1': + '@rspack/binding-linux-arm64-musl@2.1.1': optional: true - '@rspack/binding-linux-riscv64-musl@2.2.7': + '@rspack/binding-linux-riscv64-gnu@2.1.1': optional: true - '@rspack/binding-linux-riscv64-musl@2.3.1': + '@rspack/binding-linux-riscv64-musl@2.1.1': optional: true - '@rspack/binding-linux-s390x-gnu@2.2.7': + '@rspack/binding-linux-x64-gnu@2.0.0': optional: true - '@rspack/binding-linux-s390x-gnu@2.3.1': + '@rspack/binding-linux-x64-gnu@2.0.8': optional: true - '@rspack/binding-linux-x64-gnu@2.2.7': + '@rspack/binding-linux-x64-gnu@2.1.1': optional: true - '@rspack/binding-linux-x64-gnu@2.3.1': + '@rspack/binding-linux-x64-musl@2.0.0': optional: true - '@rspack/binding-linux-x64-musl@2.2.7': + '@rspack/binding-linux-x64-musl@2.0.8': optional: true - '@rspack/binding-linux-x64-musl@2.3.1': + '@rspack/binding-linux-x64-musl@2.1.1': optional: true - '@rspack/binding-wasm32-wasi@2.2.7': + '@rspack/binding-wasm32-wasi@2.0.0': 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) + '@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.3.1': + '@rspack/binding-wasm32-wasi@2.0.8': 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) + '@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-win32-arm64-msvc@2.2.7': + '@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-win32-arm64-msvc@2.3.1': + '@rspack/binding-win32-arm64-msvc@2.0.0': optional: true - '@rspack/binding-win32-ia32-msvc@2.2.7': + '@rspack/binding-win32-arm64-msvc@2.0.8': optional: true - '@rspack/binding-win32-ia32-msvc@2.3.1': + '@rspack/binding-win32-arm64-msvc@2.1.1': optional: true - '@rspack/binding-win32-x64-msvc@2.2.7': + '@rspack/binding-win32-ia32-msvc@2.0.0': optional: true - '@rspack/binding-win32-x64-msvc@2.3.1': + '@rspack/binding-win32-ia32-msvc@2.0.8': optional: true - '@rspack/binding@2.2.7': + '@rspack/binding-win32-ia32-msvc@2.1.1': + 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@2.0.0': 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-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.3.1': + '@rspack/binding@2.0.8': 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/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/core@2.2.7(@swc/helpers@0.5.23)': + '@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/core@2.0.0(@swc/helpers@0.5.23)': dependencies: - '@rspack/binding': 2.2.7 + '@rspack/binding': 2.0.0 optionalDependencies: '@swc/helpers': 0.5.23 - '@rspack/core@2.3.1(@swc/helpers@0.5.23)': + '@rspack/core@2.0.8(@swc/helpers@0.5.23)': dependencies: - '@rspack/binding': 2.3.1 + '@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/lite-tapable@1.1.0': {} - '@rspack/plugin-react-refresh@2.0.0(@rspack/core@2.3.1(@swc/helpers@0.5.23))(react-refresh@0.18.0)': + '@rspack/plugin-react-refresh@2.0.0(@rspack/core@2.1.1(@swc/helpers@0.5.23))(react-refresh@0.18.0)': dependencies: react-refresh: 0.18.0 optionalDependencies: - '@rspack/core': 2.3.1(@swc/helpers@0.5.23) + '@rspack/core': 2.1.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-formats: 3.0.1(ajv@8.13.0) fs-extra: 7.0.1 import-lazy: 4.0.0 jju: 1.4.0 @@ -34897,12 +34656,12 @@ snapshots: '@sentry/types': 7.120.4 '@sentry/utils': 7.120.4 - '@sentry/react@10.32.0(react@19.2.9)': + '@sentry/react@10.32.0(react@19.2.3)': dependencies: '@sentry/browser': 10.32.0 '@sentry/core': 10.32.0 hoist-non-react-statics: 3.3.2 - react: 19.2.9 + react: 19.2.3 '@sentry/solid@10.32.0(@tanstack/solid-router@packages+solid-router)(solid-js@1.9.12)': dependencies: @@ -34944,6 +34703,8 @@ snapshots: '@sindresorhus/is@7.1.0': {} + '@sindresorhus/merge-streams@4.0.0': {} + '@so-ric/colorspace@1.1.6': dependencies: color: 5.0.2 @@ -35109,23 +34870,19 @@ snapshots: - bufferutil - utf-8-validate - '@sveltejs/acorn-typescript@1.0.13(acorn@8.18.0)': - dependencies: - acorn: 8.18.0 - '@swc-node/core@1.14.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(@swc/types@0.1.26)': dependencies: '@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.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-node/register@1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)(@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@10.2.2) - oxc-resolver: 11.19.1(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) + oxc-resolver: 11.19.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1) pirates: 4.0.7 tslib: 2.8.1 typescript: '@typescript/typescript6@6.0.2' @@ -35339,29 +35096,22 @@ snapshots: postcss: 8.5.8 tailwindcss: 4.2.2 - '@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))': + '@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))': 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.105.1)(terser@5.51.2)(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) - '@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)': + '@tailwindcss/webpack@4.3.1(@rspack/core@2.1.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.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) + '@rspack/core': 2.1.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.2)(html-minifier-terser@6.1.0)(lightningcss@1.33.0)(postcss@8.5.15)(sharp@0.34.5)(svgo@4.0.0)(webpack-cli@5.1.4) '@tanstack/devtools-client@0.0.4': dependencies: @@ -35428,11 +35178,11 @@ snapshots: - csstype - utf-8-validate - '@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)': + '@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)': 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(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(@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-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) @@ -35444,12 +35194,12 @@ snapshots: - supports-color - typescript - '@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)': + '@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@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/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-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-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@10.2.2))(supports-color@10.2.2) @@ -35472,48 +35222,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.9(react@19.2.9))(react@19.2.9)(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.3(react@19.2.3))(react@19.2.3)(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.9 - react-dom: 19.2.9(react@19.2.9) + react: 19.2.3 + react-dom: 19.2.3(react@19.2.3) transitivePeerDependencies: - bufferutil - csstype - solid-js - utf-8-validate - '@tanstack/react-query-devtools@5.67.2(@tanstack/react-query@5.102.0(react@19.2.9))(react@19.2.9)': + '@tanstack/react-query-devtools@5.67.2(@tanstack/react-query@5.102.0(react@19.2.3))(react@19.2.3)': dependencies: '@tanstack/query-devtools': 5.67.2 - '@tanstack/react-query': 5.102.0(react@19.2.9) - react: 19.2.9 + '@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)': + '@tanstack/react-query-devtools@5.90.2(@tanstack/react-query@5.102.0(react@19.2.3))(react@19.2.3)': dependencies: '@tanstack/query-devtools': 5.90.1 - '@tanstack/react-query': 5.102.0(react@19.2.9) - react: 19.2.9 + '@tanstack/react-query': 5.102.0(react@19.2.3) + react: 19.2.3 - '@tanstack/react-query@5.102.0(react@19.2.9)': + '@tanstack/react-query@5.102.0(react@19.2.3)': dependencies: '@tanstack/query-core': 5.102.0 - react: 19.2.9 + react: 19.2.3 - '@tanstack/react-store@0.11.2(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': + '@tanstack/react-store@0.9.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': dependencies: - '@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/store': 0.9.3 + 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/react-virtual@3.13.0(react-dom@19.2.9(react@19.2.9))(react@19.2.9)': + '@tanstack/react-virtual@3.13.0(react-dom@19.2.3(react@19.2.3))(react@19.2.3)': dependencies: '@tanstack/virtual-core': 3.13.0 - react: 19.2.9 - react-dom: 19.2.9(react@19.2.9) + react: 19.2.3 + react-dom: 19.2.3(react@19.2.3) '@tanstack/solid-devtools@0.7.14(csstype@3.2.3)(solid-js@1.9.12)': dependencies: @@ -35540,7 +35290,7 @@ snapshots: '@tanstack/virtual-core': 3.13.12 solid-js: 1.9.12 - '@tanstack/store@0.11.2': {} + '@tanstack/store@0.9.3': {} '@tanstack/virtual-core@3.13.0': {} @@ -35548,48 +35298,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.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))': + '@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))': dependencies: - 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)) + vite: 8.0.14(@types/node@25.0.9)(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)) transitivePeerDependencies: - '@types/node' - rollup - supports-color - typescript - '@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))': + '@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.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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)(@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)) + vite: 8.0.14(@types/node@25.0.9)(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)(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)) transitivePeerDependencies: - '@types/node' - rollup - supports-color - typescript - '@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))': + '@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))': 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-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)) + 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)) 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))': + '@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))': 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)) + 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)) transitivePeerDependencies: - '@types/node' - rollup @@ -35614,11 +35364,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@6.0.2)))(vue@3.5.25(typescript@6.0.2))': + '@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))': dependencies: '@tanstack/query-devtools': 5.91.1 - '@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@7.0.2)) + vue: 3.5.25(typescript@7.0.2) '@tanstack/vue-query@5.102.0(vue@3.5.25(@typescript/typescript6@6.0.2))': dependencies: @@ -35636,17 +35386,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@6.0.2))': + '@tanstack/vue-query@5.102.0(vue@3.5.25(typescript@7.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@6.0.2) - vue-demi: 0.14.10(vue@3.5.25(typescript@6.0.2)) + vue: 3.5.25(typescript@7.0.2) + vue-demi: 0.14.10(vue@3.5.25(typescript@7.0.2)) - '@tanstack/vue-store@0.11.2(vue@3.5.25(@typescript/typescript6@6.0.2))': + '@tanstack/vue-store@0.9.3(vue@3.5.25(@typescript/typescript6@6.0.2))': dependencies: - '@tanstack/store': 0.11.2 + '@tanstack/store': 0.9.3 vue: 3.5.25(@typescript/typescript6@6.0.2) vue-demi: 0.14.10(vue@3.5.25(@typescript/typescript6@6.0.2)) @@ -35686,36 +35436,23 @@ snapshots: dom-accessibility-api: 0.6.3 lodash: 4.17.21 redent: 3.0.0 - optional: true - '@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)': + '@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)': dependencies: '@babel/runtime': 7.26.7 '@testing-library/dom': 10.4.1 - react: 19.2.9 - react-dom: 19.2.9(react@19.2.9) + react: 19.2.3 + react-dom: 19.2.3(react@19.2.3) 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.9(react@19.2.9))(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)': dependencies: '@babel/runtime': 7.26.7 '@testing-library/dom': 10.4.1 - react: 19.2.9 - react-dom: 19.2.9(react@19.2.9) + react: 19.2.3 + react-dom: 19.2.3(react@19.2.3) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) @@ -35738,15 +35475,20 @@ snapshots: dependencies: typescript: '@typescript/typescript6@6.0.2' - '@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)': + '@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)': dependencies: - '@tanstack/react-query': 5.102.0(react@19.2.9) + '@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) - react: 19.2.9 - react-dom: 19.2.9(react@19.2.9) + react: 19.2.3 + react-dom: 19.2.3(react@19.2.3) 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 @@ -35822,7 +35564,7 @@ snapshots: '@types/eslint@9.6.1': dependencies: - '@types/estree': 1.0.9 + '@types/estree': 1.0.8 '@types/json-schema': 7.0.15 '@types/estree@1.0.7': {} @@ -35913,6 +35655,8 @@ snapshots: dependencies: csstype: 3.2.3 + '@types/resolve@1.20.2': {} + '@types/retry@0.12.2': {} '@types/send@0.17.4': @@ -35935,18 +35679,12 @@ snapshots: '@types/http-errors': 2.0.4 '@types/node': 25.0.9 - '@types/set-cookie-parser@2.4.10': - dependencies: - '@types/node': 25.0.9 - '@types/sockjs@0.3.36': dependencies: '@types/node': 25.0.9 '@types/statuses@2.0.5': {} - '@types/statuses@2.0.6': {} - '@types/tough-cookie@4.0.5': {} '@types/triple-beam@1.3.5': {} @@ -35955,6 +35693,17 @@ 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 + + '@types/yauzl@2.10.3': + dependencies: + '@types/node': 25.0.9 + optional: true + '@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 @@ -35998,7 +35747,7 @@ snapshots: '@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@10.2.2) - ignore: 7.0.12 + ignore: 7.0.5 natural-compare: 1.4.0 ts-api-utils: 2.4.0(@typescript/typescript6@6.0.2) typescript: '@typescript/typescript6@6.0.2' @@ -36250,7 +35999,7 @@ snapshots: fast-glob: 3.3.3 is-glob: 4.0.3 minimatch: 9.0.9 - semver: 7.8.5 + semver: 7.8.2 ts-api-utils: 2.4.0(@typescript/typescript6@6.0.2) typescript: '@typescript/typescript6@6.0.2' transitivePeerDependencies: @@ -36266,7 +36015,7 @@ snapshots: fast-glob: 3.3.3 is-glob: 4.0.3 minimatch: 9.0.9 - semver: 7.8.5 + semver: 7.8.2 ts-api-utils: 2.1.0(@typescript/typescript6@6.0.2) typescript: '@typescript/typescript6@6.0.2' transitivePeerDependencies: @@ -36282,7 +36031,7 @@ snapshots: fast-glob: 3.3.3 is-glob: 4.0.3 minimatch: 9.0.9 - semver: 7.8.5 + semver: 7.8.2 ts-api-utils: 2.1.0(typescript@5.8.3) typescript: 5.8.3 transitivePeerDependencies: @@ -36298,7 +36047,7 @@ snapshots: fast-glob: 3.3.3 is-glob: 4.0.3 minimatch: 9.0.9 - semver: 7.8.5 + semver: 7.8.2 ts-api-utils: 2.1.0(typescript@5.9.2) typescript: 5.9.2 transitivePeerDependencies: @@ -36312,7 +36061,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.5 + semver: 7.8.2 tinyglobby: 0.2.17 ts-api-utils: 2.4.0(typescript@5.9.2) typescript: 5.9.2 @@ -36327,7 +36076,7 @@ snapshots: '@typescript-eslint/visitor-keys': 8.57.1 debug: 4.4.3(supports-color@10.2.2) minimatch: 10.2.5 - semver: 7.8.5 + semver: 7.8.2 tinyglobby: 0.2.17 ts-api-utils: 2.4.0(@typescript/typescript6@6.0.2) typescript: '@typescript/typescript6@6.0.2' @@ -36342,7 +36091,7 @@ snapshots: '@typescript-eslint/visitor-keys': 8.57.1 debug: 4.4.3(supports-color@10.2.2) minimatch: 10.2.5 - semver: 7.8.5 + semver: 7.8.2 tinyglobby: 0.2.17 ts-api-utils: 2.4.0(typescript@5.9.3) typescript: 5.9.3 @@ -36558,12 +36307,31 @@ snapshots: '@unrs/resolver-binding-win32-x64-msvc@1.11.1': optional: true - '@vercel/nft@1.3.1(rollup@4.63.1)(supports-color@10.2.2)': + '@vercel/nft@0.29.4(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.18.0 - acorn-import-attributes: 1.9.5(acorn@8.18.0) + 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: 10.5.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.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 @@ -36577,142 +36345,156 @@ snapshots: - rollup - 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.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-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))': dependencies: '@rolldown/pluginutils': 1.0.0-rc.7 - vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@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.0.14(@types/node@25.0.9)(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: - '@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)) + '@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 - '@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))': + '@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))': dependencies: '@rolldown/pluginutils': 1.0.0-rc.7 - 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: 8.0.14(@types/node@25.0.9)(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: - '@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)) + '@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 - '@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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@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.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.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))': + '@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))': dependencies: '@rolldown/pluginutils': 1.0.1 - es-module-lexer: 3.0.4 + es-module-lexer: 2.3.1 estree-walker: 3.0.3 - 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)) + 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)) - '@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))': + '@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))': dependencies: '@rolldown/pluginutils': 1.0.1 - es-module-lexer: 3.0.4 + es-module-lexer: 2.3.1 estree-walker: 3.0.3 - 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)) + 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)) - '@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))': + '@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))': 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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@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.0.14(@types/node@25.0.9)(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@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))': + '@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))': 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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@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.0.14(@types/node@25.0.9)(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@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))': + '@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))': 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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@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.0.14(@types/node@25.0.9)(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@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))': + '@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.9.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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@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.0.14(@types/node@25.0.9)(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) transitivePeerDependencies: - supports-color - '@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))': + '@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@7.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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@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: 8.0.14(@types/node@25.0.9)(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) transitivePeerDependencies: - supports-color - '@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))': + '@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))': dependencies: '@rolldown/pluginutils': 1.0.0-rc.2 - vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@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.0.14(@types/node@25.0.9)(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@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.8.3))': dependencies: '@rolldown/pluginutils': 1.0.0-rc.2 - vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@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.0.14(@types/node@25.0.9)(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.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@5.9.3))': dependencies: '@rolldown/pluginutils': 1.0.0-rc.2 - vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@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.0.14(@types/node@25.0.9)(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@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@7.0.2))': dependencies: '@rolldown/pluginutils': 1.0.0-rc.2 - vite: 8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@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: 8.0.14(@types/node@25.0.9)(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) '@vitest/expect@4.1.4': dependencies: @@ -36720,74 +36502,44 @@ snapshots: '@types/chai': 5.2.2 '@vitest/spy': 4.1.4 '@vitest/utils': 4.1.4 - chai: 6.3.0 - tinyrainbow: 3.2.0 - optional: true + chai: 6.2.2 + tinyrainbow: 3.1.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/mocker@4.1.4(msw@2.7.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/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.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 + msw: 2.7.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@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))': + '@vitest/mocker@4.1.4(msw@2.7.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))': dependencies: - '@jridgewell/trace-mapping': 0.3.31 - '@vitest/spy': 5.0.4 + '@vitest/spy': 4.1.4 estree-walker: 3.0.3 - magic-string: 1.4.3 + magic-string: 0.30.21 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.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) + msw: 2.7.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.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@4.1.4(msw@2.7.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))': dependencies: - '@jridgewell/trace-mapping': 0.3.31 - '@vitest/spy': 5.0.4 + '@vitest/spy': 4.1.4 estree-walker: 3.0.3 - magic-string: 1.4.3 + magic-string: 0.30.21 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.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) + msw: 2.7.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': dependencies: - tinyrainbow: 3.2.0 - optional: true - - '@vitest/pretty-format@5.0.4': - dependencies: - tinyrainbow: 3.2.0 + tinyrainbow: 3.1.0 '@vitest/runner@4.1.4': dependencies: '@vitest/utils': 4.1.4 pathe: 2.0.3 - optional: true '@vitest/snapshot@4.1.4': dependencies: @@ -36795,47 +36547,25 @@ snapshots: '@vitest/utils': 4.1.4 magic-string: 0.30.21 pathe: 2.0.3 - optional: true - '@vitest/spy@4.1.4': - optional: true - - '@vitest/spy@5.0.4': {} + '@vitest/spy@4.1.4': {} '@vitest/ui@4.1.4(vitest@4.1.4)': dependencies: '@vitest/utils': 4.1.4 fflate: 0.8.3 - flatted: 3.4.4 + flatted: 3.4.2 pathe: 2.0.3 sirv: 3.0.2 tinyglobby: 0.2.17 - 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)) + tinyrainbow: 3.1.0 + vitest: 4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.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/utils@4.1.4': dependencies: '@vitest/pretty-format': 4.1.4 convert-source-map: 2.0.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 + tinyrainbow: 3.1.0 '@volar/language-core@2.4.26': dependencies: @@ -36953,7 +36683,7 @@ snapshots: '@vue/shared': 3.5.25 entities: 4.5.0 estree-walker: 2.0.2 - source-map-js: 1.2.2 + source-map-js: 1.2.1 '@vue/compiler-dom@3.5.25': dependencies: @@ -36969,8 +36699,8 @@ snapshots: '@vue/shared': 3.5.25 estree-walker: 2.0.2 magic-string: 0.30.21 - postcss: 8.5.29 - source-map-js: 1.2.2 + postcss: 8.5.15 + source-map-js: 1.2.1 '@vue/compiler-ssr@3.5.25': dependencies: @@ -37054,11 +36784,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@6.0.2))': + '@vue/server-renderer@3.5.25(vue@3.5.25(typescript@7.0.2))': dependencies: '@vue/compiler-ssr': 3.5.25 '@vue/shared': 3.5.25 - vue: 3.5.25(typescript@6.0.2) + vue: 3.5.25(typescript@7.0.2) '@vue/shared@3.5.25': {} @@ -37145,7 +36875,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.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: 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.15)(sharp@0.34.5)(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 @@ -37156,7 +36886,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.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: 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.15)(sharp@0.34.5)(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 @@ -37167,7 +36897,7 @@ 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.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: 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.15)(sharp@0.34.5)(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@10.2.2))(supports-color@10.2.2)(webpack-cli@5.1.4)(webpack@5.110.3) @@ -37178,19 +36908,19 @@ 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(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) '@whatwg-node/disposablestack@0.0.6': dependencies: '@whatwg-node/promise-helpers': 1.3.2 tslib: 2.8.1 - '@whatwg-node/fetch@0.10.13': + '@whatwg-node/fetch@0.10.11': dependencies: - '@whatwg-node/node-fetch': 0.8.6 + '@whatwg-node/node-fetch': 0.8.1 urlpattern-polyfill: 10.1.0 - '@whatwg-node/node-fetch@0.8.6': + '@whatwg-node/node-fetch@0.8.1': dependencies: '@fastify/busboy': 3.1.1 '@whatwg-node/disposablestack': 0.0.6 @@ -37201,11 +36931,11 @@ snapshots: dependencies: tslib: 2.8.1 - '@whatwg-node/server@0.11.0': + '@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/fetch': 0.10.11 '@whatwg-node/promise-helpers': 1.3.2 tslib: 2.8.1 @@ -37220,13 +36950,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.9(react@19.2.9))(react@19.2.9)': + '@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)': dependencies: '@tanstack/react-router': link:packages/react-router '@tanstack/react-start': link:packages/react-start '@workos/authkit-session': 0.3.4 - react: 19.2.9 - react-dom: 19.2.9(react@19.2.9) + react: 19.2.3 + react-dom: 19.2.3(react@19.2.3) '@xtuc/ieee754@1.2.0': {} @@ -37258,9 +36988,9 @@ snapshots: mime-types: 3.0.1 negotiator: 1.0.0 - acorn-import-attributes@1.9.5(acorn@8.18.0): + acorn-import-attributes@1.9.5(acorn@8.15.0): dependencies: - acorn: 8.18.0 + acorn: 8.15.0 acorn-jsx@5.3.2(acorn@8.15.0): dependencies: @@ -37288,12 +37018,16 @@ snapshots: dependencies: ajv: 8.18.0 - ajv-formats@2.1.1: - dependencies: + ajv-formats@2.1.1(ajv@8.18.0): + optionalDependencies: ajv: 8.18.0 - ajv-formats@3.0.1: - dependencies: + 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: 8.17.1 ajv-keywords@3.5.2(ajv@6.12.6): @@ -37375,17 +37109,25 @@ snapshots: normalize-path: 3.0.0 picomatch: 2.3.1 - archiver@8.0.0: + archiver-utils@5.0.2: dependencies: - async: 3.2.6 - buffer-crc32: 1.0.0 - is-stream: 4.0.1 + 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 - readdir-glob: 3.0.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: 7.0.5 + zip-stream: 6.0.1 transitivePeerDependencies: - bare-abort-controller - bare-buffer @@ -37446,11 +37188,6 @@ snapshots: atomic-sleep@1.0.0: {} - atomically@2.1.1: - dependencies: - stubborn-fs: 2.0.0 - when-exit: 2.1.5 - autocannon@8.0.0: dependencies: '@minimistjs/subarg': 1.0.0 @@ -37488,10 +37225,18 @@ snapshots: aws-ssl-profiles@1.1.2: {} - axios@1.18.1(debug@4.4.3(supports-color@10.2.2))(supports-color@10.2.2): + axios@1.16.0(debug@4.4.3(supports-color@10.2.2)): dependencies: follow-redirects: 1.16.0(debug@4.4.3(supports-color@10.2.2)) - form-data: 4.0.6 + form-data: 4.0.5 + proxy-from-env: 2.1.0 + transitivePeerDependencies: + - debug + + axios@1.17.0(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@10.2.2)) + form-data: 4.0.5 https-proxy-agent: 5.0.1(supports-color@10.2.2) proxy-from-env: 2.1.0 transitivePeerDependencies: @@ -37513,7 +37258,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.1)(webpack-cli@5.1.4) + webpack: 5.97.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(esbuild@0.28.2)(webpack-cli@5.1.4) babel-plugin-jsx-dom-expressions@0.40.3(@babel/core@7.28.5(supports-color@10.2.2)): dependencies: @@ -37568,8 +37313,6 @@ snapshots: balanced-match@4.0.3: {} - balanced-match@4.0.4: {} - bare-events@2.9.1: {} bare-fs@4.7.2: @@ -37601,7 +37344,7 @@ snapshots: base64-js@1.5.1: {} - baseline-browser-mapping@2.11.23: {} + baseline-browser-mapping@2.9.8: {} batch@0.6.1: {} @@ -37614,15 +37357,15 @@ 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.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)): + better-auth@1.6.19(@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)(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)): 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.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/core': 1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.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)(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)(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)(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)(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)(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/telemetry': 1.6.19(@better-auth/core@1.6.19(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.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 '@noble/ciphers': 2.2.0 @@ -37634,15 +37377,14 @@ 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.9(react@19.2.9))(react@19.2.9)) + '@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': 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.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) + 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) 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.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(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.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)) vue: 3.5.25(@typescript/typescript6@6.0.2) transitivePeerDependencies: - '@cloudflare/workers-types' @@ -37665,8 +37407,6 @@ snapshots: dependencies: require-from-string: 2.0.2 - big.js@5.2.2: {} - binary-extensions@2.3.0: {} bindings@1.5.0: @@ -37730,13 +37470,9 @@ snapshots: dependencies: balanced-match: 1.0.2 - brace-expansion@5.0.12: + brace-expansion@5.0.6: dependencies: - balanced-match: 4.0.4 - - brace-expansion@5.0.9: - dependencies: - balanced-match: 4.0.4 + balanced-match: 4.0.3 braces@3.0.3: dependencies: @@ -37751,12 +37487,14 @@ snapshots: browserslist@4.28.1: dependencies: - baseline-browser-mapping: 2.11.23 + baseline-browser-mapping: 2.9.8 caniuse-lite: 1.0.30001760 electron-to-chromium: 1.5.267 node-releases: 2.0.27 update-browserslist-db: 1.2.3(browserslist@4.28.1) + buffer-crc32@0.2.13: {} + buffer-crc32@1.0.0: {} buffer-equal-constant-time@1.0.1: {} @@ -37780,7 +37518,7 @@ snapshots: bundle-name@4.1.0: dependencies: - run-applescript: 7.1.0 + run-applescript: 7.0.0 bytes@3.1.2: {} @@ -37801,7 +37539,22 @@ snapshots: pkg-types: 2.3.0 rc9: 2.1.2 - cac@7.1.0: {} + 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 call-bind-apply-helpers@1.0.2: dependencies: @@ -37833,25 +37586,12 @@ snapshots: caniuse-lite@1.0.30001760: {} - 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: {} + chai@6.2.2: {} chalk@3.0.0: dependencies: ansi-styles: 4.3.0 supports-color: 7.2.0 - optional: true chalk@4.1.2: dependencies: @@ -37860,8 +37600,6 @@ snapshots: chalk@5.6.2: {} - chalk@6.0.0: {} - char-regex@1.0.2: {} char-spinner@1.0.1: {} @@ -37932,8 +37670,6 @@ snapshots: cjs-module-lexer@1.4.3: {} - cjs-module-lexer@2.2.1: {} - classnames@2.5.1: {} clean-css@5.3.3: @@ -37955,8 +37691,6 @@ snapshots: cli-spinners@2.6.1: {} - cli-spinners@2.9.2: {} - cli-table3@0.6.5: dependencies: string-width: 4.2.3 @@ -37965,7 +37699,11 @@ snapshots: cli-width@4.1.0: {} - client-only@0.0.1: {} + clipboardy@4.0.0: + dependencies: + execa: 8.0.1 + is-wsl: 3.1.1 + is64bit: 2.0.0 cliui@7.0.4: dependencies: @@ -37979,6 +37717,12 @@ 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 @@ -37989,8 +37733,7 @@ snapshots: clsx@2.1.1: {} - cluster-key-slot@1.1.1: - optional: true + cluster-key-slot@1.1.1: {} color-convert@2.0.1: dependencies: @@ -38017,8 +37760,6 @@ snapshots: colorette@2.0.20: {} - colorjs.io@0.7.1: {} - combinate@1.1.11: {} combined-stream@1.0.8: @@ -38049,13 +37790,17 @@ snapshots: common-tags@1.8.2: {} + commondir@1.0.1: {} + compare-versions@6.1.1: {} - compress-commons@7.0.1: + compatx@0.2.0: {} + + compress-commons@6.0.2: dependencies: crc-32: 1.2.2 - crc32-stream: 7.0.1 - is-stream: 4.0.1 + crc32-stream: 6.0.0 + is-stream: 2.0.1 normalize-path: 3.0.0 readable-stream: 4.7.0 @@ -38116,6 +37861,10 @@ snapshots: confbox@0.2.2: {} + confbox@0.2.4: {} + + confbox@0.3.1: {} + config-chain@1.1.13: dependencies: ini: 1.3.8 @@ -38141,46 +37890,50 @@ 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.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): + 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): dependencies: - 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: 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) optionalDependencies: '@standard-schema/spec': 1.1.0 - hono: 4.13.9 - react: 19.2.9 + hono: 4.7.10 + react: 19.2.3 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.9(react@19.2.9))(react@19.2.9))(react@19.2.9)(solid-js@1.9.12): + 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): 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.9(react@19.2.9))(react@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) 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.9(react@19.2.9))(react@19.2.9))(react-dom@19.2.9(react@19.2.9))(react@19.2.9): + 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): 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.9(react@19.2.9))(react@19.2.9) - react: 19.2.9 - react-dom: 19.2.9(react@19.2.9) + '@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) - 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@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): dependencies: esbuild: 0.25.4 prettier: 3.8.1 optionalDependencies: - '@clerk/clerk-react': 5.59.3(react-dom@19.2.9(react@19.2.9))(react@19.2.9) - react: 19.2.9 + '@clerk/clerk-react': 5.59.3(react-dom@19.2.3(react@19.2.3))(react@19.2.3) + react: 19.2.3 + + cookie-es@1.2.2: {} cookie-es@1.2.3: {} + cookie-es@2.0.1: {} + cookie-es@3.1.1: {} cookie-signature@1.0.6: {} @@ -38191,10 +37944,6 @@ snapshots: cookie@1.0.2: {} - cookie@1.1.1: {} - - cookie@2.0.1: {} - copy-file@11.1.0: dependencies: graceful-fs: 4.2.11 @@ -38221,15 +37970,17 @@ snapshots: crc-32@1.2.2: {} - crc32-stream@7.0.1: + crc32-stream@6.0.0: dependencies: crc-32: 1.2.2 readable-stream: 4.7.0 - cron-parser@5.10.1: + cron-parser@4.9.0: dependencies: luxon: 3.7.2 + croner@10.0.1: {} + cross-argv@2.0.0: {} cross-env@10.0.0: @@ -38247,9 +37998,21 @@ snapshots: dependencies: uncrypto: 0.1.3 - crossws@0.4.12(srvx@1.0.5): + crossws@0.4.12(srvx@0.11.22): optionalDependencies: - srvx: 1.0.5 + 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 css-loader@7.1.2(webpack@5.97.1): dependencies: @@ -38262,7 +38025,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.1)(webpack-cli@5.1.4) + webpack: 5.97.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(esbuild@0.28.2)(webpack-cli@5.1.4) css-select@4.3.0: dependencies: @@ -38283,7 +38046,7 @@ snapshots: css-tree@2.2.1: dependencies: mdn-data: 2.0.28 - source-map-js: 1.2.2 + source-map-js: 1.2.1 css-tree@3.2.1: dependencies: @@ -38342,7 +38105,11 @@ snapshots: dependencies: '@babel/runtime': 7.26.7 - db0@0.4.1: {} + 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 de-indent@1.0.2: {} @@ -38368,7 +38135,7 @@ snapshots: optionalDependencies: babel-plugin-macros: 3.1.0 - dedent@1.7.2(babel-plugin-macros@3.1.0): + dedent@1.7.0(babel-plugin-macros@3.1.0): optionalDependencies: babel-plugin-macros: 3.1.0 @@ -38399,12 +38166,12 @@ snapshots: deepmerge@4.3.1: {} - default-browser-id@5.0.1: {} + default-browser-id@5.0.0: {} - default-browser@5.2.1: + default-browser@5.5.1: dependencies: bundle-name: 4.1.0 - default-browser-id: 5.0.1 + default-browser-id: 5.0.0 defaults@1.0.4: dependencies: @@ -38416,6 +38183,8 @@ snapshots: es-errors: 1.3.0 gopd: 1.2.0 + define-lazy-prop@2.0.0: {} + define-lazy-prop@3.0.0: {} define-properties@1.2.1: @@ -38446,8 +38215,7 @@ snapshots: detect-indent@6.1.0: {} - detect-libc@1.0.3: - optional: true + detect-libc@1.0.3: {} detect-libc@2.0.2: {} @@ -38473,11 +38241,11 @@ snapshots: dependencies: node-source-walk: 7.0.1 - detective-postcss@7.0.1(postcss@8.5.29): + detective-postcss@7.0.1(postcss@8.5.8): dependencies: is-url: 1.2.4 - postcss: 8.5.29 - postcss-values-parser: 6.0.2(postcss@8.5.29) + postcss: 8.5.8 + postcss-values-parser: 6.0.2(postcss@8.5.8) detective-sass@6.0.1: dependencies: @@ -38517,7 +38285,7 @@ snapshots: dexie@4.2.1: {} - diff@9.0.0: {} + diff@8.0.4: {} dir-glob@3.0.1: dependencies: @@ -38579,13 +38347,17 @@ 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 dotenv-expand@12.0.3: dependencies: - dotenv: 16.6.1 + dotenv: 16.4.7 dotenv@16.4.7: {} @@ -38593,6 +38365,8 @@ snapshots: dotenv@17.2.3: {} + dotenv@17.4.2: {} + dotenv@8.6.0: {} dunder-proto@1.0.1: @@ -38601,6 +38375,8 @@ snapshots: es-errors: 1.3.0 gopd: 1.2.0 + duplexer@0.1.2: {} + eastasianwidth@0.2.0: {} ecdsa-sig-formatter@1.0.11: @@ -38612,7 +38388,7 @@ snapshots: '@one-ini/wasm': 0.1.1 commander: 10.0.1 minimatch: 9.0.1 - semver: 7.8.5 + semver: 7.8.2 ee-first@1.1.1: {} @@ -38627,14 +38403,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: {} @@ -38672,6 +38448,10 @@ snapshots: graceful-fs: 4.2.11 tapable: 2.3.3 + enquirer@2.3.6: + dependencies: + ansi-colors: 4.1.3 + enquirer@2.4.1: dependencies: ansi-colors: 4.1.3 @@ -38689,12 +38469,13 @@ snapshots: env-paths@3.0.0: {} - env-runner@0.2.3: + env-runner@0.1.6(miniflare@4.20260317.0): dependencies: - crossws: 0.4.12(srvx@1.0.5) - exsolve: 1.1.1 - httpxy: 0.5.5 - srvx: 1.0.5 + crossws: 0.4.5(srvx@0.11.22) + httpxy: 0.3.1 + srvx: 0.11.22 + optionalDependencies: + miniflare: 4.20260317.0 envinfo@7.14.0: {} @@ -38726,11 +38507,11 @@ snapshots: es-module-lexer@1.7.0: {} - es-module-lexer@2.3.2: {} + es-module-lexer@2.3.1: {} - es-module-lexer@3.0.3: {} - - es-module-lexer@3.0.4: {} + es-object-atoms@1.1.1: + dependencies: + es-errors: 1.3.0 es-object-atoms@1.1.2: dependencies: @@ -38741,7 +38522,7 @@ snapshots: es-errors: 1.3.0 get-intrinsic: 1.3.0 has-tostringtag: 1.0.2 - hasown: 2.0.4 + hasown: 2.0.2 esbuild-plugin-solid@0.6.0(esbuild@0.27.4)(solid-js@1.9.12)(supports-color@10.2.2): dependencies: @@ -38903,34 +38684,34 @@ snapshots: '@esbuild/win32-ia32': 0.27.4 '@esbuild/win32-x64': 0.27.4 - esbuild@0.28.1: + esbuild@0.28.2: optionalDependencies: - '@esbuild/aix-ppc64': 0.28.1 - '@esbuild/android-arm': 0.28.1 - '@esbuild/android-arm64': 0.28.1 - '@esbuild/android-x64': 0.28.1 - '@esbuild/darwin-arm64': 0.28.1 - '@esbuild/darwin-x64': 0.28.1 - '@esbuild/freebsd-arm64': 0.28.1 - '@esbuild/freebsd-x64': 0.28.1 - '@esbuild/linux-arm': 0.28.1 - '@esbuild/linux-arm64': 0.28.1 - '@esbuild/linux-ia32': 0.28.1 - '@esbuild/linux-loong64': 0.28.1 - '@esbuild/linux-mips64el': 0.28.1 - '@esbuild/linux-ppc64': 0.28.1 - '@esbuild/linux-riscv64': 0.28.1 - '@esbuild/linux-s390x': 0.28.1 - '@esbuild/linux-x64': 0.28.1 - '@esbuild/netbsd-arm64': 0.28.1 - '@esbuild/netbsd-x64': 0.28.1 - '@esbuild/openbsd-arm64': 0.28.1 - '@esbuild/openbsd-x64': 0.28.1 - '@esbuild/openharmony-arm64': 0.28.1 - '@esbuild/sunos-x64': 0.28.1 - '@esbuild/win32-arm64': 0.28.1 - '@esbuild/win32-ia32': 0.28.1 - '@esbuild/win32-x64': 0.28.1 + '@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: {} @@ -38953,7 +38734,7 @@ snapshots: eslint-compat-utils@0.5.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) - semver: 7.8.5 + semver: 7.8.2 eslint-import-context@0.1.9(unrs-resolver@1.11.1): dependencies: @@ -38969,7 +38750,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-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-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): dependencies: '@typescript-eslint/types': 8.53.0 comment-parser: 1.4.1 @@ -38978,9 +38759,11 @@ snapshots: eslint-import-context: 0.1.9(unrs-resolver@1.11.1) is-glob: 4.0.3 minimatch: 10.2.5 - semver: 7.8.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@10.2.2))(supports-color@10.2.2) transitivePeerDependencies: - supports-color @@ -38994,7 +38777,7 @@ snapshots: globals: 15.14.0 globrex: 0.1.2 ignore: 5.3.2 - semver: 7.8.5 + semver: 7.8.2 ts-declaration-location: 1.0.7(@typescript/typescript6@6.0.2) transitivePeerDependencies: - typescript @@ -39009,7 +38792,7 @@ snapshots: globals: 15.14.0 globrex: 0.1.2 ignore: 5.3.2 - semver: 7.8.5 + semver: 7.8.2 ts-declaration-location: 1.0.7(@typescript/typescript6@6.0.2) transitivePeerDependencies: - typescript @@ -39152,9 +38935,11 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-plugin-unused-imports@4.1.4(eslint@9.22.0(jiti@2.7.0)(supports-color@10.2.2)): + 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@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))(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) + 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@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) 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: @@ -39263,7 +39048,7 @@ snapshots: estree-walker@3.0.3: dependencies: - '@types/estree': 1.0.9 + '@types/estree': 1.0.8 esutils@2.0.3: {} @@ -39293,7 +39078,7 @@ snapshots: signal-exit: 4.1.0 strip-final-newline: 3.0.0 - expect-type@1.4.0: {} + expect-type@1.3.0: {} express@4.22.2(supports-color@10.2.2): dependencies: @@ -39366,10 +39151,18 @@ snapshots: exsolve@1.1.1: {} - exsolve@1.2.0: {} - extendable-error@0.1.7: {} + extract-zip@2.0.1(supports-color@10.2.2): + dependencies: + debug: 4.4.3(supports-color@10.2.2) + get-stream: 5.2.0 + yauzl: 2.10.0 + optionalDependencies: + '@types/yauzl': 2.10.3 + transitivePeerDependencies: + - supports-color + fast-check@3.23.2: dependencies: pure-rand: 6.1.0 @@ -39394,7 +39187,7 @@ snapshots: dependencies: '@fastify/merge-json-schemas': 0.2.1 ajv: 8.17.1 - ajv-formats: 3.0.1 + ajv-formats: 3.0.1(ajv@8.17.1) fast-uri: 3.0.6 json-schema-ref-resolver: 3.0.0 rfdc: 1.4.1 @@ -39409,18 +39202,8 @@ snapshots: fast-sha256@1.3.0: {} - fast-string-truncated-width@3.0.3: {} - - fast-string-width@3.0.2: - dependencies: - fast-string-truncated-width: 3.0.3 - fast-uri@3.0.6: {} - fast-wrap-ansi@0.2.0: - dependencies: - fast-string-width: 3.0.2 - fastest-levenshtein@1.0.16: {} fastify@5.7.1: @@ -39438,7 +39221,7 @@ snapshots: process-warning: 5.0.0 rfdc: 1.4.1 secure-json-parse: 4.1.0 - semver: 7.8.5 + semver: 7.8.2 toad-cache: 3.7.0 fastq@1.19.0: @@ -39449,6 +39232,10 @@ snapshots: dependencies: websocket-driver: 0.7.4 + fd-slicer@1.1.0: + dependencies: + pend: 1.2.0 + fdir@6.5.0(picomatch@4.0.3): optionalDependencies: picomatch: 4.0.3 @@ -39464,7 +39251,7 @@ snapshots: node-domexception: 1.0.0 web-streams-polyfill: 3.3.3 - fetchdts@0.2.0: {} + fetchdts@0.1.7: {} fflate@0.8.3: {} @@ -39531,6 +39318,11 @@ 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 @@ -39579,8 +39371,6 @@ 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)): @@ -39604,29 +39394,21 @@ snapshots: hasown: 2.0.2 mime-types: 2.1.35 - form-data@4.0.6: - dependencies: - asynckit: 0.4.0 - combined-stream: 1.0.8 - es-set-tostringtag: 2.1.0 - hasown: 2.0.4 - mime-types: 2.1.35 - formdata-polyfill@4.0.10: dependencies: fetch-blob: 3.2.0 forwarded@0.2.0: {} - 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): + 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): 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.9 - react-dom: 19.2.9(react@19.2.9) + react: 19.2.3 + react-dom: 19.2.3(react@19.2.3) fresh@0.5.2: {} @@ -39646,6 +39428,9 @@ snapshots: jsonfile: 4.0.0 universalify: 0.1.2 + fsevents@2.3.2: + optional: true + fsevents@2.3.3: optional: true @@ -39666,17 +39451,19 @@ 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 es-define-property: 1.0.1 es-errors: 1.3.0 - es-object-atoms: 1.1.2 + es-object-atoms: 1.1.1 function-bind: 1.1.2 get-proto: 1.0.1 gopd: 1.2.0 has-symbols: 1.1.0 - hasown: 2.0.4 + hasown: 2.0.2 math-intrinsics: 1.1.0 get-nonce@1.0.1: {} @@ -39690,7 +39477,11 @@ snapshots: get-proto@1.0.1: dependencies: dunder-proto: 1.0.1 - es-object-atoms: 1.1.2 + es-object-atoms: 1.1.1 + + get-stream@5.2.0: + dependencies: + pump: 3.0.3 get-stream@8.0.1: {} @@ -39707,6 +39498,8 @@ snapshots: nypm: 0.6.0 pathe: 2.0.3 + giget@3.3.1: {} + gl-matrix@3.4.4: {} glob-parent@5.1.2: @@ -39755,6 +39548,16 @@ 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: @@ -39779,7 +39582,9 @@ snapshots: graphql@16.10.0: {} - graphql@16.14.2: {} + gzip-size@7.0.0: + dependencies: + duplexer: 0.1.2 h3@1.15.11: dependencies: @@ -39793,13 +39598,38 @@ snapshots: ufo: 1.6.4 uncrypto: 0.1.3 - h3@2.0.1-rc.32(crossws@0.4.12(srvx@1.0.5))(ocache@0.3.0): + h3@1.15.5: dependencies: - rou3: 0.9.2 - srvx: 1.0.5 + cookie-es: 1.2.2 + crossws: 0.3.5 + defu: 6.1.4 + destr: 2.0.5 + iron-webcrypto: 1.2.1 + node-mock-http: 1.0.4 + radix3: 1.1.2 + ufo: 1.6.4 + uncrypto: 0.1.3 + + h3@2.0.1-rc.14(crossws@0.4.3(srvx@0.10.1)): + dependencies: + rou3: 0.7.12 + srvx: 0.11.22 optionalDependencies: - crossws: 0.4.12(srvx@1.0.5) - ocache: 0.3.0 + 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) handle-thing@2.0.1: {} @@ -39841,11 +39671,6 @@ snapshots: headers-polyfill@4.0.3: {} - headers-polyfill@5.0.1: - dependencies: - '@types/set-cookie-parser': 2.4.10 - set-cookie-parser: 3.1.0 - hey-listen@1.0.8: {} highlight.js@10.7.3: {} @@ -39854,26 +39679,16 @@ 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@6.1.2: {} + hookable@5.5.3: {} + + hookable@6.1.0: {} hosted-git-info@7.0.2: dependencies: lru-cache: 10.4.3 - hosted-git-info@9.0.3: - dependencies: - lru-cache: 11.5.1 - hpack.js@2.1.6: dependencies: inherits: 2.0.4 @@ -40016,6 +39831,8 @@ snapshots: transitivePeerDependencies: - supports-color + httpxy@0.3.1: {} + httpxy@0.5.5: {} human-id@4.1.1: {} @@ -40052,29 +39869,21 @@ snapshots: ignore@5.3.2: {} - ignore@7.0.12: {} - ignore@7.0.5: {} image-meta@0.2.2: {} + image-size@2.0.2: {} + immer@10.1.1: {} immutable@5.1.4: {} - immutable@5.1.9: {} - import-fresh@3.3.0: dependencies: parent-module: 1.0.1 resolve-from: 4.0.0 - import-in-the-middle@3.5.1: - dependencies: - cjs-module-lexer: 2.2.1 - es-module-lexer: 3.0.3 - module-details-from-path: 1.0.4 - import-lazy@4.0.0: {} import-local@3.2.0: @@ -40117,29 +39926,28 @@ 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.4.1)(ioredis@5.11.1(supports-color@10.2.2))(srvx@1.0.5): + ipx@3.1.1(@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: '@fastify/accept-negotiator': 2.0.1 citty: 0.1.6 consola: 3.4.2 - defu: 6.1.7 + defu: 6.1.4 destr: 2.0.5 etag: 1.8.1 - h3: 1.15.11 + h3: 1.15.5 image-meta: 0.2.2 - listhen: 1.10.1(srvx@1.0.5) + listhen: 1.9.0 ofetch: 1.5.1 pathe: 2.0.3 - sharp: 0.34.5 + sharp: 0.34.4 svgo: 4.0.0 ufo: 1.6.4 - 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)) + unstorage: 1.17.4(@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)) xss: 1.0.15 transitivePeerDependencies: - '@azure/app-configuration' @@ -40151,7 +39959,6 @@ snapshots: - '@capacitor/preferences' - '@deno/kv' - '@netlify/blobs' - - '@parcel/watcher' - '@planetscale/database' - '@upstash/redis' - '@vercel/blob' @@ -40161,14 +39968,8 @@ snapshots: - db0 - idb-keyval - ioredis - - srvx - uploadthing - iron-session@9.0.1: - dependencies: - cookie: 2.0.1 - iron-webcrypto: 2.0.0 - iron-webcrypto@1.2.1: {} iron-webcrypto@2.0.0: @@ -40212,6 +40013,8 @@ snapshots: call-bound: 1.0.4 has-tostringtag: 1.0.2 + is-docker@2.2.1: {} + is-docker@3.0.0: {} is-extglob@2.1.1: {} @@ -40236,6 +40039,8 @@ snapshots: transitivePeerDependencies: - supports-color + is-in-ssh@1.0.0: {} + is-inside-container@1.0.0: dependencies: is-docker: 3.0.0 @@ -40244,6 +40049,8 @@ snapshots: is-map@2.0.3: {} + is-module@1.0.0: {} + is-network-error@1.1.0: {} is-node-process@1.2.0: {} @@ -40275,6 +40082,10 @@ 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 @@ -40328,10 +40139,18 @@ snapshots: is-windows@1.0.2: {} - is-wsl@3.1.0: + is-wsl@2.2.0: + dependencies: + is-docker: 2.2.1 + + is-wsl@3.1.1: dependencies: is-inside-container: 1.0.0 + is64bit@2.0.0: + dependencies: + system-architecture: 0.1.0 + isarray@1.0.0: {} isarray@2.0.5: {} @@ -40364,6 +40183,8 @@ snapshots: jose@6.1.3: {} + jpeg-js@0.4.4: {} + js-base64@3.7.8: {} js-beautify@1.15.4: @@ -40376,12 +40197,18 @@ snapshots: js-cookie@3.0.5: {} + js-image-generator@1.0.4: + dependencies: + jpeg-js: 0.4.4 + 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 @@ -40494,7 +40321,7 @@ snapshots: json5@2.2.3: {} - jsonc-parser@3.3.1: {} + jsonc-parser@3.2.0: {} jsonfile@4.0.0: optionalDependencies: @@ -40502,9 +40329,9 @@ snapshots: jsonpointer@5.0.1: {} - jsonwebtoken@9.0.3: + jsonwebtoken@9.0.2: dependencies: - jws: 4.0.1 + jws: 3.2.2 lodash.includes: 4.3.0 lodash.isboolean: 3.0.3 lodash.isinteger: 4.0.4 @@ -40513,19 +40340,19 @@ snapshots: lodash.isstring: 4.0.1 lodash.once: 4.1.1 ms: 2.1.3 - semver: 7.8.5 + semver: 7.8.2 junk@4.0.1: {} - jwa@2.0.1: + jwa@1.4.2: dependencies: buffer-equal-constant-time: 1.0.1 ecdsa-sig-formatter: 1.0.11 safe-buffer: 5.2.1 - jws@4.0.1: + jws@3.2.2: dependencies: - jwa: 2.0.1 + jwa: 1.4.2 safe-buffer: 5.2.1 jwt-decode@3.1.2: {} @@ -40542,6 +40369,10 @@ snapshots: kleur@4.1.5: {} + klona@2.0.6: {} + + knitwork@1.3.0: {} + known-css-properties@0.30.0: {} kolorist@1.8.0: {} @@ -40606,7 +40437,7 @@ snapshots: light-my-request@6.6.0: dependencies: - cookie: 1.1.1 + cookie: 1.0.2 process-warning: 4.0.1 set-cookie-parser: 2.7.2 @@ -40714,12 +40545,12 @@ snapshots: lines-and-columns@2.0.3: {} - listhen@1.10.1(srvx@1.0.5): + listhen@1.10.1(srvx@0.11.22): dependencies: '@parcel/watcher-wasm': 2.6.0 citty: 0.2.2 consola: 3.4.2 - crossws: 0.4.12(srvx@1.0.5) + crossws: 0.4.12(srvx@0.11.22) defu: 6.1.7 get-port-please: 3.2.0 h3: 1.15.11 @@ -40735,19 +40566,40 @@ snapshots: transitivePeerDependencies: - srvx - loader-runner@4.3.0: {} - - loader-utils@2.0.4: + listhen@1.9.0: dependencies: - big.js: 5.2.2 - emojis-list: 3.0.0 - json5: 2.2.3 + '@parcel/watcher': 2.5.1 + '@parcel/watcher-wasm': 2.5.1 + citty: 0.1.6 + clipboardy: 4.0.0 + consola: 3.4.2 + crossws: 0.3.5 + defu: 6.1.4 + get-port-please: 3.2.0 + h3: 1.15.5 + http-shutdown: 1.2.2 + jiti: 2.7.0 + mlly: 1.8.0 + node-forge: 1.3.1 + pathe: 1.1.2 + std-env: 3.10.0 + ufo: 1.6.4 + untun: 0.1.3 + uqr: 0.1.2 + + loader-runner@4.3.0: {} 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 @@ -40838,15 +40690,17 @@ snapshots: magic-string@0.30.8: dependencies: - '@jridgewell/sourcemap-codec': 1.6.0 + '@jridgewell/sourcemap-codec': 1.5.5 - magic-string@1.4.3: + magic-string@1.2.3: dependencies: - '@jridgewell/sourcemap-codec': 1.6.0 + '@jridgewell/sourcemap-codec': 1.5.5 - magic-string@1.4.5: + magicast@0.5.4: dependencies: - '@jridgewell/sourcemap-codec': 1.6.0 + '@babel/parser': 7.29.8 + '@babel/types': 7.29.8 + source-map-js: 1.2.1 manage-path@2.0.0: {} @@ -40930,6 +40784,8 @@ snapshots: mime@1.6.0: {} + mime@4.1.0: {} + mimic-fn@2.1.0: {} mimic-fn@4.0.0: {} @@ -40948,24 +40804,11 @@ 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: dependencies: - brace-expansion: 5.0.9 + brace-expansion: 5.0.6 minimatch@3.0.8: dependencies: @@ -40975,6 +40818,10 @@ 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 @@ -40985,22 +40832,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.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): + 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.15)(sharp@0.34.5)(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.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: 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.15)(sharp@0.34.5)(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.1 + esbuild: 0.28.2 html-minifier-terser: 6.1.0 lightningcss: 1.33.0 - postcss: 8.5.29 - sharp: 0.35.5(@types/node@25.0.9) + postcss: 8.5.15 + sharp: 0.34.5 svgo: 4.0.0 minipass@7.1.2: {} @@ -41010,10 +40857,6 @@ snapshots: minipass: 7.1.2 rimraf: 5.0.10 - minizlib@3.1.0: - dependencies: - minipass: 7.1.2 - mkdirp@3.0.1: {} mlly@1.8.0: @@ -41023,13 +40866,18 @@ 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 node-source-walk: 7.0.1 - module-details-from-path@1.0.4: {} - motion-dom@11.18.1: dependencies: motion-utils: 11.18.1 @@ -41044,57 +40892,6 @@ snapshots: ms@2.1.3: {} - msw@2.15.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2): - dependencies: - '@inquirer/confirm': 6.3.2(@types/node@25.0.9) - '@mswjs/interceptors': 0.41.9 - '@open-draft/deferred-promise': 3.0.0 - '@types/statuses': 2.0.6 - cookie: 1.1.1 - graphql: 16.14.2 - headers-polyfill: 5.0.1 - is-node-process: 1.2.0 - outvariant: 1.4.3 - path-to-regexp: 6.3.0 - picocolors: 1.1.1 - rettime: 0.11.11 - statuses: 2.0.2 - strict-event-emitter: 0.5.1 - tough-cookie: 6.0.1 - type-fest: 5.9.0 - until-async: 3.0.2 - yargs: 17.7.2 - optionalDependencies: - typescript: '@typescript/typescript6@6.0.2' - transitivePeerDependencies: - - '@types/node' - - msw@2.15.0(@types/node@25.0.9)(typescript@5.9.2): - dependencies: - '@inquirer/confirm': 6.3.2(@types/node@25.0.9) - '@mswjs/interceptors': 0.41.9 - '@open-draft/deferred-promise': 3.0.0 - '@types/statuses': 2.0.6 - cookie: 1.1.1 - graphql: 16.14.2 - headers-polyfill: 5.0.1 - is-node-process: 1.2.0 - outvariant: 1.4.3 - path-to-regexp: 6.3.0 - picocolors: 1.1.1 - rettime: 0.11.11 - statuses: 2.0.2 - strict-event-emitter: 0.5.1 - tough-cookie: 6.0.1 - type-fest: 5.9.0 - until-async: 3.0.2 - yargs: 17.7.2 - optionalDependencies: - typescript: 5.9.2 - transitivePeerDependencies: - - '@types/node' - optional: true - msw@2.7.0(@types/node@25.0.9)(@typescript/typescript6@6.0.2): dependencies: '@bundled-es-modules/cookie': 2.0.1 @@ -41120,6 +40917,32 @@ snapshots: transitivePeerDependencies: - '@types/node' + msw@2.7.0(@types/node@25.0.9)(typescript@5.9.2): + dependencies: + '@bundled-es-modules/cookie': 2.0.1 + '@bundled-es-modules/statuses': 1.0.1 + '@bundled-es-modules/tough-cookie': 0.1.6 + '@inquirer/confirm': 5.1.4(@types/node@25.0.9) + '@mswjs/interceptors': 0.37.6 + '@open-draft/deferred-promise': 2.2.0 + '@open-draft/until': 2.1.0 + '@types/cookie': 0.6.0 + '@types/statuses': 2.0.5 + graphql: 16.10.0 + headers-polyfill: 4.0.3 + is-node-process: 1.2.0 + outvariant: 1.4.3 + path-to-regexp: 6.3.0 + picocolors: 1.1.1 + strict-event-emitter: 0.5.1 + type-fest: 4.41.0 + yargs: 17.7.2 + optionalDependencies: + typescript: 5.9.2 + transitivePeerDependencies: + - '@types/node' + optional: true + muggle-string@0.4.1: {} multicast-dns@7.2.5: @@ -41129,8 +40952,6 @@ snapshots: mute-stream@2.0.0: {} - mute-stream@3.0.0: {} - mysql2@3.15.3: dependencies: aws-ssl-profiles: 1.1.2 @@ -41155,9 +40976,7 @@ snapshots: nanoid@3.3.11: {} - nanoid@3.3.18: {} - - nanoid@3.3.19: {} + nanoid@3.3.12: {} nanostores@1.3.0: {} @@ -41175,90 +40994,232 @@ 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.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.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 + nf3@0.3.11: {} - 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 - '@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.97.2 - sharp: 0.35.4(@types/node@25.0.9) - transitivePeerDependencies: - - '@babel/core' - - '@types/node' - - babel-plugin-macros + nf3@0.3.6: {} - nf3@0.3.24: {} - - nitro@3.0.260903-beta: + nitro@3.0.1-alpha.2(@electric-sql/pglite@0.3.2)(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)(@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)): dependencies: consola: 3.4.2 - 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 + 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.1) + oxc-transform: 0.110.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1) + srvx: 0.10.1 + undici: 7.24.4 unenv: 2.0.0-rc.24 - unstorage: 2.0.0-alpha.10 + 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.2)(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)(@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.1)(@emnapi/runtime@1.11.1) + 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.1.1(@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.1.1(@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 no-case@3.0.4: dependencies: lower-case: 2.0.2 tslib: 2.8.1 - node-addon-api@7.1.1: - optional: true + node-addon-api@7.1.1: {} node-domexception@1.0.0: {} @@ -41312,13 +41273,7 @@ snapshots: normalize-package-data@6.0.2: dependencies: hosted-git-info: 7.0.2 - semver: 7.8.5 - validate-npm-package-license: 3.0.4 - - normalize-package-data@8.0.0: - dependencies: - hosted-git-info: 9.0.3 - semver: 7.8.5 + semver: 7.8.2 validate-npm-package-license: 3.0.4 normalize-path@2.1.1: @@ -41341,10 +41296,8 @@ snapshots: nwsapi@2.2.16: {} - 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)): + nx@22.7.5(@swc-node/register@1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)(@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))(debug@4.4.3(supports-color@10.2.2)): dependencies: - '@clack/core': 1.4.3 - '@clack/prompts': 1.7.0 '@emnapi/core': 1.4.5 '@emnapi/runtime': 1.4.5 '@emnapi/wasi-threads': 1.0.4 @@ -41353,14 +41306,18 @@ snapshots: '@tybys/wasm-util': 0.9.0 '@yarnpkg/lockfile': 1.1.0 '@zkochan/js-yaml': 0.0.7 + ansi-colors: 4.1.3 ansi-regex: 5.0.1 ansi-styles: 4.3.0 argparse: 2.0.1 + asynckit: 0.4.0 + axios: 1.16.0(debug@4.4.3(supports-color@10.2.2)) balanced-match: 4.0.3 base64-js: 1.5.1 bl: 4.1.0 - brace-expansion: 5.0.12 + brace-expansion: 5.0.6 buffer: 5.7.1 + call-bind-apply-helpers: 1.0.2 chalk: 4.1.2 cli-cursor: 3.1.0 cli-spinners: 2.6.1 @@ -41368,63 +41325,83 @@ snapshots: clone: 1.0.4 color-convert: 2.0.1 color-name: 1.1.4 + combined-stream: 1.0.8 defaults: 1.0.4 + define-lazy-prop: 2.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 + enquirer: 2.3.6 + 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@10.2.2)) + form-data: 4.0.5 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.2 ieee754: 1.2.1 - ignore: 7.0.12 + ignore: 7.0.5 inherits: 2.0.4 + is-docker: 2.2.1 is-fullwidth-code-point: 3.0.0 is-interactive: 1.0.0 is-unicode-supported: 0.1.0 - isexe: 2.0.0 + is-wsl: 2.2.0 json5: 2.2.3 - jsonc-parser: 3.3.1 + jsonc-parser: 3.2.0 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 npm-run-path: 4.0.1 once: 1.4.0 onetime: 5.1.2 - ora: 5.4.1 + open: 8.4.2 + ora: 5.3.0 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 safe-buffer: 5.2.1 - semver: 7.8.5 + semver: 7.7.4 signal-exit: 3.0.7 - sisteransi: 1.0.5 - smol-toml: 1.9.0 + smol-toml: 1.6.1 string-width: 4.2.3 string_decoder: 1.3.0 strip-ansi: 6.0.1 strip-bom: 3.0.0 supports-color: 7.2.0 tar-stream: 2.2.0 - tmp: 0.2.7 + tmp: 0.2.6 + tree-kill: 1.2.2 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 wrap-ansi: 7.0.0 wrappy: 1.0.2 y18n: 5.0.8 @@ -41432,18 +41409,20 @@ snapshots: yargs: 17.7.2 yargs-parser: 21.1.1 optionalDependencies: - '@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) + '@nx/nx-darwin-arm64': 22.7.5 + '@nx/nx-darwin-x64': 22.7.5 + '@nx/nx-freebsd-x64': 22.7.5 + '@nx/nx-linux-arm-gnueabihf': 22.7.5 + '@nx/nx-linux-arm64-gnu': 22.7.5 + '@nx/nx-linux-arm64-musl': 22.7.5 + '@nx/nx-linux-x64-gnu': 22.7.5 + '@nx/nx-linux-x64-musl': 22.7.5 + '@nx/nx-win32-arm64-msvc': 22.7.5 + '@nx/nx-win32-x64-msvc': 22.7.5 + '@swc-node/register': 1.11.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)(@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) + transitivePeerDependencies: + - debug nypm@0.6.0: dependencies: @@ -41477,12 +41456,11 @@ snapshots: obuf@1.1.2: {} - obug@2.1.1: - optional: true + obug@2.1.1: {} - obug@3.0.0: {} - - ocache@0.3.0: {} + ocache@0.1.2: + dependencies: + ohash: 2.0.11 ofetch@1.5.1: dependencies: @@ -41490,8 +41468,12 @@ snapshots: node-fetch-native: 1.6.7 ufo: 1.6.4 + ofetch@2.0.0-alpha.3: {} + ohash@2.0.11: {} + omit.js@2.0.2: {} + on-exit-leak-free@2.1.2: {} on-finished@2.4.1: @@ -41522,10 +41504,25 @@ snapshots: open@10.1.0: dependencies: - default-browser: 5.2.1 + default-browser: 5.5.1 define-lazy-prop: 3.0.0 is-inside-container: 1.0.0 - is-wsl: 3.1.0 + is-wsl: 3.1.1 + + open@11.0.0: + dependencies: + default-browser: 5.5.1 + 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 + + open@8.4.2: + dependencies: + define-lazy-prop: 2.0.0 + is-docker: 2.2.1 + is-wsl: 2.2.0 optionator@0.9.4: dependencies: @@ -41536,14 +41533,13 @@ snapshots: type-check: 0.4.0 word-wrap: 1.2.5 - ora@5.4.1: + ora@5.3.0: dependencies: bl: 4.1.0 chalk: 4.1.2 cli-cursor: 3.1.0 - cli-spinners: 2.9.2 + cli-spinners: 2.6.1 is-interactive: 1.0.0 - is-unicode-supported: 0.1.0 log-symbols: 4.1.0 strip-ansi: 6.0.1 wcwidth: 1.0.1 @@ -41552,7 +41548,33 @@ snapshots: outvariant@1.4.3: {} - oxc-resolver@11.19.1(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3): + oxc-minify@0.110.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1): + 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.1) + '@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.1): optionalDependencies: '@oxc-resolver/binding-android-arm-eabi': 11.19.1 '@oxc-resolver/binding-android-arm64': 11.19.1 @@ -41570,7 +41592,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.3)(@emnapi/runtime@1.11.3) + '@oxc-resolver/binding-wasm32-wasi': 11.19.1(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1) '@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 @@ -41578,6 +41600,32 @@ snapshots: - '@emnapi/core' - '@emnapi/runtime' + oxc-transform@0.110.0(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1): + 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.1) + '@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 @@ -41624,6 +41672,10 @@ snapshots: p-try@2.2.0: {} + p-wait-for@5.0.2: + dependencies: + p-timeout: 6.1.4 + package-json-from-dist@1.0.1: {} package-manager-detector@0.2.11: @@ -41727,13 +41779,15 @@ snapshots: path-type@6.0.0: {} + pathe@1.1.2: {} + pathe@2.0.3: {} pend@1.2.0: {} perfect-debounce@1.0.0: {} - pg-gateway@0.3.0-beta.4: {} + perfect-debounce@2.1.0: {} picocolors@1.1.1: {} @@ -41741,6 +41795,8 @@ snapshots: picomatch@4.0.3: {} + picomatch@4.0.4: {} + picomatch@4.0.7: {} picoquery@2.5.0: {} @@ -41785,6 +41841,12 @@ 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 @@ -41794,11 +41856,13 @@ snapshots: pvutils: 1.1.3 tslib: 2.8.1 - playwright-core@1.63.0: {} + playwright-core@1.61.1: {} - playwright@1.63.0: + playwright@1.61.1: dependencies: - playwright-core: 1.63.0 + playwright-core: 1.61.1 + optionalDependencies: + fsevents: 2.3.2 possible-typed-array-names@1.1.0: {} @@ -41809,7 +41873,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.1)(webpack-cli@5.1.4) + webpack: 5.97.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(esbuild@0.28.2)(webpack-cli@5.1.4) transitivePeerDependencies: - typescript @@ -41846,25 +41910,19 @@ snapshots: postcss-value-parser@4.2.0: {} - postcss-values-parser@6.0.2(postcss@8.5.29): + postcss-values-parser@6.0.2(postcss@8.5.8): dependencies: color-name: 1.1.4 is-url-superb: 4.0.0 - postcss: 8.5.29 + postcss: 8.5.8 quote-unquote: 1.0.0 - postcss@8.5.23: + postcss@8.5.15: dependencies: - nanoid: 3.3.18 + nanoid: 3.3.12 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 @@ -41885,6 +41943,8 @@ snapshots: postgres@3.4.7: {} + powershell-utils@0.1.0: {} + pprof-format@2.2.1: {} pprof-to-md@0.1.0: @@ -41908,7 +41968,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.29) + detective-postcss: 7.0.1(postcss@8.5.8) detective-sass: 6.0.1 detective-scss: 5.0.1 detective-stylus: 5.0.1 @@ -41916,7 +41976,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.29 + postcss: 8.5.8 typescript: 5.9.3 transitivePeerDependencies: - supports-color @@ -41935,6 +41995,8 @@ snapshots: pretty-bytes@5.6.0: {} + pretty-bytes@7.1.0: {} + pretty-error@4.0.0: dependencies: lodash: 4.17.21 @@ -41946,12 +42008,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.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.3(react@19.2.3))(react@19.2.3): 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.9(react@19.2.9))(react@19.2.9) + '@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) mysql2: 3.15.3 postgres: 3.4.7 optionalDependencies: @@ -42038,6 +42100,11 @@ snapshots: picocolors: 1.1.1 sade: 1.8.1 + pump@3.0.3: + dependencies: + end-of-stream: 1.4.5 + once: 1.4.0 + punycode@2.3.1: {} pure-rand@6.1.0: {} @@ -42066,60 +42133,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.9(react@19.2.9))(react@19.2.9): + 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): 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.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) + '@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) optionalDependencies: '@types/react': 19.2.9 '@types/react-dom': 19.2.3(@types/react@19.2.9) @@ -42151,17 +42218,22 @@ snapshots: defu: 6.1.4 destr: 2.0.5 - react-dom@19.2.9(react@19.2.9): + rc9@3.1.0: dependencies: - react: 19.2.9 + defu: 6.1.7 + destr: 2.0.5 + + react-dom@19.2.3(react@19.2.3): + dependencies: + react: 19.2.3 scheduler: 0.27.0 - react-hot-toast@2.5.1(react-dom@19.2.9(react@19.2.9))(react@19.2.9): + react-hot-toast@2.5.1(react-dom@19.2.3(react@19.2.3))(react@19.2.3): dependencies: csstype: 3.1.3 goober: 2.1.16(csstype@3.1.3) - react: 19.2.9 - react-dom: 19.2.9(react@19.2.9) + react: 19.2.3 + react-dom: 19.2.3(react@19.2.3) react-is@16.13.1: {} @@ -42174,62 +42246,64 @@ snapshots: gl-matrix: 3.4.4 pprof-format: 2.2.1 protobufjs: 7.5.4 - react: 19.2.9 - react-dom: 19.2.9(react@19.2.9) + react: 19.2.3 + react-dom: 19.2.3(react@19.2.3) + + react-refresh@0.17.0: {} react-refresh@0.18.0: {} - react-remove-scroll-bar@2.3.8(@types/react@19.2.9)(react@19.2.9): + react-remove-scroll-bar@2.3.8(@types/react@19.2.9)(react@19.2.3): dependencies: - react: 19.2.9 - react-style-singleton: 2.2.3(@types/react@19.2.9)(react@19.2.9) + react: 19.2.3 + react-style-singleton: 2.2.3(@types/react@19.2.9)(react@19.2.3) tslib: 2.8.1 optionalDependencies: '@types/react': 19.2.9 - react-remove-scroll@2.6.3(@types/react@19.2.9)(react@19.2.9): + react-remove-scroll@2.6.3(@types/react@19.2.9)(react@19.2.3): dependencies: - 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) + 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) tslib: 2.8.1 - 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) + 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) optionalDependencies: '@types/react': 19.2.9 - 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): + 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): dependencies: - '@rspack/core': 2.2.7(@swc/helpers@0.5.23) - react: 19.2.9 - react-dom: 19.2.9(react@19.2.9) + '@rspack/core': 2.0.0(@swc/helpers@0.5.23) + react: 19.2.3 + react-dom: 19.2.3(react@19.2.3) - react-style-singleton@2.2.3(@types/react@19.2.9)(react@19.2.9): + react-style-singleton@2.2.3(@types/react@19.2.9)(react@19.2.3): dependencies: get-nonce: 1.0.1 - react: 19.2.9 + react: 19.2.3 tslib: 2.8.1 optionalDependencies: '@types/react': 19.2.9 - react-transition-group@4.4.5(react-dom@19.2.9(react@19.2.9))(react@19.2.9): + react-transition-group@4.4.5(react-dom@19.2.3(react@19.2.3))(react@19.2.3): dependencies: '@babel/runtime': 7.26.7 dom-helpers: 5.2.1 loose-envify: 1.4.0 prop-types: 15.8.1 - react: 19.2.9 - react-dom: 19.2.9(react@19.2.9) + react: 19.2.3 + react-dom: 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): + react-tweet@3.3.0(react-dom@19.2.3(react@19.2.3))(react@19.2.3): dependencies: '@swc/helpers': 0.5.15 clsx: 2.1.1 - 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-dom: 19.2.3(react@19.2.3) + swr: 2.3.4(react@19.2.3) - react@19.2.9: {} + react@19.2.3: {} read-package-up@11.0.0: dependencies: @@ -42237,20 +42311,6 @@ snapshots: read-pkg: 9.0.1 type-fest: 4.41.0 - read-package-up@12.0.0: - dependencies: - find-up-simple: 1.0.1 - read-pkg: 10.1.0 - type-fest: 5.9.0 - - read-pkg@10.1.0: - dependencies: - '@types/normalize-package-data': 2.4.4 - normalize-package-data: 8.0.0 - parse-json: 8.3.0 - type-fest: 5.9.0 - unicorn-magic: 0.4.0 - read-pkg@9.0.1: dependencies: '@types/normalize-package-data': 2.4.4 @@ -42290,9 +42350,9 @@ snapshots: process: 0.11.10 string_decoder: 1.3.0 - readdir-glob@3.0.0: + readdir-glob@1.1.3: dependencies: - minimatch: 10.2.5 + minimatch: 5.1.9 readdirp@3.6.0: dependencies: @@ -42315,18 +42375,14 @@ snapshots: indent-string: 4.0.0 strip-indent: 3.0.0 - redis-errors@1.2.0: - optional: true + redis-errors@1.2.0: {} 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: {} @@ -42372,13 +42428,6 @@ snapshots: require-from-string@2.0.2: {} - require-in-the-middle@8.0.1(supports-color@10.2.2): - dependencies: - debug: 4.4.3(supports-color@10.2.2) - module-details-from-path: 1.0.4 - transitivePeerDependencies: - - supports-color - require-package-name@2.0.1: {} requires-port@1.0.0: {} @@ -42420,8 +42469,6 @@ snapshots: retry@0.13.1: {} - rettime@0.11.11: {} - reusify@1.0.4: {} rfdc@1.4.1: {} @@ -42435,26 +42482,60 @@ snapshots: glob: 13.0.0 package-json-from-dist: 1.0.1 - rolldown@1.2.13: + rolldown@1.0.0-rc.9(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1): dependencies: - '@oxc-project/types': 0.153.0 + '@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.1)(@emnapi/runtime@1.11.1) + '@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 '@rolldown/pluginutils': 1.0.1 optionalDependencies: - '@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 + '@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 rollup@4.63.1: dependencies: @@ -42487,11 +42568,10 @@ 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.9.2: {} + rou3@0.8.1: {} router@2.2.0(supports-color@10.2.2): dependencies: @@ -42507,32 +42587,16 @@ snapshots: rrweb-cssom@0.8.0: {} - 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)): + rspack-vue-loader@17.5.0(@rspack/core@2.1.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.3.1(@swc/helpers@0.5.23) + '@rspack/core': 2.1.1(@swc/helpers@0.5.23) '@vue/compiler-sfc': 3.5.25 vue: 3.5.25(@typescript/typescript6@6.0.2) - run-applescript@7.1.0: {} + run-applescript@7.0.0: {} run-parallel@1.2.0: dependencies: @@ -42568,107 +42632,11 @@ 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.2 + source-map-js: 1.2.1 optionalDependencies: '@parcel/watcher': 2.5.1 @@ -42690,9 +42658,11 @@ snapshots: dependencies: '@types/json-schema': 7.0.15 ajv: 8.18.0 - ajv-formats: 2.1.1 + ajv-formats: 2.1.1(ajv@8.18.0) ajv-keywords: 5.1.0(ajv@8.18.0) + scule@1.3.0: {} + secure-json-parse@4.1.0: {} select-hose@2.0.0: {} @@ -42712,9 +42682,9 @@ snapshots: semver@7.7.3: {} - semver@7.8.2: {} + semver@7.7.4: {} - semver@7.8.5: {} + semver@7.8.2: {} send@0.19.0(supports-color@10.2.2): dependencies: @@ -42756,17 +42726,19 @@ 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 - seroval-plugins@1.6.7(seroval@1.6.7): + seroval-plugins@1.6.2(seroval@1.6.2): dependencies: - seroval: 1.6.7 + seroval: 1.6.2 seroval@1.5.4: {} - seroval@1.6.7: {} + seroval@1.6.2: {} serve-index@1.9.1(supports-color@10.2.2): dependencies: @@ -42780,6 +42752,10 @@ 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 @@ -42826,11 +42802,40 @@ snapshots: dependencies: kind-of: 6.0.3 + sharp@0.34.4: + dependencies: + '@img/colour': 1.0.0 + detect-libc: 2.1.2 + semver: 7.8.2 + optionalDependencies: + '@img/sharp-darwin-arm64': 0.34.4 + '@img/sharp-darwin-x64': 0.34.4 + '@img/sharp-libvips-darwin-arm64': 1.2.3 + '@img/sharp-libvips-darwin-x64': 1.2.3 + '@img/sharp-libvips-linux-arm': 1.2.3 + '@img/sharp-libvips-linux-arm64': 1.2.3 + '@img/sharp-libvips-linux-ppc64': 1.2.3 + '@img/sharp-libvips-linux-s390x': 1.2.3 + '@img/sharp-libvips-linux-x64': 1.2.3 + '@img/sharp-libvips-linuxmusl-arm64': 1.2.3 + '@img/sharp-libvips-linuxmusl-x64': 1.2.3 + '@img/sharp-linux-arm': 0.34.4 + '@img/sharp-linux-arm64': 0.34.4 + '@img/sharp-linux-ppc64': 0.34.4 + '@img/sharp-linux-s390x': 0.34.4 + '@img/sharp-linux-x64': 0.34.4 + '@img/sharp-linuxmusl-arm64': 0.34.4 + '@img/sharp-linuxmusl-x64': 0.34.4 + '@img/sharp-wasm32': 0.34.4 + '@img/sharp-win32-arm64': 0.34.4 + '@img/sharp-win32-ia32': 0.34.4 + '@img/sharp-win32-x64': 0.34.4 + sharp@0.34.5: dependencies: - '@img/colour': 1.1.0 + '@img/colour': 1.0.0 detect-libc: 2.1.2 - semver: 7.8.5 + semver: 7.8.2 optionalDependencies: '@img/sharp-darwin-arm64': 0.34.5 '@img/sharp-darwin-x64': 0.34.5 @@ -42857,73 +42862,6 @@ snapshots: '@img/sharp-win32-ia32': 0.34.5 '@img/sharp-win32-x64': 0.34.5 - sharp@0.35.4(@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.4 - '@img/sharp-darwin-x64': 0.35.4 - '@img/sharp-freebsd-wasm32': 0.35.4 - '@img/sharp-libvips-darwin-arm64': 1.3.3 - '@img/sharp-libvips-darwin-x64': 1.3.3 - '@img/sharp-libvips-linux-arm': 1.3.3 - '@img/sharp-libvips-linux-arm64': 1.3.3 - '@img/sharp-libvips-linux-ppc64': 1.3.3 - '@img/sharp-libvips-linux-riscv64': 1.3.3 - '@img/sharp-libvips-linux-s390x': 1.3.3 - '@img/sharp-libvips-linux-x64': 1.3.3 - '@img/sharp-libvips-linuxmusl-arm64': 1.3.3 - '@img/sharp-libvips-linuxmusl-x64': 1.3.3 - '@img/sharp-linux-arm': 0.35.4 - '@img/sharp-linux-arm64': 0.35.4 - '@img/sharp-linux-ppc64': 0.35.4 - '@img/sharp-linux-riscv64': 0.35.4 - '@img/sharp-linux-s390x': 0.35.4 - '@img/sharp-linux-x64': 0.35.4 - '@img/sharp-linuxmusl-arm64': 0.35.4 - '@img/sharp-linuxmusl-x64': 0.35.4 - '@img/sharp-webcontainers-wasm32': 0.35.4 - '@img/sharp-win32-arm64': 0.35.4 - '@img/sharp-win32-ia32': 0.35.4 - '@img/sharp-win32-x64': 0.35.4 - '@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 @@ -42962,8 +42900,7 @@ snapshots: side-channel-map: 1.0.1 side-channel-weakmap: 1.0.2 - siginfo@2.0.0: - optional: true + siginfo@2.0.0: {} signal-exit@3.0.7: {} @@ -42977,19 +42914,19 @@ snapshots: mrmime: 2.0.0 totalist: 3.0.1 - sisteransi@1.0.5: {} - skin-tone@2.0.0: dependencies: unicode-emoji-modifier-base: 1.0.0 slash@3.0.0: {} + slash@5.1.0: {} + slashes@3.0.12: {} - smol-toml@1.6.1: {} + smob@1.5.0: {} - smol-toml@1.9.0: {} + smol-toml@1.6.1: {} sockjs@0.3.24: dependencies: @@ -43034,8 +42971,6 @@ 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 @@ -43047,6 +42982,8 @@ snapshots: source-map@0.7.6: {} + source-map@0.8.0: {} + spawn-command@0.0.2: {} spawndamnit@3.0.1: @@ -43100,9 +43037,17 @@ snapshots: sqlstring@2.3.3: {} - srvx@1.0.5: {} + srvx@0.10.0: {} - srvx@1.0.8: {} + srvx@0.10.1: {} + + srvx@0.11.12: {} + + srvx@0.11.15: {} + + srvx@0.11.18: {} + + srvx@0.11.22: {} stable-hash-x@0.2.0: {} @@ -43110,11 +43055,9 @@ snapshots: stack-trace@1.0.0-pre2: {} - stackback@0.0.2: - optional: true + stackback@0.0.2: {} - standard-as-callback@2.1.0: - optional: true + standard-as-callback@2.1.0: {} standardwebhooks@1.0.0: dependencies: @@ -43136,9 +43079,9 @@ snapshots: std-env@3.9.0: {} - std-env@4.2.0: {} + std-env@4.1.0: {} - std-env@4.3.0: {} + std-env@4.2.0: {} stop-iteration-iterator@1.1.0: dependencies: @@ -43171,6 +43114,17 @@ 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 @@ -43197,32 +43151,22 @@ 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 - stubborn-fs@2.0.0: - dependencies: - stubborn-utils: 1.0.2 - - stubborn-utils@1.0.2: {} - 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.1)(webpack-cli@5.1.4) + webpack: 5.97.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(esbuild@0.28.2)(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.9): - dependencies: - client-only: 0.0.1 - react: 19.2.9 - optionalDependencies: - '@babel/core': 7.29.7(supports-color@10.2.2) - babel-plugin-macros: 3.1.0 - stylis@4.2.0: {} supports-color@10.2.2: {} @@ -43258,19 +43202,15 @@ 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.9): + swr@2.3.4(react@19.2.3): dependencies: dequal: 2.0.3 - react: 19.2.9 - use-sync-external-store: 1.6.0(react@19.2.9) + react: 19.2.3 + use-sync-external-store: 1.6.0(react@19.2.3) symbol-tree@3.2.4: {} - sync-child-process@1.0.2: - dependencies: - sync-message-port: 1.2.0 - - sync-message-port@1.2.0: {} + system-architecture@0.1.0: {} tagged-tag@1.0.0: {} @@ -43313,14 +43253,6 @@ snapshots: mkdirp: 3.0.1 yallist: 5.0.0 - tar@7.5.22: - dependencies: - '@isaacs/fs-minipass': 4.0.1 - chownr: 3.0.0 - minipass: 7.1.2 - minizlib: 3.1.0 - yallist: 5.0.0 - teex@1.0.1: dependencies: streamx: 2.27.0 @@ -43341,17 +43273,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.1)(webpack@5.97.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): 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.1)(webpack-cli@5.1.4) + webpack: 5.97.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(esbuild@0.28.2)(webpack-cli@5.1.4) optionalDependencies: '@swc/core': 1.15.33(@swc/helpers@0.5.23) - esbuild: 0.28.1 + esbuild: 0.28.2 terser@5.37.0: dependencies: @@ -43393,28 +43325,30 @@ snapshots: timestring@6.0.0: {} - tinybench@2.9.0: - optional: true - - tinybench@6.2.2: {} + tinybench@2.9.0: {} tinyclip@0.1.15: {} tinyexec@0.3.2: {} - tinyexec@1.3.1: {} + tinyexec@1.0.2: {} 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.2.0: {} + tinyrainbow@3.1.0: {} tldts-core@6.1.76: {} @@ -43432,6 +43366,8 @@ snapshots: dependencies: tmp: 0.2.7 + tmp@0.2.6: {} + tmp@0.2.7: {} to-regex-range@5.0.1: @@ -43442,7 +43378,7 @@ snapshots: toidentifier@1.0.1: {} - toml@4.3.0: {} + toml@3.0.0: {} tomlify-j0.4@3.0.0: {} @@ -43541,7 +43477,7 @@ snapshots: dependencies: tslib: 1.14.1 - turbo-stream@3.2.1: {} + turbo-stream@3.2.0: {} type-check@0.4.0: dependencies: @@ -43553,7 +43489,7 @@ snapshots: type-fest@4.41.0: {} - type-fest@5.9.0: + type-fest@5.4.1: dependencies: tagged-tag: 1.0.0 @@ -43637,8 +43573,17 @@ 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: {} @@ -43649,10 +43594,6 @@ snapshots: undici@7.27.2: {} - undici@7.29.0: {} - - undici@7.30.1: {} - unenv@2.0.0-rc.24: dependencies: pathe: 2.0.3 @@ -43663,6 +43604,34 @@ snapshots: unicorn-magic@0.4.0: {} + unimport@6.4.0(@rspack/core@2.1.1(@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.1.1(@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: {} @@ -43673,6 +43642,16 @@ 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 @@ -43687,20 +43666,18 @@ snapshots: picomatch: 4.0.7 webpack-virtual-modules: 0.6.2 - 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): + unplugin@3.3.0(@rspack/core@2.1.1(@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: '@jridgewell/remapping': 2.3.5 - '@rolldown/pluginutils': 1.0.1 picomatch: 4.0.7 webpack-virtual-modules: 0.6.2 optionalDependencies: - '@rsbuild/core': 2.3.1 - '@rspack/core': 2.3.1(@swc/helpers@0.5.23) - esbuild: 0.28.1 - rolldown: 1.2.13 + '@rspack/core': 2.1.1(@swc/helpers@0.5.23) + esbuild: 0.28.2 + rolldown: 1.0.2 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(@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) + vite: 8.0.14(@types/node@25.0.9)(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.15)(sharp@0.34.5)(svgo@4.0.0)(webpack-cli@5.1.4) unrs-resolver@1.11.1: dependencies: @@ -43726,7 +43703,22 @@ 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@11.0.3(supports-color@10.2.2))(db0@0.4.1)(ioredis@5.11.1(supports-color@10.2.2)): + unstorage@1.17.4(@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.5 + 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@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 @@ -43737,16 +43729,53 @@ snapshots: ofetch: 1.5.1 ufo: 1.6.4 optionalDependencies: - '@netlify/blobs': 11.0.3(supports-color@10.2.2) - db0: 0.4.1 + '@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@2.0.0-alpha.10: {} + 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 - until-async@3.0.2: {} + 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 + + untun@0.1.3: + dependencies: + citty: 0.1.6 + consola: 3.4.2 + pathe: 1.1.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 @@ -43759,6 +43788,8 @@ snapshots: escalade: 3.2.0 picocolors: 1.1.1 + uqr@0.1.2: {} + uqr@0.1.3: {} uri-js@4.4.1: @@ -43774,24 +43805,24 @@ snapshots: urlpattern-polyfill@8.0.2: {} - use-callback-ref@1.3.3(@types/react@19.2.9)(react@19.2.9): + use-callback-ref@1.3.3(@types/react@19.2.9)(react@19.2.3): dependencies: - react: 19.2.9 + react: 19.2.3 tslib: 2.8.1 optionalDependencies: '@types/react': 19.2.9 - use-sidecar@1.1.3(@types/react@19.2.9)(react@19.2.9): + use-sidecar@1.1.3(@types/react@19.2.9)(react@19.2.3): dependencies: detect-node-es: 1.1.0 - react: 19.2.9 + react: 19.2.3 tslib: 2.8.1 optionalDependencies: '@types/react': 19.2.9 - use-sync-external-store@1.6.0(react@19.2.9): + use-sync-external-store@1.6.0(react@19.2.3): dependencies: - react: 19.2.9 + react: 19.2.3 util-deprecate@1.0.2: {} @@ -43803,12 +43834,18 @@ snapshots: uuid@10.0.0: {} + uuid@11.1.0: {} + 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' @@ -43820,11 +43857,9 @@ 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.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.0.14(@types/node@25.0.9)(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: '@microsoft/api-extractor': 7.47.7(@types/node@25.0.9) '@rollup/pluginutils': 5.1.4(rollup@4.63.1) @@ -43837,13 +43872,13 @@ snapshots: magic-string: 0.30.21 typescript: '@typescript/typescript6@6.0.2' optionalDependencies: - 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: 8.0.14(@types/node@25.0.9)(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: - '@types/node' - rollup - supports-color - 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-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.27.4)(jiti@2.7.0)(sass@1.97.2)(terser@5.37.0)(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) @@ -43856,13 +43891,13 @@ snapshots: 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.105.1)(terser@5.51.2)(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) transitivePeerDependencies: - '@types/node' - rollup - supports-color - 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-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)): dependencies: '@microsoft/api-extractor': 7.47.7(@types/node@25.0.9) '@rollup/pluginutils': 5.1.4(rollup@4.63.1) @@ -43875,13 +43910,13 @@ snapshots: 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) + 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: - '@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)): + 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)): dependencies: '@microsoft/api-extractor': 7.47.7(@types/node@25.0.9) '@rollup/pluginutils': 5.1.4(rollup@4.63.1) @@ -43894,25 +43929,21 @@ snapshots: magic-string: 0.30.21 typescript: 5.9.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.105.1)(terser@5.51.2)(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) transitivePeerDependencies: - '@types/node' - rollup - supports-color - 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-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)): dependencies: - 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: 8.0.14(@types/node@25.0.9)(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.105.1)(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)): 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: 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.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)): + 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)): dependencies: '@babel/core': 7.29.7(supports-color@10.2.2) '@types/babel__core': 7.20.5 @@ -43920,14 +43951,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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@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)) + vite: 8.0.14(@types/node@25.0.9)(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: '@testing-library/jest-dom': 6.6.3 transitivePeerDependencies: - supports-color - 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)): + 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)): dependencies: '@babel/core': 7.29.7(supports-color@10.2.2) '@types/babel__core': 7.20.5 @@ -43935,339 +43966,230 @@ 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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@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': 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@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@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.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)) + vite: 8.0.14(@types/node@25.0.9)(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)) 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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@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)): + 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)): 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.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: 8.0.14(@types/node@25.0.9)(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 - typescript - 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)): + 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)): 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.105.1)(terser@5.51.2)(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) transitivePeerDependencies: - supports-color - typescript - 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)): + 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)): dependencies: debug: 4.4.3(supports-color@10.2.2) globrex: 0.1.2 tsconfck: 3.1.4(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: 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 - typescript - 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@8.0.14(@types/node@25.0.9)(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: - lightningcss: 1.33.0 - picomatch: 4.0.7 - postcss: 8.5.29 - rolldown: 1.2.13 - tinyglobby: 0.2.17 + 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.27.4 fsevents: 2.3.3 jiti: 2.7.0 sass: 1.97.2 - sass-embedded: 1.105.1 - terser: 5.51.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): + 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.33.0 - picomatch: 4.0.7 - postcss: 8.5.29 - rolldown: 1.2.13 - tinyglobby: 0.2.17 + 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.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 - - vite@8.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@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.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.28.1 + 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.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.0.14(@types/node@25.0.9)(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.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: 8.0.14(@types/node@25.0.9)(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)): + 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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@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.0.14(@types/node@25.0.9)(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.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.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.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: 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.3.4(@types/node@25.0.9)(esbuild@0.28.1)(jiti@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)): + vitest@4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.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.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': 4.1.4(msw@2.7.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.2 - expect-type: 1.4.0 + 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.7 - std-env: 4.3.0 + picomatch: 4.0.4 + std-env: 4.1.0 tinybench: 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) + 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 + optionalDependencies: + '@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 + + vitest@4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@25.0.1(supports-color@10.2.2))(msw@2.7.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)): + dependencies: + '@vitest/expect': 4.1.4 + '@vitest/mocker': 4.1.4(msw@2.7.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 + optionalDependencies: + '@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 + + vitest@4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@27.0.0(supports-color@10.2.2))(msw@2.7.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.7.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 + optionalDependencies: + '@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 + + vitest@4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.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.7.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 optionalDependencies: - '@opentelemetry/api': 1.9.1 '@types/node': 25.0.9 '@vitest/ui': 4.1.4(vitest@4.1.4) jsdom: 29.1.1(@noble/hashes@2.0.1) transitivePeerDependencies: - msw - optional: true - 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)): + vitest@4.1.4(@types/node@25.0.9)(@vitest/ui@4.1.4)(jsdom@29.1.1(@noble/hashes@2.0.1))(msw@2.7.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)): 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.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 + '@vitest/expect': 4.1.4 + '@vitest/mocker': 4.1.4(msw@2.7.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 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.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) + '@vitest/ui': 4.1.4(vitest@4.1.4) jsdom: 29.1.1(@noble/hashes@2.0.1) transitivePeerDependencies: - msw @@ -44284,9 +44206,9 @@ snapshots: dependencies: vue: 3.5.25(typescript@5.8.3) - vue-demi@0.14.10(vue@3.5.25(typescript@6.0.2)): + vue-demi@0.14.10(vue@3.5.25(typescript@7.0.2)): dependencies: - vue: 3.5.25(typescript@6.0.2) + vue: 3.5.25(typescript@7.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: @@ -44296,7 +44218,7 @@ snapshots: eslint-visitor-keys: 4.2.1 espree: 10.4.0 esquery: 1.6.0 - semver: 7.8.5 + semver: 7.8.2 transitivePeerDependencies: - supports-color @@ -44308,7 +44230,7 @@ snapshots: eslint-visitor-keys: 4.2.1 espree: 10.4.0 esquery: 1.6.0 - semver: 7.8.5 + semver: 7.8.2 transitivePeerDependencies: - supports-color @@ -44373,15 +44295,15 @@ snapshots: optionalDependencies: typescript: 5.9.3 - vue@3.5.25(typescript@6.0.2): + vue@3.5.25(typescript@7.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@6.0.2)) + '@vue/server-renderer': 3.5.25(vue@3.5.25(typescript@7.0.2)) '@vue/shared': 3.5.25 optionalDependencies: - typescript: 6.0.2 + typescript: 7.0.2 w3c-xmlserializer@5.0.0: dependencies: @@ -44430,7 +44352,7 @@ 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.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: 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.15)(sharp@0.34.5)(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@10.2.2))(supports-color@10.2.2)(webpack-cli@5.1.4)(webpack@5.110.3) @@ -44453,7 +44375,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(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) webpack-dev-middleware@7.4.2(webpack@5.110.3): dependencies: @@ -44464,7 +44386,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.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: 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.15)(sharp@0.34.5)(svgo@4.0.0)(webpack-cli@5.1.4) optional: true webpack-dev-middleware@7.4.2(webpack@5.97.1): @@ -44509,7 +44431,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.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: 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.15)(sharp@0.34.5)(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 @@ -44519,45 +44441,6 @@ snapshots: optional: true 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 - '@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 - 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 @@ -44612,7 +44495,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.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@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.15)(sharp@0.34.5)(svgo@4.0.0)(webpack-cli@5.1.4): dependencies: '@types/estree': 1.0.9 '@types/json-schema': 7.0.15 @@ -44623,11 +44506,11 @@ snapshots: browserslist: 4.28.1 chrome-trace-event: 1.0.4 enhanced-resolve: 5.24.5 - es-module-lexer: 2.3.2 + es-module-lexer: 2.3.1 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.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) + 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.15)(sharp@0.34.5)(svgo@4.0.0)(webpack@5.110.3) neo-async: 2.6.2 schema-utils: 4.3.3 tapable: 2.3.3 @@ -44685,7 +44568,7 @@ snapshots: - esbuild - uglify-js - webpack@5.97.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(esbuild@0.28.1)(webpack-cli@5.1.4): + webpack@5.97.1(@swc/core@1.15.33(@swc/helpers@0.5.23))(esbuild@0.28.2)(webpack-cli@5.1.4): dependencies: '@types/eslint-scope': 3.7.7 '@types/estree': 1.0.7 @@ -44707,7 +44590,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.1)(webpack@5.97.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) watchpack: 2.4.2 webpack-sources: 3.2.3 optionalDependencies: @@ -44756,8 +44639,6 @@ snapshots: tr46: 0.0.3 webidl-conversions: 3.0.1 - when-exit@2.1.5: {} - which-boxed-primitive@1.1.1: dependencies: is-bigint: 1.1.0 @@ -44787,17 +44668,10 @@ snapshots: dependencies: isexe: 2.0.0 - which@3.0.1: - dependencies: - isexe: 2.0.0 - why-is-node-running@2.3.0: dependencies: siginfo: 2.0.0 stackback: 0.0.2 - optional: true - - why-is-node-running@3.2.1: {} wildcard@2.0.1: {} @@ -44831,14 +44705,6 @@ 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 @@ -44873,13 +44739,27 @@ 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 + ws@8.18.0: {} ws@8.20.0: {} - ws@8.21.0: {} + wsl-utils@0.3.1: + dependencies: + is-wsl: 3.1.1 + powershell-utils: 0.1.0 xml-name-validator@4.0.0: {} @@ -44915,6 +44795,8 @@ snapshots: yargs-parser@21.1.1: {} + yargs-parser@22.0.0: {} + yargs@16.2.0: dependencies: cliui: 7.0.4 @@ -44935,9 +44817,19 @@ snapshots: y18n: 5.0.8 yargs-parser: 21.1.1 - yauzl@3.4.0: + yargs@18.1.0: dependencies: - pend: 1.2.0 + 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@2.10.0: + dependencies: + buffer-crc32: 0.2.13 + fd-slicer: 1.1.0 yocto-queue@0.1.0: {} @@ -44955,17 +44847,25 @@ snapshots: '@poppinss/colors': 4.1.6 '@poppinss/dumper': 0.6.5 '@speed-highlight/core': 1.2.14 - cookie: 1.1.1 + cookie: 1.0.2 + 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@7.0.5: + zip-stream@6.0.1: dependencies: - compress-commons: 7.0.1 - normalize-path: 3.0.0 + archiver-utils: 5.0.2 + compress-commons: 6.0.2 readable-stream: 4.7.0 zod@3.25.57: {} @@ -44976,11 +44876,9 @@ snapshots: zod@4.5.4: {} - 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)): + 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)): optionalDependencies: '@types/react': 19.2.9 immer: 10.1.1 - react: 19.2.9 - use-sync-external-store: 1.6.0(react@19.2.9) + react: 19.2.3 + use-sync-external-store: 1.6.0(react@19.2.3) diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index c5c9bae1df..3cff53a1b8 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -9,8 +9,10 @@ trustPolicyExclude: - 'chokidar@4.0.3' # known to be safe, installed by sass, prisma, netlify... no planned releases in v4, packages is on v5 now - 'semver@6.3.1' # installed by babel, ecosystem has been on v7 for 7 years now, but babel is horribly out of date, 6.3.1 is the latest v6 and was released 3 years ago - 'undici@6.21.2' # installed by cheerio@1.0.0 -> html-link-extractor@1.0.5 -> markdown-link-extractor@4.0.3, is only 1 year old, v6, v7 and v8 are maintained in parallel + - '@netlify/edge-bundler@14.7.0' # existing Netlify dev transitive flagged by pnpm 11.9 trust downgrade checks - '@platformatic/flame@1.7.0' # trusted publishing failed due to a missing sigstore module in npm, then an established maintainer published it manually - - '@netlify/serverless-functions-api@2.21.2 || 2.18.0' # Netlify's repo went private Aug 2023, provenance never returned for any version since. Two versions: @netlify/server-dev wants ^2.21.2, @netlify/zip-it-and-ship-it pins an exact 2.18.0 + - '@netlify/serverless-functions-api@2.7.1' # existing Netlify dev transitive flagged by pnpm 11.9 trust downgrade checks + - '@netlify/zip-it-and-ship-it@14.1.11' # existing Netlify dev transitive flagged by pnpm 11.9 trust downgrade checks packages: - 'packages/*' @@ -36,15 +38,15 @@ catalog: '@babel/types': ^7.29.8 '@arethetypeswrong/cli': ^0.18.4 '@eslint-react/eslint-plugin': ^1.26.2 - '@rsbuild/core': ^2.3.1 + '@rsbuild/core': ^2.1.0 '@tanstack/vite-config': 0.5.2 - '@testing-library/jest-dom': ^7.0.1 + '@testing-library/jest-dom': ^6.6.3 '@testing-library/react': ^16.2.0 - '@vitejs/plugin-react': ^6.0.1 + '@vitejs/plugin-react': ^4.3.4 '@vitejs/plugin-vue-jsx': ^4.1.2 - '@vitest/ui': ^5.0.4 - react: ~19.2.9 - react-dom: ~19.2.9 + '@vitest/ui': ^4.1.4 + react: ^19.2.3 + react-dom: ^19.2.3 '@types/react': ^19.2.8 '@types/react-dom': ^19.2.3 eslint: ^9.22.0 @@ -59,13 +61,13 @@ catalog: rimraf: ^6.1.2 solid-js: 1.9.12 tinyglobby: ^0.2.17 - vite: ^8.3.4 + vite: ^8.0.14 vite-plugin-solid: 2.11.10 - vitest: ^5.0.4 + vitest: ^4.1.4 vue: ^3.5.25 zod: ^4.5.4 '@types/node': 25.0.9 - '@playwright/test': ^1.63.0 + '@playwright/test': ^1.61.0 '@tanstack/query-core': ^5.102.0 '@tanstack/react-query': ^5.102.0 '@tanstack/solid-query': ^5.102.0 @@ -125,6 +127,7 @@ 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 deleted file mode 100644 index dfb32c923a..0000000000 --- a/scripts/benchmarks/bundle-size/build.mjs +++ /dev/null @@ -1,36 +0,0 @@ -import { spawnSync } from 'node:child_process' -import path from 'node:path' -import { fileURLToPath, pathToFileURL } from 'node:url' - -const repoRoot = fileURLToPath(new URL('../../../', import.meta.url)) - -/** - * Run report generation outside Nx so it also runs after a cache hit. - * @param {string[]} args - * @param {import('./run.mjs').Execute} [execute] - */ -export function build(args, execute = spawnSync) { - /** @type {import('./run.mjs').CommandOptions} */ - const options = { cwd: repoRoot, env: process.env, stdio: 'inherit' } - const result = execute( - process.env.npm_execpath || 'pnpm', - ['exec', 'nx', 'run', '@benchmarks/bundle-size:measure', ...args], - options, - ) - if (result.status !== 0) { - return result.status || 1 - } - const report = execute( - process.execPath, - [fileURLToPath(new URL('./report.mjs', import.meta.url))], - options, - ) - return report.status ?? 1 -} - -if ( - process.argv[1] && - import.meta.url === pathToFileURL(path.resolve(process.argv[1])).href -) { - process.exitCode = build(process.argv.slice(2)) -} diff --git a/scripts/benchmarks/bundle-size/build.test.mjs b/scripts/benchmarks/bundle-size/build.test.mjs deleted file mode 100644 index 779824c35a..0000000000 --- a/scripts/benchmarks/bundle-size/build.test.mjs +++ /dev/null @@ -1,51 +0,0 @@ -import assert from 'node:assert/strict' -import path from 'node:path' -import test from 'node:test' -import { build } from './build.mjs' - -test('generates a fresh report after a successful Nx run, including cache hits', () => { - /** @type {string[][]} */ - const calls = [] - const status = build( - ['--outputStyle=stream', '--skipRemoteCache'], - (_command, args, options) => { - calls.push(args) - assert.equal(options.stdio, 'inherit') - assert.ok(!('shell' in options)) - return { status: 0 } - }, - ) - assert.equal(status, 0) - assert.equal(calls.length, 2) - assert.deepEqual(calls[0], [ - 'exec', - 'nx', - 'run', - '@benchmarks/bundle-size:measure', - '--outputStyle=stream', - '--skipRemoteCache', - ]) - assert.equal(path.basename(calls[1]?.[0] || ''), 'report.mjs') -}) - -test('does not report stale measurements after a failed or interrupted build', () => { - for (const exitCode of [2, null]) { - let calls = 0 - assert.equal( - build([], () => { - calls++ - return { status: exitCode } - }), - exitCode || 1, - ) - assert.equal(calls, 1) - } -}) - -test('propagates report failures', () => { - let calls = 0 - assert.equal( - build([], () => ({ status: ++calls === 1 ? 0 : 3 })), - 3, - ) -}) diff --git a/scripts/benchmarks/bundle-size/compress.mjs b/scripts/benchmarks/bundle-size/compress.mjs deleted file mode 100644 index f30d8794ca..0000000000 --- a/scripts/benchmarks/bundle-size/compress.mjs +++ /dev/null @@ -1,64 +0,0 @@ -import fs from 'node:fs' -import path from 'node:path' -import { brotliCompressSync, gzipSync } from 'node:zlib' - -function sumSizes(files) { - let rawBytes = 0 - let gzipBytes = 0 - let brotliBytes = 0 - - for (const file of files) { - rawBytes += file.rawBytes - gzipBytes += file.gzipBytes - brotliBytes += file.brotliBytes - } - - return { rawBytes, gzipBytes, brotliBytes, files } -} - -// Keep the cache local to one measurement: rebuilds can reuse filenames. -export function measureFileSizes(baseDir, jsFiles, initialJsFiles, onTiming) { - const measured = new Map() - let gzipMs = 0 - let brotliMs = 0 - - function measureFile(file) { - let sizes = measured.get(file) - if (sizes) { - return sizes - } - - const content = fs.readFileSync(path.join(baseDir, file)) - const gzipStarted = onTiming ? performance.now() : 0 - let gzipBytes - try { - gzipBytes = gzipSync(content).byteLength - } finally { - if (onTiming) { - gzipMs += performance.now() - gzipStarted - } - } - const brotliStarted = onTiming ? performance.now() : 0 - let brotliBytes - try { - brotliBytes = brotliCompressSync(content).byteLength - } finally { - if (onTiming) { - brotliMs += performance.now() - brotliStarted - } - } - - sizes = { file, rawBytes: content.byteLength, gzipBytes, brotliBytes } - measured.set(file, sizes) - return sizes - } - - try { - const sizes = sumSizes(jsFiles.map(measureFile)) - const initialSizes = sumSizes(initialJsFiles.map(measureFile)) - return { sizes, initialSizes } - } finally { - onTiming?.('gzip', gzipMs) - onTiming?.('brotli', brotliMs) - } -} diff --git a/scripts/benchmarks/bundle-size/compress.test.mjs b/scripts/benchmarks/bundle-size/compress.test.mjs deleted file mode 100644 index a73b93b77c..0000000000 --- a/scripts/benchmarks/bundle-size/compress.test.mjs +++ /dev/null @@ -1,179 +0,0 @@ -import assert from 'node:assert/strict' -import fs from 'node:fs' -import { syncBuiltinESMExports } from 'node:module' -import os from 'node:os' -import path from 'node:path' -import test from 'node:test' -import zlib, { brotliCompressSync, gzipSync } from 'node:zlib' -import { measureFileSizes } from './compress.mjs' - -// Independent reference: compress both lists separately, as the CLI did before. -function legacySizes(baseDir, fileList) { - const result = { rawBytes: 0, gzipBytes: 0, brotliBytes: 0, files: [] } - for (const file of fileList) { - const content = fs.readFileSync(path.join(baseDir, file)) - const sizes = { - file, - rawBytes: content.byteLength, - gzipBytes: gzipSync(content).byteLength, - brotliBytes: brotliCompressSync(content).byteLength, - } - result.rawBytes += sizes.rawBytes - result.gzipBytes += sizes.gzipBytes - result.brotliBytes += sizes.brotliBytes - result.files.push(sizes) - } - return result -} - -function fixture(t) { - const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'bundle-compress-')) - t.after(() => fs.rmSync(dir, { recursive: true, force: true })) - for (const [file, content] of Object.entries({ - 'entry.js': 'import "./shared.mjs"; console.log("héllo 🌍");\n'.repeat(30), - 'shared.mjs': 'export const shared = "shared chunk";\n'.repeat(100), - 'lazy.js': 'export default "lazy route";\n'.repeat(20), - 'empty.js': '', - })) { - fs.writeFileSync(path.join(dir, file), content) - } - return dir -} - -test('matches legacy per-chunk compression and initial totals exactly', (t) => { - const dir = fixture(t) - const all = ['entry.js', 'shared.mjs', 'lazy.js', 'empty.js'] - for (const initial of [ - [], - ['entry.js'], - ['shared.mjs', 'entry.js'], - all, - ['empty.js'], - ]) { - assert.deepEqual(measureFileSizes(dir, all, initial), { - sizes: legacySizes(dir, all), - initialSizes: legacySizes(dir, initial), - }) - } - assert.deepEqual(measureFileSizes(dir, [], []), { - sizes: legacySizes(dir, []), - initialSizes: legacySizes(dir, []), - }) -}) - -test('preserves list order and multiplicity, including initial-only files', (t) => { - const dir = fixture(t) - const all = ['lazy.js', 'entry.js', 'entry.js'] - const initial = ['shared.mjs', 'entry.js', 'entry.js'] - assert.deepEqual(measureFileSizes(dir, all, initial), { - sizes: legacySizes(dir, all), - initialSizes: legacySizes(dir, initial), - }) -}) - -test('remeasures changed files on subsequent calls and propagates read errors', (t) => { - const dir = fixture(t) - const files = ['entry.js'] - const before = measureFileSizes(dir, files, files) - fs.writeFileSync(path.join(dir, 'entry.js'), 'export default "rebuilt"') - const after = measureFileSizes(dir, files, files) - assert.notDeepEqual(after, before) - assert.deepEqual(after, { - sizes: legacySizes(dir, files), - initialSizes: legacySizes(dir, files), - }) - assert.throws(() => measureFileSizes(dir, files, ['missing.js']), { - code: 'ENOENT', - }) -}) - -test('reports gzip and brotli separately without changing measured output', (t) => { - const dir = fixture(t) - const all = ['entry.js', 'shared.mjs', 'lazy.js'] - const initial = ['entry.js', 'shared.mjs'] - const timings = [] - const result = measureFileSizes(dir, all, initial, (phase, durationMs) => { - timings.push({ phase, durationMs }) - }) - assert.deepEqual(result, measureFileSizes(dir, all, initial)) - assert.deepEqual( - timings.map(({ phase }) => phase), - ['gzip', 'brotli'], - ) - for (const { durationMs } of timings) { - assert.ok(Number.isFinite(durationMs) && durationMs >= 0) - } -}) - -test('reads and compresses each distinct file only once per measurement', (t) => { - const dir = fixture(t) - const all = ['entry.js', 'shared.mjs', 'lazy.js', 'entry.js'] - const initial = ['shared.mjs', 'entry.js', 'empty.js', 'entry.js'] - const expected = { - sizes: legacySizes(dir, all), - initialSizes: legacySizes(dir, initial), - } - const read = t.mock.method(fs, 'readFileSync') - const gzip = t.mock.method(zlib, 'gzipSync') - const brotli = t.mock.method(zlib, 'brotliCompressSync') - syncBuiltinESMExports() - t.after(() => { - t.mock.restoreAll() - syncBuiltinESMExports() - }) - - for (let measurement = 1; measurement <= 2; measurement++) { - assert.deepEqual(measureFileSizes(dir, all, initial), expected) - for (const operation of [read, gzip, brotli]) { - assert.equal(operation.mock.callCount(), 4 * measurement) - } - } -}) - -test('reports completed compression time when a later file cannot be read', (t) => { - const dir = fixture(t) - let now = 10 - t.mock.method(performance, 'now', () => now++) - const timings = [] - assert.throws( - () => - measureFileSizes(dir, ['entry.js', 'missing.js'], [], (...entry) => { - timings.push(entry) - }), - { code: 'ENOENT' }, - ) - assert.deepEqual(timings, [ - ['gzip', 1], - ['brotli', 1], - ]) -}) - -for (const codec of ['gzipSync', 'brotliCompressSync']) { - test(`reports time spent in failed ${codec} and preserves the original exception`, (t) => { - const dir = fixture(t) - const failure = new Error('codec failed') - let now = 20 - t.mock.method(performance, 'now', () => now++) - t.mock.method(zlib, codec, () => { - throw failure - }) - syncBuiltinESMExports() - t.after(() => { - t.mock.restoreAll() - syncBuiltinESMExports() - }) - - const timings = [] - assert.throws( - () => - measureFileSizes(dir, ['entry.js'], [], (...entry) => { - timings.push(entry) - }), - (error) => error === failure, - ) - assert.deepEqual(timings, [ - ['gzip', 1], - ['brotli', codec === 'gzipSync' ? 0 : 1], - ]) - }) -} diff --git a/scripts/benchmarks/bundle-size/diff.mjs b/scripts/benchmarks/bundle-size/diff.mjs index 154c43ccd5..bd698bb9eb 100644 --- a/scripts/benchmarks/bundle-size/diff.mjs +++ b/scripts/benchmarks/bundle-size/diff.mjs @@ -13,7 +13,6 @@ const { values } = parseArgs({ default: 'benchmarks/bundle-size/results/current.json', }, id: { type: 'string' }, - 'current-only': { type: 'boolean' }, json: { type: 'boolean' }, }, }) @@ -34,9 +33,7 @@ const baselineById = byId(readCurrent(values.baseline)) const currentById = byId(readCurrent(values.current)) const ids = values.id ? [values.id] - : values['current-only'] - ? [...currentById.keys()].sort() - : [...new Set([...baselineById.keys(), ...currentById.keys()])].sort() + : [...new Set([...baselineById.keys(), ...currentById.keys()])].sort() const rows = ids.map((id) => { const baseline = baselineById.get(id) diff --git a/scripts/benchmarks/bundle-size/measure.mjs b/scripts/benchmarks/bundle-size/measure.mjs index 4a990feaf9..c9db84cf34 100644 --- a/scripts/benchmarks/bundle-size/measure.mjs +++ b/scripts/benchmarks/bundle-size/measure.mjs @@ -7,12 +7,10 @@ import path from 'node:path' import { fileURLToPath, pathToFileURL } from 'node:url' import { parseArgs as parseNodeArgs } from 'node:util' import vm from 'node:vm' -import { execFileSync } from 'node:child_process' +import { brotliCompressSync, gzipSync } from 'node:zlib' +import { execFileSync, execSync } from 'node:child_process' import { build } from 'vite' -import { writeReport } from './report.mjs' -import { measureFileSizes } from './compress.mjs' -import { createTimings } from './timings.mjs' const BENCHMARK_NAME = 'Bundle Size (gzip)' @@ -168,8 +166,6 @@ function parseArgs(argv) { analysis: { type: 'boolean' }, sourcemap: { type: 'boolean' }, 'skip-package-builds': { type: 'boolean' }, - 'measurements-only': { type: 'boolean' }, - timings: { type: 'boolean' }, }, }) @@ -183,8 +179,6 @@ function parseArgs(argv) { analysis: values.analysis === true, sourcemap: values.sourcemap === true, skipPackageBuilds: values['skip-package-builds'] === true, - measurementsOnly: values['measurements-only'] === true, - timings: values.timings === true || process.env.BUNDLE_SIZE_TIMINGS === '1', } } @@ -316,6 +310,38 @@ function collectAllViteJsFiles(manifest) { return [...files].sort() } +function sizesForFiles(baseDir, fileList) { + let rawBytes = 0 + let gzipBytes = 0 + let brotliBytes = 0 + const files = [] + + for (const relativeFile of fileList) { + const fullPath = path.join(baseDir, relativeFile) + const content = fs.readFileSync(fullPath) + const rawByteLength = content.byteLength + const gzipByteLength = gzipSync(content).byteLength + const brotliByteLength = brotliCompressSync(content).byteLength + + rawBytes += rawByteLength + gzipBytes += gzipByteLength + brotliBytes += brotliByteLength + files.push({ + file: relativeFile, + rawBytes: rawByteLength, + gzipBytes: gzipByteLength, + brotliBytes: brotliByteLength, + }) + } + + return { + rawBytes, + gzipBytes, + brotliBytes, + files, + } +} + async function findManifestFiles(rootDir) { const manifestPaths = [] @@ -449,6 +475,24 @@ async function importFromRoot(root, specifier) { return import(pathToFileURL(requireFromRoot.resolve(specifier)).href) } +function getGitStatus() { + try { + return { + branch: execSync('git branch --show-current', { + encoding: 'utf8', + }).trim(), + dirty: + execSync('git status --porcelain', { encoding: 'utf8' }).trim().length > + 0, + } + } catch { + return { + branch: '', + dirty: undefined, + } + } +} + function getPackageBuildProjects(scenarios) { const projects = new Set() @@ -479,7 +523,6 @@ function buildRequiredPackages({ repoRoot, scenarios, skipPackageBuilds }) { ) const args = [ - 'exec', 'nx', 'run-many', '--target=build', @@ -495,7 +538,7 @@ function buildRequiredPackages({ repoRoot, scenarios, skipPackageBuilds }) { args.push('--skipNxCache') } - execFileSync(process.env.npm_execpath || 'pnpm', args, { + execFileSync(process.platform === 'win32' ? 'pnpm.cmd' : 'pnpm', args, { cwd: repoRoot, stdio: 'inherit', env: process.env, @@ -799,6 +842,18 @@ async function resolveBundleFiles({ outDir, scenario }) { } } +function getCurrentSha(providedSha) { + if (providedSha) { + return providedSha + } + + if (process.env.GITHUB_SHA) { + return process.env.GITHUB_SHA + } + + return execSync('git rev-parse HEAD', { encoding: 'utf8' }).trim() +} + function buildCommitUrl(sha) { const repo = process.env.GITHUB_REPOSITORY @@ -852,24 +907,6 @@ async function appendHistoryFile({ historyPath, measuredAtIso, sha, benches }) { async function main() { const args = parseArgs(process.argv.slice(2)) - const timings = args.timings ? createTimings() : undefined - const finishOverall = timings?.start('overall') - try { - await measure(args, timings) - } finally { - finishOverall?.() - } -} - -async function measure(args, timings) { - if ( - args.measurementsOnly && - (args.sha || args.measuredAt || args.appendHistory) - ) { - throw new Error( - '--measurements-only cannot be combined with report metadata or history options', - ) - } const scriptDir = path.dirname(fileURLToPath(import.meta.url)) const repoRoot = path.resolve(scriptDir, '../../../') @@ -884,21 +921,14 @@ async function measure(args, timings) { const measuredAtIso = args.measuredAt ? toIsoDate(args.measuredAt) : new Date().toISOString() + const sha = getCurrentSha(args.sha) const startedAt = Date.now() const scenarios = filterScenarios(args.scenario) - const finishPackageBuilds = args.skipPackageBuilds - ? undefined - : timings?.start('package-builds') - let packageBuildProjects - try { - packageBuildProjects = buildRequiredPackages({ - repoRoot, - scenarios, - skipPackageBuilds: args.skipPackageBuilds, - }) - } finally { - finishPackageBuilds?.() - } + const packageBuildProjects = buildRequiredPackages({ + repoRoot, + scenarios, + skipPackageBuilds: args.skipPackageBuilds, + }) await fsp.mkdir(resultsDir, { recursive: true }) await fsp.mkdir(distDir, { recursive: true }) @@ -909,32 +939,18 @@ async function measure(args, timings) { const root = path.join(scenariosRoot, scenario.dir) const outDir = path.join(distDir, scenario.outDir || scenario.dir) - const finishBuild = timings?.start('scenario-build', scenario.id) - try { - await buildScenario({ - root, - outDir, - scenario, - sourcemap: args.sourcemap || args.analysis, - }) - } finally { - finishBuild?.() - } + await buildScenario({ + root, + outDir, + scenario, + sourcemap: args.sourcemap || args.analysis, + }) - const finishManifest = timings?.start('manifest-resolution', scenario.id) - let bundleInfo - try { - bundleInfo = await resolveBundleFiles({ outDir, scenario }) - } finally { - finishManifest?.() - } - const { sizes, initialSizes } = measureFileSizes( + const bundleInfo = await resolveBundleFiles({ outDir, scenario }) + const sizes = sizesForFiles(bundleInfo.manifestOutDir, bundleInfo.jsFiles) + const initialSizes = sizesForFiles( bundleInfo.manifestOutDir, - bundleInfo.jsFiles, bundleInfo.initialJsFiles, - timings - ? (phase, durationMs) => timings.record(phase, durationMs, scenario.id) - : undefined, ) const initialFileSet = new Set(bundleInfo.initialJsFiles) const files = sizes.files.map((file) => ({ @@ -964,33 +980,34 @@ async function measure(args, timings) { } if (args.analysis) { - const finishAnalysis = timings?.start('analysis', scenario.id) - try { - metric.sources = sourceAttributionForFiles( - bundleInfo.manifestOutDir, - bundleInfo.jsFiles, - ) - } finally { - finishAnalysis?.() - } + metric.sources = sourceAttributionForFiles( + bundleInfo.manifestOutDir, + bundleInfo.jsFiles, + ) } metrics.push(metric) } const completedAt = Date.now() - const measurements = { + const current = { schemaVersion: 1, benchmarkName: BENCHMARK_NAME, measuredAt: measuredAtIso, + generatedAt: new Date().toISOString(), + sha, status: { state: 'success', - command: `node ${path.relative(repoRoot, fileURLToPath(import.meta.url))}${args.scenario ? ` --scenario ${args.scenario}` : ''}${args.analysis ? ' --analysis' : ''}${args.sourcemap ? ' --sourcemap' : ''}${args.timings ? ' --timings' : ''}${args.skipPackageBuilds ? ' --skip-package-builds' : ''}`, + command: `node ${path.relative(repoRoot, fileURLToPath(import.meta.url))}${args.scenario ? ` --scenario ${args.scenario}` : ''}${args.analysis ? ' --analysis' : ''}${args.sourcemap ? ' --sourcemap' : ''}${args.skipPackageBuilds ? ' --skip-package-builds' : ''}`, scenarioFilter: args.scenario || null, measuredScenarios: scenarios.map((scenario) => scenario.id), packageBuildProjects, skipPackageBuilds: args.skipPackageBuilds, durationMs: completedAt - startedAt, + git: { + sha, + ...getGitStatus(), + }, }, metrics, } @@ -1002,12 +1019,12 @@ async function measure(args, timings) { extra: `raw=${metric.rawBytes}; brotli=${metric.brotliBytes}; initial_gzip=${metric.initialGzipBytes}`, })) - const measurementsPath = path.join(resultsDir, 'measurements.json') + const currentPath = path.join(resultsDir, 'current.json') const benchmarkActionPath = path.join(resultsDir, 'benchmark-action.json') await fsp.writeFile( - measurementsPath, - JSON.stringify(measurements, null, 2) + '\n', + currentPath, + JSON.stringify(current, null, 2) + '\n', 'utf8', ) await fsp.writeFile( @@ -1016,20 +1033,17 @@ async function measure(args, timings) { 'utf8', ) - if (!args.measurementsOnly) { - const report = writeReport(resultsDir, { sha: args.sha }) - if (args.appendHistory) { - await appendHistoryFile({ - historyPath: path.resolve(args.appendHistory), - measuredAtIso, - sha: report.sha, - benches: benchmarkActionRows, - }) - } + if (args.appendHistory) { + await appendHistoryFile({ + historyPath: path.resolve(args.appendHistory), + measuredAtIso, + sha, + benches: benchmarkActionRows, + }) } process.stdout.write( - `Measured ${metrics.length} scenarios. Wrote ${path.relative(repoRoot, measurementsPath)} and ${path.relative(repoRoot, benchmarkActionPath)}\n`, + `Measured ${metrics.length} scenarios. Wrote ${path.relative(repoRoot, currentPath)} and ${path.relative(repoRoot, benchmarkActionPath)}\n`, ) } diff --git a/scripts/benchmarks/bundle-size/report.mjs b/scripts/benchmarks/bundle-size/report.mjs deleted file mode 100644 index d5e8e5c029..0000000000 --- a/scripts/benchmarks/bundle-size/report.mjs +++ /dev/null @@ -1,82 +0,0 @@ -import { execFileSync } from 'node:child_process' -import fs from 'node:fs' -import path from 'node:path' -import { fileURLToPath, pathToFileURL } from 'node:url' -import { parseArgs } from 'node:util' - -const repoRoot = fileURLToPath(new URL('../../../', import.meta.url)) - -function getGitStatus() { - try { - return { - branch: execFileSync('git', ['branch', '--show-current'], { - cwd: repoRoot, - encoding: 'utf8', - }).trim(), - dirty: - execFileSync('git', ['status', '--porcelain'], { - cwd: repoRoot, - encoding: 'utf8', - }).trim().length > 0, - } - } catch { - return { branch: '', dirty: undefined } - } -} - -/** - * Attach the current checkout's metadata after Nx has restored measurements. - * The measurement time and duration still describe the original build. - * @param {string} resultsDir - * @param {{ sha?: string }} [options] - */ -export function writeReport(resultsDir, { sha: providedSha } = {}) { - const measurements = JSON.parse( - fs.readFileSync(path.join(resultsDir, 'measurements.json'), 'utf8'), - ) - const sha = - providedSha || - process.env.GITHUB_SHA || - execFileSync('git', ['rev-parse', 'HEAD'], { - cwd: repoRoot, - encoding: 'utf8', - }).trim() - const report = { - ...measurements, - generatedAt: new Date().toISOString(), - sha, - status: { - ...measurements.status, - git: { sha, ...getGitStatus() }, - }, - } - fs.writeFileSync( - path.join(resultsDir, 'current.json'), - JSON.stringify(report, null, 2) + '\n', - ) - return report -} - -if ( - process.argv[1] && - import.meta.url === pathToFileURL(path.resolve(process.argv[1])).href -) { - try { - const { values } = parseArgs({ - options: { - 'results-dir': { type: 'string' }, - sha: { type: 'string' }, - }, - }) - const resultsDir = values['results-dir'] - ? path.resolve(values['results-dir']) - : path.join(repoRoot, 'benchmarks/bundle-size/results') - writeReport(resultsDir, { sha: values.sha }) - console.log( - `Wrote ${path.relative(repoRoot, path.join(resultsDir, 'current.json'))}`, - ) - } catch (error) { - console.error(error instanceof Error ? error.message : error) - process.exitCode = 1 - } -} diff --git a/scripts/benchmarks/bundle-size/report.test.mjs b/scripts/benchmarks/bundle-size/report.test.mjs deleted file mode 100644 index 5b58fae39c..0000000000 --- a/scripts/benchmarks/bundle-size/report.test.mjs +++ /dev/null @@ -1,111 +0,0 @@ -import assert from 'node:assert/strict' -import { execFileSync, spawnSync } from 'node:child_process' -import fs from 'node:fs' -import os from 'node:os' -import path from 'node:path' -import test from 'node:test' -import { fileURLToPath } from 'node:url' -import { writeReport } from './report.mjs' - -const repoRoot = fileURLToPath(new URL('../../../', import.meta.url)) -const scriptPath = fileURLToPath(new URL('./report.mjs', import.meta.url)) - -/** @param {import('node:test').TestContext} t */ -function fixture(t) { - const root = fs.mkdtempSync(path.join(os.tmpdir(), 'bundle-report-')) - t.after(() => fs.rmSync(root, { recursive: true, force: true })) - const measurements = { - schemaVersion: 1, - benchmarkName: 'Bundle Size (gzip)', - measuredAt: '2026-01-01T00:00:00.000Z', - status: { - state: 'success', - durationMs: 123, - measuredScenarios: ['react-router.minimal'], - }, - metrics: [{ id: 'react-router.minimal', gzipBytes: 100 }], - } - const serialized = JSON.stringify(measurements) - fs.writeFileSync(path.join(root, 'measurements.json'), serialized) - fs.writeFileSync(path.join(root, 'benchmark-action.json'), '[]\n') - return { root, measurements, serialized } -} - -test('refreshes commit metadata without modifying cached measurements or their timestamps', (t) => { - const { root, measurements, serialized } = fixture(t) - writeReport(root, { sha: 'old-commit' }) - const startedAt = Date.now() - const report = writeReport(root, { sha: 'new-commit' }) - assert.equal(report.sha, 'new-commit') - assert.deepEqual(report.status.git, { - sha: 'new-commit', - branch: execFileSync('git', ['branch', '--show-current'], { - cwd: repoRoot, - encoding: 'utf8', - }).trim(), - dirty: - execFileSync('git', ['status', '--porcelain'], { - cwd: repoRoot, - encoding: 'utf8', - }).trim().length > 0, - }) - assert.equal(report.measuredAt, measurements.measuredAt) - assert.equal(report.status.durationMs, measurements.status.durationMs) - assert.deepEqual(report.metrics, measurements.metrics) - assert.ok(Date.parse(report.generatedAt) >= startedAt) - assert.deepEqual( - JSON.parse(fs.readFileSync(path.join(root, 'current.json'), 'utf8')), - report, - ) - assert.equal( - fs.readFileSync(path.join(root, 'measurements.json'), 'utf8'), - serialized, - ) - assert.equal( - fs.readFileSync(path.join(root, 'benchmark-action.json'), 'utf8'), - '[]\n', - ) -}) - -test('CLI uses the current CI SHA, an explicit override, or the checkout SHA', (t) => { - const { root } = fixture(t) - const checkoutSha = execFileSync('git', ['rev-parse', 'HEAD'], { - cwd: repoRoot, - encoding: 'utf8', - }).trim() - /** @type {Array<[string, string[], string]>} */ - const cases = [ - ['ci-commit', [], 'ci-commit'], - ['ci-commit', ['--sha', 'explicit-commit'], 'explicit-commit'], - ['', [], checkoutSha], - ] - for (const [githubSha, args, expected] of cases) { - const result = spawnSync( - process.execPath, - [scriptPath, '--results-dir', root, ...args], - { - env: { ...process.env, GITHUB_SHA: githubSha }, - encoding: 'utf8', - }, - ) - assert.equal(result.status, 0, result.stderr) - const report = JSON.parse( - fs.readFileSync(path.join(root, 'current.json'), 'utf8'), - ) - assert.equal(report.sha, expected) - assert.equal(report.status.git.sha, expected) - } -}) - -test('fails when cached measurements are missing instead of reusing an old report', (t) => { - const { root } = fixture(t) - fs.rmSync(path.join(root, 'measurements.json')) - fs.writeFileSync(path.join(root, 'current.json'), '{"sha":"old-commit"}') - const result = spawnSync( - process.execPath, - [scriptPath, '--results-dir', root], - { encoding: 'utf8' }, - ) - assert.notEqual(result.status, 0) - assert.match(result.stderr, /measurements\.json/) -}) diff --git a/scripts/benchmarks/bundle-size/run.mjs b/scripts/benchmarks/bundle-size/run.mjs index a4a0cc73d2..3e9d67cbfe 100644 --- a/scripts/benchmarks/bundle-size/run.mjs +++ b/scripts/benchmarks/bundle-size/run.mjs @@ -49,7 +49,6 @@ export function run(argv, execute = spawnSync) { 'dist-dir': { type: 'string' }, analysis: { type: 'boolean' }, sourcemap: { type: 'boolean' }, - timings: { type: 'boolean' }, 'skip-package-builds': { type: 'boolean' }, help: { type: 'boolean', short: 'h' }, }, @@ -66,13 +65,11 @@ export function run(argv, execute = spawnSync) { --dist-dir Override the emitted bundle directory --analysis Include source attribution in current.json --sourcemap Emit hidden source maps - --timings Record fresh phase timings in measure.log --skip-package-builds Reuse package builds only when they are unchanged Named runs use /runs//current.json. Without --name, current.json is replaced in the results root. Logs stay beside current.json; failures print a bounded log tail. -With --scenario, comparisons report only the scenarios measured in this run. Arguments after -- go to the selected unit tests, not the measurement.`) return 0 } @@ -180,17 +177,26 @@ Arguments after -- go to the selected unit tests, not the measurement.`) } if (values['test-projects']) { - 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] : []), - ]) + 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] : []), + ], + ) if (status !== 0) { return status } @@ -215,7 +221,6 @@ Arguments after -- go to the selected unit tests, not the measurement.`) for (const [option, value] of Object.entries({ analysis: values.analysis, sourcemap: values.sourcemap, - timings: values.timings, 'skip-package-builds': values['skip-package-builds'], })) { if (value) { @@ -236,7 +241,6 @@ Arguments after -- go to the selected unit tests, not the measurement.`) '--current', currentPath, ...(baselinePath ? ['--baseline', baselinePath] : []), - ...(baselinePath && values.scenario ? ['--current-only'] : []), ], false, ) diff --git a/scripts/benchmarks/bundle-size/run.test.mjs b/scripts/benchmarks/bundle-size/run.test.mjs index 335455cb5a..b4072d81de 100644 --- a/scripts/benchmarks/bundle-size/run.test.mjs +++ b/scripts/benchmarks/bundle-size/run.test.mjs @@ -11,28 +11,26 @@ const scriptPath = fileURLToPath(new URL('./run.mjs', import.meta.url)) const measurePath = fileURLToPath(new URL('./measure.mjs', import.meta.url)) /** @param {string} filePath */ -function writeCurrent( - filePath, - gzipBytes = 100, - ids = ['react-router.minimal'], -) { +function writeCurrent(filePath, gzipBytes = 100) { fs.mkdirSync(path.dirname(filePath), { recursive: true }) fs.writeFileSync( filePath, JSON.stringify({ - metrics: ids.map((id) => ({ - id, - gzipBytes, - initialGzipBytes: gzipBytes, - rawBytes: gzipBytes * 3, - brotliBytes: gzipBytes - 10, - })), + metrics: [ + { + id: 'react-router.minimal', + gzipBytes, + initialGzipBytes: gzipBytes, + rawBytes: gzipBytes * 3, + brotliBytes: gzipBytes - 10, + }, + ], }), ) } /** @param {import('node:test').TestContext} t */ -function fixture(t, measuredIds = ['react-router.minimal']) { +function fixture(t) { const root = fs.mkdtempSync(path.join(os.tmpdir(), 'bundle-runner-')) t.after(() => fs.rmSync(root, { recursive: true, force: true })) /** @type {Array<{command: string, args: string[], options: import('./run.mjs').CommandOptions}>} */ @@ -54,7 +52,7 @@ function fixture(t, measuredIds = ['react-router.minimal']) { if (args[0] === measurePath) { const outputDir = args[args.indexOf('--results-dir') + 1] assert.ok(outputDir) - writeCurrent(path.join(outputDir, 'current.json'), 90, measuredIds) + writeCurrent(path.join(outputDir, 'current.json'), 90) } if (options.stdio !== 'inherit') { fs.writeSync(options.stdio[1], 'noisy stdout\n') @@ -116,7 +114,6 @@ test('runs targeted tests before measurement and saves named results and logs', assert.equal(measure.args[0], measurePath) assert.ok(measure.args.includes('react-router.minimal,react-router.full')) assert.ok(!measure.args.includes('--skip-package-builds')) - assert.ok(!measure.args.includes('--timings')) assert.ok(!measure.args.includes('tests/path.test.ts')) for (const { options } of calls) { assert.equal(options.env.CI, '1') @@ -170,7 +167,6 @@ test('accepts an external baseline and forwards measurement options', (t) => { path.join(root, 'dist with spaces'), '--analysis', '--sourcemap', - '--timings', '--skip-package-builds', ], execute, @@ -182,144 +178,11 @@ test('accepts an external baseline and forwards measurement options', (t) => { path.join(root, 'dist with spaces'), '--analysis', '--sourcemap', - '--timings', '--skip-package-builds', ]) - assert.ok(calls.slice(1).every(({ args }) => !args.includes('--timings'))) assert.match(reports.join(''), /100 -> 90 \(-10\)/) }) -test('targeted comparisons omit unrequested scenarios from a broader baseline', async (t) => { - for (const [ - scenario, - measuredIds, - ] of /** @type {Array<[string, string[]]>} */ ([ - ['react-router.minimal', ['react-router.minimal']], - ['react-router-minimal', ['react-router.minimal']], - [ - ' solid-router.minimal, react-router.minimal ', - ['solid-router.minimal', 'react-router.minimal'], - ], - ])) { - await t.test(scenario, (t) => { - const { root, reports, execute } = fixture(t, measuredIds) - writeCurrent(path.join(root, 'runs/baseline/current.json'), 100, [ - 'react-router.full', - 'react-router.minimal', - 'solid-router.minimal', - ]) - - assert.equal( - run( - [ - '--results-dir', - root, - '--baseline', - 'baseline', - '--scenario', - scenario, - ], - execute, - ), - 0, - ) - assert.equal( - reports.join(''), - [...measuredIds] - .sort() - .map((id) => `${id} 100 -> 90 (-10) initial=-10 raw=-30 brotli=-10\n`) - .join(''), - ) - }) - } -}) - -test('targeted comparisons keep measured scenarios missing from the baseline', (t) => { - const { root, reports, execute } = fixture(t) - writeCurrent(path.join(root, 'runs/baseline/current.json'), 100, [ - 'react-router.full', - ]) - - assert.equal( - run( - [ - '--results-dir', - root, - '--baseline', - 'baseline', - '--scenario', - 'react-router.minimal', - ], - execute, - ), - 0, - ) - assert.equal( - reports.join(''), - 'react-router.minimal n/a -> 90 (n/a) initial=n/a raw=n/a brotli=n/a\n', - ) -}) - -test('unfiltered comparisons retain baseline-only scenarios', (t) => { - const { root, reports, execute } = fixture(t) - writeCurrent(path.join(root, 'runs/baseline/current.json'), 100, [ - 'react-router.full', - ]) - - assert.equal( - run(['--results-dir', root, '--baseline', 'baseline'], execute), - 0, - ) - assert.equal( - reports.join(''), - 'react-router.full 100 -> n/a (n/a) initial=n/a raw=n/a brotli=n/a\n' + - 'react-router.minimal n/a -> 90 (n/a) initial=n/a raw=n/a brotli=n/a\n', - ) -}) - -test('current-only diffs filter JSON output and preserve explicit ID selection', (t) => { - const { root } = fixture(t) - const baseline = path.join(root, 'baseline.json') - const current = path.join(root, 'current.json') - writeCurrent(baseline, 100, ['react-router.full', 'react-router.minimal']) - writeCurrent(current, 90, ['solid-router.minimal', 'react-router.minimal']) - const args = [ - fileURLToPath(new URL('./diff.mjs', import.meta.url)), - '--baseline', - baseline, - '--current', - current, - '--current-only', - '--json', - ] - const result = spawnSync(process.execPath, args, { encoding: 'utf8' }) - assert.equal(result.status, 0, result.stderr) - assert.deepEqual(JSON.parse(result.stdout), [ - { - id: 'react-router.minimal', - baseline: 100, - current: 90, - delta: -10, - initialDelta: -10, - rawDelta: -30, - brotliDelta: -10, - }, - { id: 'solid-router.minimal', current: 90 }, - ]) - - const selected = spawnSync( - process.execPath, - [...args, '--id', 'react-router.full'], - { - encoding: 'utf8', - }, - ) - assert.equal(selected.status, 0, selected.stderr) - assert.deepEqual(JSON.parse(selected.stdout), [ - { id: 'react-router.full', baseline: 100 }, - ]) -}) - test('stops on test failure, preserves its exit code, and prints only a bounded log tail', (t) => { const { root, messages } = fixture(t) let callCount = 0 @@ -422,10 +285,6 @@ test('reports help and argument errors through the CLI entry point', () => { }) assert.equal(help.status, 0) assert.match(help.stdout, /Usage: pnpm benchmark:bundle-size:run/) - assert.match( - help.stdout, - /--timings\s+Record fresh phase timings in measure\.log/, - ) const invalid = spawnSync(process.execPath, [scriptPath, '--unknown'], { encoding: 'utf8', }) diff --git a/scripts/benchmarks/bundle-size/timings.mjs b/scripts/benchmarks/bundle-size/timings.mjs deleted file mode 100644 index 15d856f96b..0000000000 --- a/scripts/benchmarks/bundle-size/timings.mjs +++ /dev/null @@ -1,20 +0,0 @@ -// Timings are diagnostics only; never include them in cacheable size metrics. -export function createTimings(write = (line) => process.stderr.write(line)) { - function record(phase, durationMs, scenario) { - write( - `[bundle-size:timing] ${JSON.stringify({ - phase, - ...(scenario ? { scenario } : {}), - durationMs: Math.round(durationMs * 1000) / 1000, - })}\n`, - ) - } - - return { - record, - start(phase, scenario) { - const started = performance.now() - return () => record(phase, performance.now() - started, scenario) - }, - } -} diff --git a/scripts/benchmarks/bundle-size/timings.test.mjs b/scripts/benchmarks/bundle-size/timings.test.mjs deleted file mode 100644 index 8d895aadc5..0000000000 --- a/scripts/benchmarks/bundle-size/timings.test.mjs +++ /dev/null @@ -1,35 +0,0 @@ -import assert from 'node:assert/strict' -import test from 'node:test' -import { createTimings } from './timings.mjs' - -test('emits labelled JSON timing lines with scenario context when supplied', (t) => { - let now = 100 - t.mock.method(performance, 'now', () => now) - const lines = [] - const timings = createTimings((line) => lines.push(line)) - timings.record('gzip', 1.234567, 'react-router.minimal') - const finishOverall = timings.start('overall') - now = 112.345678 - const finishScenario = timings.start('scenario-build', 'react-router.minimal') - now = 123.456789 - finishScenario() - now = 150.123456 - finishOverall() - - const records = lines.map((line) => { - assert.ok(line.startsWith('[bundle-size:timing] ')) - assert.ok(line.endsWith('\n')) - return JSON.parse(line.slice('[bundle-size:timing] '.length)) - }) - assert.deepEqual(records[0], { - phase: 'gzip', - scenario: 'react-router.minimal', - durationMs: 1.235, - }) - assert.deepEqual(records[1], { - phase: 'scenario-build', - scenario: 'react-router.minimal', - durationMs: 11.111, - }) - assert.deepEqual(records[2], { phase: 'overall', durationMs: 50.123 }) -}) diff --git a/scripts/nx/playwright-plugin.md b/scripts/nx/playwright-plugin.md index 665e58be4d..a9f33bb4c8 100644 --- a/scripts/nx/playwright-plugin.md +++ b/scripts/nx/playwright-plugin.md @@ -45,7 +45,7 @@ Supported toolchains: For each `{ toolchain, mode }` entry, the plugin generates: -- `build::` +- `build:e2e---` - `test:e2e---` If `shards > 1`, it also generates: @@ -59,7 +59,7 @@ Finally, it generates: ## 3. Environment variables injected by inferred targets -Each inferred `build::` and `test:e2e---` target sets: +Each inferred `build:e2e:*` and `test:e2e:*` target sets: - `MODE=` - `TOOLCHAIN=` @@ -67,23 +67,25 @@ Each inferred `build::` and `test:e2e---` targ - `E2E_DIST=dist--` - `E2E_DIST_DIR=dist--` +Each inferred `test:e2e:*` target also sets: + +- `E2E_PORT_KEY=--` +- For shard targets: `E2E_PORT_KEY=---shard--of-` + ## 4. Build behavior and webServer command -Each inferred e2e target depends on the inferred `build::` -target. It runs `vite build && tsc --noEmit` or -`rsbuild build && tsc --noEmit`, selecting the toolchain explicitly. Ordinary -package build scripts do not need to know about E2E mocking. +Each inferred e2e target depends on the inferred `build:e2e---` +target, which runs: -The React, Solid, and Vue basic examples preload the same MSW handlers in -Nx prerender builds (through mode metadata) and Playwright application servers -with Node's native option: -`NODE_OPTIONS='--import=@tanstack/router-e2e-utils/mock-api'`. -The handlers return canned posts and users at `https://jsonplaceholder.typicode.com` inside -each Node process, including prerendering. No API listener or fixture port is -needed. Playwright starts only the application server. A cached build uses the -same URL when started by a fresh process with the preload enabled. Ordinary -`pnpm dev`, builds, and standalone servers use the public API without MSW. -Application code uses the public URL in both cases; test setup enables mocking. +```sh +vite build && tsc --noEmit +``` + +with the mode/toolchain env above. + +This command is intentionally fixed (it does not call `pnpm build`). This avoids +accidentally selecting the wrong build path in projects that include multiple +toolchains. The inferred build target uses standard production inputs and explicit mode- specific outputs (`dist--`). Mode env values are passed through @@ -97,7 +99,7 @@ Good: ```ts webServer: { command: `PORT=${PORT} pnpm start`, - wait: appServerReady, + url: baseURL, } ``` @@ -108,7 +110,7 @@ const distDir = process.env.E2E_DIST_DIR ?? 'dist' webServer: { command: `pnpm preview --outDir ${distDir} --port ${PORT}`, - wait: appServerReady, + url: baseURL, } ``` @@ -117,50 +119,63 @@ Avoid: ```ts webServer: { command: `MODE=spa pnpm build && PORT=${PORT} pnpm start`, - wait: appServerReady, + url: baseURL, } ``` -## 5. Let each server bind its own port +## 5. Use `E2E_PORT_KEY` for all server ports -Use port `0` in server commands. The OS chooses a free port while binding the -listening socket. Do not reserve ports, write port files, or restore ports from -Nx outputs. - -Playwright's `webServer.wait` captures the address printed after listening. -It exports named capture groups to subsequent servers and test workers. The -shared `appServerReady` pattern captures `E2E_APP_PORT`; configs read that value -when reloaded in workers to configure `use.baseURL`. +If your setup uses `getTestServerPort`, `getDummyServerPort`, +`e2eStartDummyServer`, or `e2eStopDummyServer`, use +`process.env.E2E_PORT_KEY` first. ```ts -import { appServerReady } from '@tanstack/router-e2e-utils' +import { getTestServerPort } from '@tanstack/router-e2e-utils' +import packageJson from './package.json' with { type: 'json' } -const baseURL = `http://localhost:${process.env.E2E_APP_PORT ?? 0}` - -// Inside defineConfig: -use: { baseURL }, -webServer: { - command: 'pnpm preview --port 0', - wait: appServerReady, - reuseExistingServer: false, -}, +const e2ePortKey = process.env.E2E_PORT_KEY ?? packageJson.name +const PORT = await getTestServerPort(e2ePortKey) ``` -Canned posts/users requests use `https://jsonplaceholder.typicode.com`. Node builds and -servers preload `@tanstack/router-e2e-utils/mock-api` through `NODE_OPTIONS`. -Browser API suites import `apiTest as test` from the E2E utilities. That fixture -uses the official MSW Playwright adapter with the same handlers. Opt in only -where the API is needed: Playwright routing disables the browser HTTP cache. +Dummy server setup/teardown should use the same key: -External-navigation tests use another hostname on the existing app listener, -with a static HTML asset when the test needs a distinct destination document. -No API server, fixture-port environment variable, or build launcher is needed. +```ts +await e2eStartDummyServer(process.env.E2E_PORT_KEY ?? packageJson.name) +await e2eStopDummyServer(process.env.E2E_PORT_KEY ?? packageJson.name) +``` -Custom servers must print their actual `server.address().port`, not the -requested port. SPA servers bind their backend first and use its actual port -for proxying. Playwright owns server shutdown. +## 6. Clean stale port files once per Playwright run -## 6. Run inferred targets +If the project allocates ports through `@tanstack/router-e2e-utils`, clean stale +`port-*.txt` files before resolving the port. + +Important: do this only in the main Playwright config load. Playwright loads the +config more than once, and unconditional cleanup can remap the port after the +web server has already started. + +```ts +import fs from 'node:fs' +import packageJson from './package.json' with { type: 'json' } + +const e2ePortKey = process.env.E2E_PORT_KEY ?? packageJson.name + +if (process.env.TEST_WORKER_INDEX === undefined) { + for (const portFile of [ + `port-${e2ePortKey}.txt`, + `port-${e2ePortKey}_start.txt`, + `port-${e2ePortKey}-external.txt`, + ]) { + fs.rmSync(portFile, { force: true }) + } +} +``` + +Include the `*_start` file only if your test setup allocates a separate +`START_PORT` key. + +Avoid broad cleanup such as `rm -rf port*.txt` in shared shard runs. + +## 7. Run inferred targets Examples: diff --git a/scripts/nx/playwright-plugin.ts b/scripts/nx/playwright-plugin.ts index ce80933064..675b976613 100644 --- a/scripts/nx/playwright-plugin.ts +++ b/scripts/nx/playwright-plugin.ts @@ -1,12 +1,12 @@ import { dirname } from 'node:path' import { createNodesFromFiles, readJsonFile } from '@nx/devkit' import type { - CreateNodes, - CreateNodesContext, + CreateNodesContextV2, + CreateNodesV2, TargetConfiguration, } from '@nx/devkit' -export const createNodes: CreateNodes = [ +export const createNodesV2: CreateNodesV2 = [ '**/package.json', async (configFiles, options, context) => { return await createNodesFromFiles( @@ -21,7 +21,7 @@ export const createNodes: CreateNodes = [ function createNodesInternal( configFilePath: string, - _context: CreateNodesContext, + _context: CreateNodesContextV2, ) { const projectConfiguration = readJsonFile<{ name?: string @@ -69,6 +69,7 @@ function createNodesInternal( const { targets, targetGroupEntries } = buildShardedTargets( root, + packageName, projectConfiguration.nx.metadata.playwrightShards, ) // Project configuration to be merged into the rest of the Nx configuration @@ -129,10 +130,11 @@ function captureCommandOutput(command: string, outputFile?: string): string { function getTestOutputs( modeKey: string, - taskKey: string, + portKey: string, ): TargetConfiguration['outputs'] { return [ - `{projectRoot}/test-results/${taskKey}`, + `{projectRoot}/port-${portKey}*.txt`, + `{projectRoot}/test-results/${portKey}`, `{projectRoot}/violations.${modeKey}.*.json`, ] } @@ -247,6 +249,7 @@ function buildModeTargets( const targetGroup: Array = [] const ciDependsOnTargets: Array<{ target: string + projects: 'self' params: 'forward' }> = [] @@ -261,7 +264,7 @@ function buildModeTargets( const shardCount = modeMetadata.shards ?? 1 const distDir = `dist-${modeMetadata.toolchain}-${modeMetadata.mode}${variantPathSuffix}` const modeKey = `${modeMetadata.toolchain}-${modeMetadata.mode}${variantPathSuffix}` - const modeEnv: Record = { + const modeEnv = { ...modeMetadata.env, MODE: modeMetadata.mode, TOOLCHAIN: modeMetadata.toolchain, @@ -271,7 +274,7 @@ function buildModeTargets( E2E_DIST_DIR: distDir, } const buildLog = modeEnv.E2E_BUILD_LOG - const modeTaskKey = `${packageName}-${modeKey}-e2e` + const modePortKey = `${packageName}-${modeKey}-e2e` const modeDescription = `${modeMetadata.toolchain}/${modeMetadata.mode}${modeMetadata.name ? `/${modeMetadata.name}` : ''}` const modeShardTargets: Array = [] @@ -304,14 +307,16 @@ function buildModeTargets( targets[modeTargetName] = { executor: 'nx:run-commands', options: { - command: `playwright test --project=chromium --output=test-results/${modeTaskKey}`, + command: `playwright test --project=chromium --output=test-results/${modePortKey}`, cwd: projectRoot, - env: modeEnv, + env: { + ...modeEnv, + E2E_PORT_KEY: modePortKey, + }, }, - parallelism: false, cache: true, inputs: TEST_INPUTS, - outputs: getTestOutputs(modeKey, modeTaskKey), + outputs: getTestOutputs(modeKey, modePortKey), dependsOn: [buildTargetName], metadata: { technologies: ['playwright'], @@ -322,19 +327,21 @@ function buildModeTargets( } else { for (let shardIndex = 1; shardIndex <= shardCount; shardIndex++) { const shardTargetName = `${modeTargetName}${MODE_TARGET_SEPARATOR}shard-${shardIndex}-of-${shardCount}` - const shardTaskKey = `${modeTaskKey}-shard-${shardIndex}-of-${shardCount}` + const shardPortKey = `${modePortKey}-shard-${shardIndex}-of-${shardCount}` targets[shardTargetName] = { executor: 'nx:run-commands', options: { - command: `playwright test --project=chromium --shard=${shardIndex}/${shardCount} --output=test-results/${shardTaskKey}`, + command: `playwright test --project=chromium --shard=${shardIndex}/${shardCount} --output=test-results/${shardPortKey}`, cwd: projectRoot, - env: modeEnv, + env: { + ...modeEnv, + E2E_PORT_KEY: shardPortKey, + }, }, - parallelism: false, cache: true, inputs: TEST_INPUTS, - outputs: getTestOutputs(modeKey, shardTaskKey), + outputs: getTestOutputs(modeKey, shardPortKey), dependsOn: [buildTargetName], metadata: { technologies: ['playwright'], @@ -360,6 +367,7 @@ function buildModeTargets( inputs: TEST_INPUTS, dependsOn: modeShardTargets.map((shardTargetName) => ({ target: shardTargetName, + projects: 'self' as const, params: 'forward' as const, })), metadata: { @@ -372,6 +380,7 @@ function buildModeTargets( ciDependsOnTargets.push({ target: modeTargetName, + projects: 'self', params: 'forward', }) } @@ -395,6 +404,7 @@ function buildModeTargets( function buildShardedTargets( projectRoot: string, + packageName: string, shardCount: number, ): { targets: Record @@ -406,14 +416,17 @@ function buildShardedTargets( // Create individual shard targets for (let shardIndex = 1; shardIndex <= shardCount; shardIndex++) { const shardTargetName = `${CI_TARGET_NAME}--shard-${shardIndex}-of-${shardCount}` + const e2ePortKey = `${packageName}-shard-${shardIndex}-of-${shardCount}` targets[shardTargetName] = { executor: 'nx:run-commands', options: { command: `playwright test --project=chromium --shard=${shardIndex}/${shardCount}`, cwd: projectRoot, + env: { + E2E_PORT_KEY: e2ePortKey, + }, }, - parallelism: false, cache: true, inputs: TEST_INPUTS, dependsOn: [`^build`, 'build'], @@ -441,6 +454,7 @@ function buildShardedTargets( inputs: TEST_INPUTS, dependsOn: targetGroup.map((shardTargetName) => ({ target: shardTargetName, + projects: 'self' as const, params: 'forward' as const, })), metadata: { diff --git a/skills/bundle-size-optimization/SKILL.md b/skills/bundle-size-optimization/SKILL.md index 1b6b5ebe3a..d0f1ec574e 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:measure`, `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:build`, `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 @@ -147,8 +147,3 @@ Rolldown removes code only when unused and side-effect-free. Property reads may - Skipping behavior or benchmark tests because the change is “only bundle size.” - Skipping hunk-level attribution and keeping changes only because the full candidate improved. - Trading runtime performance, security, readability, or maintainability for bytes. - -## Meta work - -If you need to work on the bundle size measurements / workflow themselves, -read `benchmarks/bundle-size/README.md` diff --git a/tsconfig.json b/tsconfig.json index 7228771323..f3765b8ed3 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -10,7 +10,7 @@ "esModuleInterop": true, "forceConsistentCasingInFileNames": true, "isolatedModules": true, - "lib": ["DOM", "DOM.Iterable", "DOM.AsyncIterable", "ES2022"], + "lib": ["DOM", "DOM.Iterable", "ES2022"], "module": "ESNext", "moduleResolution": "Bundler", "noEmit": true,

+ TanStack Logo +

+ Next.js TanStack Start +

+
+ Docs + +