diff --git a/.changeset/rsbuild-manifest-module-chunks-once.md b/.changeset/rsbuild-manifest-module-chunks-once.md new file mode 100644 index 0000000000..02febd9d84 --- /dev/null +++ b/.changeset/rsbuild-manifest-module-chunks-once.md @@ -0,0 +1,5 @@ +--- +'@tanstack/start-plugin-core': patch +--- + +Rsbuild: the Start manifest pass that runs after every client compilation (builds and each dev update) reads an imported module's chunks once per compilation and counts the module once per importing chunk, instead of once per import connection. The manifest is unchanged; the pass takes about 40 % less time (on a 333-route app, tens of milliseconds less per HMR update). diff --git a/.changeset/rsbuild-manifest-own-chunks.md b/.changeset/rsbuild-manifest-own-chunks.md new file mode 100644 index 0000000000..04e8e29928 --- /dev/null +++ b/.changeset/rsbuild-manifest-own-chunks.md @@ -0,0 +1,5 @@ +--- +'@tanstack/start-plugin-core': patch +--- + +Rsbuild: a route's client manifest entry lists only its own chunks and CSS. When two routes shared a module in a chunk of its own, each route's entry also listed the other route's chunk as a preload and its stylesheet. diff --git a/.changeset/rsbuild-rule-use-falsy-loaders.md b/.changeset/rsbuild-rule-use-falsy-loaders.md new file mode 100644 index 0000000000..a84a054fbd --- /dev/null +++ b/.changeset/rsbuild-rule-use-falsy-loaders.md @@ -0,0 +1,5 @@ +--- +'@tanstack/start-plugin-core': patch +--- + +fix: the Rsbuild RSC integration skips falsy entries in a rule's `use` array (Rspack's conditionally disabled loaders) instead of treating them as loaders. diff --git a/.changeset/rsbuild-virtual-modules-build.md b/.changeset/rsbuild-virtual-modules-build.md new file mode 100644 index 0000000000..01a0c5ee6e --- /dev/null +++ b/.changeset/rsbuild-virtual-modules-build.md @@ -0,0 +1,5 @@ +--- +'@tanstack/start-plugin-core': patch +--- + +Rsbuild: fix the Rsbuild plugin build after two changes to its virtual modules crossed. Without this fix the package does not build, so no release could ship it. The Rsbuild dev manifest is written to its virtual module under the app's root. diff --git a/.changeset/rsbuild-virtual-modules-root.md b/.changeset/rsbuild-virtual-modules-root.md new file mode 100644 index 0000000000..427043a712 --- /dev/null +++ b/.changeset/rsbuild-virtual-modules-root.md @@ -0,0 +1,5 @@ +--- +'@tanstack/start-plugin-core': patch +--- + +Rsbuild: Start writes its virtual modules under the app's root, not the working directory. An app built or served from another directory (`rsbuild build --root ` from a monorepo root) no longer fails with "Module not found" on the packages they import, such as RSC's serialization adapters. diff --git a/.changeset/rsc-security-floor.md b/.changeset/rsc-security-floor.md new file mode 100644 index 0000000000..9c828f13b3 --- /dev/null +++ b/.changeset/rsc-security-floor.md @@ -0,0 +1,8 @@ +--- +'@tanstack/react-start-rsc': patch +--- + +Raise the minimum RSC bundler peer dependencies to versions with the React Server Components fixes for GHSA-xqc2-xf4c-x3h3 (CVE-2026-126187, unauthenticated RCE) and GHSA-h3gv-c5rc-p453 (server function DoS): + +- `@vitejs/plugin-rsc` to `>=0.5.38` (GHSA-59pf-q495-3c99), which vendors a fixed `react-server-dom-webpack`. +- `react-server-dom-rspack` to `>=0.1.1`, the first release built from React sources that include the fix. diff --git a/.changeset/start-server-fn-custom-id-check.md b/.changeset/start-server-fn-custom-id-check.md new file mode 100644 index 0000000000..384f0ade06 --- /dev/null +++ b/.changeset/start-server-fn-custom-id-check.md @@ -0,0 +1,7 @@ +--- +'@tanstack/start-plugin-core': minor +--- + +A server function id that a custom `serverFns.generateFunctionId` returns and that never worked over HTTP now fails the build, with an error naming the file, the function and the id: whitespace, a control or non-ASCII character, any of `"`, `#`, `/`, `<`, `>`, `?`, `\`, `^`, `` ` ``, `{`, `}`, the ids `.` and `..`, and a percent-encoding the server reads as another id (`%41`, lowercase hex, `%2E`) or rejects. The client puts the id in the URL unencoded, so a `#` or `?` ended the path and a `/` cut the id short (the call silently ran another server function of the file or none), and the other characters reached the server percent-encoded and matched no function. An id embedding a non-ASCII `functionName` is one of these. One case did work and now fails the build: such an id on a server function only SSR code called. + +Ids with `%` or the other characters URLs allow (such as `:`, `@`, `+`, `=`, `,`, `;`, `!`, `*`, `(`, `)`, `&`, `'`, `|`, `[`, `]`) still build and reach their handler, with a deprecation warning (from the Vite plugin; the Rsbuild plugin does not print compiler warnings yet): the next major version rejects them, since proxies and servers may decode or rewrite them (hash the inputs instead, as the documented example does). An id with `'` no longer breaks the server bundle. diff --git a/.changeset/start-vite-root-library-discovery.md b/.changeset/start-vite-root-library-discovery.md new file mode 100644 index 0000000000..d4e8221c59 --- /dev/null +++ b/.changeset/start-vite-root-library-discovery.md @@ -0,0 +1,5 @@ +--- +'@tanstack/start-plugin-core': patch +--- + +Vite: Start finds the Start libraries it bundles in the SSR build from Vite's root, not the working directory. A `vite build ` run from another directory (a monorepo root, a script) no longer leaves them external and uncompiled, where their server fns returned `undefined`. diff --git a/.github/renovate.json b/.github/renovate.json index 01be1ce5c2..6fd5aa1c86 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -21,7 +21,6 @@ "@types/node", "@types/react", "@types/react-dom", - "h3", "node", "react", "react-dom", diff --git a/.github/workflows/client-nav-benchmarks.yml b/.github/workflows/benchmarks.yml similarity index 71% rename from .github/workflows/client-nav-benchmarks.yml rename to .github/workflows/benchmarks.yml index 3862ea66dc..d5163e2368 100644 --- a/.github/workflows/client-nav-benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -22,10 +22,11 @@ on: - '!packages/**/__tests__/**' - '!packages/**/*.test.*' - 'benchmarks/**' + - '.nvmrc' workflow_dispatch: concurrency: - group: client-nav-benchmarks-${{ github.ref }} + group: benchmarks-${{ github.ref }} cancel-in-progress: false queue: single @@ -62,7 +63,22 @@ jobs: mode: memory - benchmark: memory-client mode: memory - runs-on: ubuntu-latest + # Pinned to ubuntu-24.04 (not ubuntu-latest) because: + # - `mode: simulation` (client-nav, ssr) runs under CodSpeed's own valgrind + # build, which only exists for specific Ubuntu releases. ubuntu-latest moved + # to 26.04 in Nov 2026, and the runner bundled with CodSpeedHQ/action v5.2.1 + # (runner 5.2.1) fails there with a bare "Unsupported system" error. + # `mode: memory` doesn't use valgrind, so only the CPU jobs broke. + # - An OS change silently shifts every CodSpeed baseline, so OS upgrades + # should be deliberate, not whenever GitHub moves ubuntu-latest. + # + # Blocker for moving to 26.04 / ubuntu-latest: Ubuntu 26.04 support landed in + # CodSpeedHQ/runner v5.7.0, but no CodSpeedHQ/action release bundles it yet + # (v5.6.3 ships runner 5.6.3). Check the `.codspeed-runner-version` file at + # https://github.com/CodSpeedHQ/action. Once an action release ships runner + # >= 5.7.0, bump the action pin below and this `runs-on` in the same PR, + # and expect a one-time jump in every baseline. + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 diff --git a/.github/workflows/bundle-size.yml b/.github/workflows/bundle-size.yml index 762faa49db..51ffa28e4c 100644 --- a/.github/workflows/bundle-size.yml +++ b/.github/workflows/bundle-size.yml @@ -9,12 +9,18 @@ on: - 'packages/**' - 'benchmarks/**' - 'scripts/benchmarks/bundle-size/**' + - '.nvmrc' + - 'package.json' + - 'pnpm-lock.yaml' push: branches: [main] paths: - 'packages/**' - 'benchmarks/**' - 'scripts/benchmarks/bundle-size/**' + - '.nvmrc' + - 'package.json' + - 'pnpm-lock.yaml' workflow_dispatch: concurrency: @@ -103,6 +109,8 @@ jobs: cat benchmarks/bundle-size/results/pr-comment.md - name: Upsert Sticky PR Comment + # Fork PRs have a read-only GITHUB_TOKEN, so they cannot update comments. + if: ${{ github.event.pull_request.head.repo.full_name == github.repository }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | diff --git a/.github/workflows/compiler-platforms.yml b/.github/workflows/compiler-platforms.yml new file mode 100644 index 0000000000..ad70e39bb6 --- /dev/null +++ b/.github/workflows/compiler-platforms.yml @@ -0,0 +1,101 @@ +name: Compiler Platforms + +# The main PR workflow only runs on Linux x64 (glibc). The compilers load a +# native Yuku binary per platform and handle platform-specific paths, so run +# their unit tests and a Vite and Rsbuild production build on the other +# platforms we ship to. + +on: + pull_request: + paths: + - 'packages/router-utils/**' + - 'packages/router-generator/**' + - 'packages/router-plugin/**' + - 'packages/start-plugin-core/**' + - 'pnpm-lock.yaml' + - '.github/workflows/compiler-platforms.yml' + schedule: + # Weekly, to catch new Yuku releases and runner image updates + - cron: '0 6 * * 1' + workflow_dispatch: + +concurrency: + group: ${{ github.workflow }}-${{ github.event.number || github.ref }} + cancel-in-progress: true + +permissions: + contents: read + +env: + NX_DAEMON: 'false' + NX_NO_CLOUD: 'true' + +defaults: + run: + shell: bash + +jobs: + compiler: + name: ${{ matrix.name }} + runs-on: ${{ matrix.os }} + # actions/setup-node only ships glibc builds, so musl uses Alpine's Node image + container: ${{ matrix.container }} + strategy: + fail-fast: false + matrix: + include: + - name: Windows x64 + os: windows-latest + - name: macOS arm64 + os: macos-latest + - name: Linux arm64 + os: ubuntu-24.04-arm + - name: Linux x64 musl + os: ubuntu-latest + container: node:24.8.0-alpine3.22@sha256:3e843c608bb5232f39ecb2b25e41214b958b0795914707374c8acc28487dea17 + steps: + - name: Install system packages + if: ${{ matrix.container }} + shell: sh + run: apk add --no-cache bash git + - name: Keep LF line endings + # Snapshots are stored with LF. Windows runners check out CRLF by default, + # and with `* text=auto` disabling autocrlf alone still uses the native eol + run: | + git config --global core.autocrlf false + git config --global core.eol lf + - name: Checkout + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + with: + persist-credentials: false + - name: Setup pnpm + if: ${{ !matrix.container }} + uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 # v6.1.1 + - name: Setup Node + if: ${{ !matrix.container }} + uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0 + with: + node-version-file: .nvmrc + package-manager-cache: false + - name: Setup pnpm (container) + if: ${{ matrix.container }} + run: npm install --global "$(node -p "require('./package.json').packageManager")" + - name: Install dependencies + run: >- + pnpm install --frozen-lockfile + --filter . + --filter "@tanstack/router-utils..." + --filter "@tanstack/router-generator..." + --filter "@tanstack/router-plugin..." + --filter "@tanstack/start-plugin-core..." + --filter "tanstack-react-start-e2e-basic..." + - name: Unit tests + run: >- + pnpm nx run-many --targets=test:unit + --projects=@tanstack/router-utils,@tanstack/router-generator,@tanstack/router-plugin,@tanstack/start-plugin-core + --skip-nx-cache --outputStyle=static + - name: Production builds + run: >- + pnpm nx run-many --targets=build:vite:ssr,build:rsbuild:ssr + --projects=tanstack-react-start-e2e-basic + --skip-nx-cache --outputStyle=static diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index d8c779b170..fde1100409 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -9,6 +9,8 @@ permissions: jobs: labeler: + # Fork PRs have a read-only GITHUB_TOKEN, so they cannot update labels. + if: ${{ github.event.pull_request.head.repo.full_name == github.repository }} runs-on: ubuntu-latest steps: - name: Labeller diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 71026a0a92..ae19b4f0d2 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -10,6 +10,13 @@ concurrency: env: NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }} SERVER_PRESET: 'node-server' + # Enable dynamic task packing for distributed CI. + NX_CLOUD_AGENT_TASK_QUEUE: true + NX_CLOUD_AUTO_TASK_PACKING: true + NX_CLOUD_AGENT_UNCAPPED_GROUP_WORK: true + NX_CLOUD_PACKING_MEM_MULTIPLIER: 1.5 + NX_CLOUD_BUFFER_TASK_COMPLETIONS: true + NX_CLOUD_CONTINUOUS_ASSIGNMENT: true permissions: contents: read @@ -26,8 +33,8 @@ jobs: with: fetch-depth: 0 persist-credentials: false - - name: Start Nx Agents - run: npx nx-cloud start-ci-run --distribute-on=".nx/workflows/dynamic-changesets.yaml" + - name: Start Nx Workers + run: npx nx-cloud start-workers - name: Setup Tools uses: TanStack/config/.github/setup@e4b48f16568324f76f467aa4c2aac2f05db632c3 # main - name: Get base and head commits for `nx affected` @@ -36,9 +43,9 @@ jobs: main-branch-name: main - name: Run Checks run: pnpm run test:pr --parallel=3 - - name: Stop Nx Agents + - name: Stop Nx Workers if: ${{ always() }} - run: npx nx-cloud stop-all-agents + run: npx nx-cloud stop-all-workers preview: name: Preview runs-on: ubuntu-latest diff --git a/.nvmrc b/.nvmrc index b404027604..63f87c20ef 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -24.8.0 +26.12.1 diff --git a/.nx/ci-config.yaml b/.nx/ci-config.yaml new file mode 100644 index 0000000000..2f0783feb4 --- /dev/null +++ b/.nx/ci-config.yaml @@ -0,0 +1,5 @@ +dte: + distribute-on: + small-changeset: 6 linux-medium-js + medium-changeset: 12 linux-medium-js + large-changeset: 18 linux-medium-js diff --git a/.nx/workflows/dynamic-changesets.yaml b/.nx/workflows/dynamic-changesets.yaml deleted file mode 100644 index 39d858d5b2..0000000000 --- a/.nx/workflows/dynamic-changesets.yaml +++ /dev/null @@ -1,4 +0,0 @@ -distribute-on: - small-changeset: 4 linux-medium-js - medium-changeset: 8 linux-medium-js - large-changeset: 16 linux-medium-js diff --git a/.nx/workflows/sandboxing-config.yaml b/.nx/workflows/ultracache-config.yaml similarity index 88% rename from .nx/workflows/sandboxing-config.yaml rename to .nx/workflows/ultracache-config.yaml index c6f527f6b2..b3ed223621 100644 --- a/.nx/workflows/sandboxing-config.yaml +++ b/.nx/workflows/ultracache-config.yaml @@ -1,21 +1,21 @@ -exclude-reads: +ignore-reads: - e2e/.gitignore - '**/src/routeTree.gen.ts' -exclude-writes: +ignore-writes: - '**/src/routeTree.gen.ts' task-exclusions: - target: test:build - exclude-reads: + ignore-reads: - LICENSE # HMR tests edit these inputs in place and restore their original contents. # Keep them out of cached outputs so cache replay never overwrites source. - project: tanstack-react-start-e2e-deferred-hydration target: test:e2e - exclude-writes: + ignore-writes: - e2e/react-start/deferred-hydration/src/routes/components.tsx - project: tanstack-react-start-e2e-hmr target: test:e2e - exclude-writes: &hmr-source-writes + ignore-writes: &hmr-source-writes - e2e/react-start/hmr/src/components/AliasedRouteImportChildPanel.tsx - e2e/react-start/hmr/src/components/AliasedRouteImportParentPanel.tsx - e2e/react-start/hmr/src/hmr/server-fn-hmr-factory.ts @@ -32,25 +32,25 @@ task-exclusions: - e2e/react-start/hmr/src/routes/inputs.tsx - project: tanstack-react-start-e2e-hmr target: test:e2e--vite-ssr - exclude-writes: *hmr-source-writes + ignore-writes: *hmr-source-writes - project: tanstack-react-start-e2e-hmr target: test:e2e--vite-ssr--bundled-dev - exclude-writes: *hmr-source-writes + ignore-writes: *hmr-source-writes - project: tanstack-react-start-e2e-hmr target: test:e2e--rsbuild-ssr - exclude-writes: *hmr-source-writes + ignore-writes: *hmr-source-writes - project: tanstack-react-start-e2e-rsbuild target: test:e2e--rsbuild-ssr - exclude-writes: + ignore-writes: - e2e/react-start/rsbuild/src/routes/index.tsx - project: tanstack-react-start-e2e-server-functions target: test:e2e - exclude-writes: + ignore-writes: - e2e/react-start/server-functions/src/routes/consistent.tsx # Scaffolding tests deliberately populate tracked empty route fixtures. - project: '@tanstack/router-generator' target: test:unit - exclude-writes: + ignore-writes: - packages/router-generator/tests/generator/custom-scaffolding/routes/__root.tsx - packages/router-generator/tests/generator/custom-scaffolding/routes/api/bar.tsx - packages/router-generator/tests/generator/custom-scaffolding/routes/foo.lazy.tsx @@ -58,67 +58,67 @@ task-exclusions: # These reads are of scratch files created by the same test invocation. - project: tanstack-solid-start-e2e-basic-auth target: test:e2e - exclude-reads: + ignore-reads: - e2e/solid-start/basic-auth/.tmp/dev.db - project: tanstack-vue-start-e2e-basic-auth target: test:e2e - exclude-reads: + ignore-reads: - e2e/vue-start/basic-auth/.tmp/dev.db - project: '@tanstack/router-generator' target: test:unit - exclude-reads: + ignore-reads: - packages/router-generator/tests/generator/file-modification/routes/[(]test[)]/initiallyEmpty.tsx - packages/router-generator/tests/generator/file-modification/routes/[(]test[)]/initiallyEmpty.lazy.tsx # Mutable counters are scratch state, not artifacts to replay from cache. - project: tanstack-react-start-e2e-basic-tsr-config target: test:e2e - exclude-reads: + ignore-reads: - e2e/react-start/basic-tsr-config/count.txt - exclude-writes: + ignore-writes: - e2e/react-start/basic-tsr-config/count.txt - project: tanstack-solid-start-e2e-basic-tsr-config target: test:e2e - exclude-reads: + ignore-reads: - e2e/solid-start/basic-tsr-config/count.txt - exclude-writes: + ignore-writes: - e2e/solid-start/basic-tsr-config/count.txt - project: tanstack-vue-start-e2e-basic-tsr-config target: test:e2e - exclude-reads: + ignore-reads: - e2e/vue-start/basic-tsr-config/count.txt - exclude-writes: + ignore-writes: - e2e/vue-start/basic-tsr-config/count.txt # Paraglide downloads compiler plugins from the URLs in settings.json. # Ignore warm-cache reads; the settings remain inputs and cache files outputs. - project: tanstack-react-start-e2e-i18n-paraglide target: build - exclude-reads: + ignore-reads: - e2e/react-start/i18n-paraglide/project.inlang/cache/plugins/* - project: tanstack-router-e2e-react-i18n-paraglide target: build - exclude-reads: + ignore-reads: - e2e/react-router/i18n-paraglide/project.inlang/cache/plugins/* - project: tanstack-react-start-e2e-i18n-paraglide target: test:e2e - exclude-reads: + ignore-reads: - e2e/react-start/i18n-paraglide/project.inlang/cache/plugins/* - project: tanstack-router-e2e-react-i18n-paraglide target: test:e2e - exclude-reads: + ignore-reads: - e2e/react-router/i18n-paraglide/project.inlang/cache/plugins/* - project: tanstack-router-i18n-paraglide target: build - exclude-reads: + ignore-reads: - examples/react/i18n-paraglide/project.inlang/cache/plugins/* - project: tanstack-start-i18n-paraglide target: build - exclude-reads: + ignore-reads: - examples/react/start-i18n-paraglide/project.inlang/cache/plugins/* - project: tanstack-router-solid-i18n-paraglide target: build - exclude-reads: + ignore-reads: - examples/solid/i18n-paraglide/project.inlang/cache/plugins/* - project: tanstack-solid-start-i18n-paraglide target: build - exclude-reads: + ignore-reads: - examples/solid/start-i18n-paraglide/project.inlang/cache/plugins/* diff --git a/AGENTS.md b/AGENTS.md index 41d28bbd38..f47b5103e1 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -8,16 +8,19 @@ ## Work and validation - Start bug fixes with a failing regression test that uses only public APIs to reproduce and assert user- or developer-visible behavior. Do not manufacture bugs by mutating internals. Establish whether real usage can reach the failing state before adding runtime handling; simplify handling of states proven unreachable. +- When removing an API, option, or behavior, delete its tests. Never add tests that assert the removed thing is gone, such as `not.toHaveProperty('oldName')`, a type error for the old call, or a runtime throw. - For suspected dependency issues, verify the upstream root cause, then propose an upstream fix to the user, including for other `@tanstack/*` packages. **Never implement a workaround in this repository unless the user explicitly authorizes it.** - During debugging/prototyping, keep fixes aligned with the PR's intended architecture. If making a test pass requires another flag, counter, copied deadline, or duplicate completion authority, stop and consolidate state and ownership. Remove superseded paths instead of accumulating patches and bundle growth. - Use Node from `.nvmrc` and pnpm from root `package.json`. Install at the root with `CI=1 pnpm install --frozen-lockfile`. - For sandbox-blocked registry/store access, escalate the same command; report the blocker if unavailable. Do not change stores, delete dependencies/lockfiles, use `--force`/`--ignore-scripts`, or weaken workspace trust/build policies to bypass it. - Never manually edit `pnpm-lock.yaml` or any `routeTree.gen.ts`. Regenerate the lockfile with `pnpm install --no-frozen-lockfile` after intentional dependency changes; regenerate route trees through app builds/dev servers or the generator fixture harness. - Always use control-flow braces. Run `pnpm format` before validation. -- Use Nx: workspace imports consume built packages, so direct runners can test stale dependencies. Inspect resolved targets; some are inferred. +- Use Nx: workspace imports consume built packages, so direct runners can test stale dependencies. Inspect resolved targets with `pnpm nx show project --json`; some are inferred. +- Run finite validation through `run-many` with explicit projects and targets, including a single project/target. Nx automatically selects `summary` output when it detects an AI agent: omit `--outputStyle` for normal runs. Read the reported full log files for failures; use `--outputStyle=summary` if agent detection is unavailable. +- Use `--outputStyle=static` or `pnpm nx run :` only when diagnosing a task and its full output is needed. Continuous/watch targets may use live output. ```sh -CI=1 NX_DAEMON=false pnpm nx run : --outputStyle=stream --skipRemoteCache +CI=1 NX_DAEMON=false pnpm nx run-many -p -t --skipRemoteCache ``` - Run one Nx command at a time. For a ~20-second startup/graph stall, stop, run `pnpm nx reset`, and retry once, then escalate. Do not apply that timeout to running tests. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ce76a5ba5d..4b6e808af1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -142,6 +142,14 @@ pnpm dev ## AI-assisted contributions + + AI tools can be useful for exploring the codebase, drafting changes, and writing tests. They do not replace the contributor's responsibility for the result. 1. **Keep the contribution in your own voice**. Review and rewrite generated code comments, issue reports, and pull request descriptions so they reflect what you actually mean. diff --git a/benchmarks/AGENTS.md b/benchmarks/AGENTS.md index 268e23d9cc..9d56a2411a 100644 --- a/benchmarks/AGENTS.md +++ b/benchmarks/AGENTS.md @@ -10,4 +10,6 @@ Read the relevant README before running benchmarks. Compare baseline and candida Use `test:perf:` through Nx. Plain memory runs only smoke-test; memory metrics require CodSpeed. Client navigation benchmarks do not cover Start hydration or client server-function calls. +Run `vitest bench` directly only with `--mode benchmark`, as the Nx targets do. Vitest 5 otherwise uses Vite's `test` mode, where vite-plugin-solid injects a jest-dom setup file that benchmark packages cannot resolve. + For bundle-size work, follow the full optimization skill required by the root guide. Full API fixtures are maintained manually: when public hooks/components change, update matching `bundle-size/scenarios/*-full/src/routes/__root.tsx` fixtures. Save baseline results separately because each run overwrites `bundle-size/results/current.json`; report final gzip deltas and explain remaining growth. diff --git a/benchmarks/README.md b/benchmarks/README.md index 7e9a5f4248..94d2f31802 100644 --- a/benchmarks/README.md +++ b/benchmarks/README.md @@ -76,7 +76,7 @@ Node and use `setImmediate` directly. Dispatch the existing `Benchmarks` workflow against an unchanged branch: ```sh -gh workflow run client-nav-benchmarks.yml --ref +gh workflow run benchmarks.yml --ref ``` Wait for each workflow run to finish before dispatching the next repetition at diff --git a/benchmarks/bundle-size/README.md b/benchmarks/bundle-size/README.md index b5f7404480..2185d6b43f 100644 --- a/benchmarks/bundle-size/README.md +++ b/benchmarks/bundle-size/README.md @@ -42,7 +42,7 @@ pnpm benchmark:bundle-size:run --scenario react-router.minimal,react-router.full The runner calls `measure.mjs`, which builds the selected package projects through Nx. Full runs build the package projects for all scenarios. `pnpm benchmark:bundle-size` uses the Nx build cache for the full benchmark, then generates `current.json` with the current commit, branch, dirty status, and report timestamp. CI uses this command as well. -Nx caches the bundles, `measurements.json`, and `benchmark-action.json`. Git metadata does not affect the build cache. The report preserves the original `measuredAt` and build duration when measurements come from cache; `generatedAt` records when the report was generated. Running `pnpm nx run @benchmarks/bundle-size:build` directly produces only the cacheable outputs; run `node scripts/benchmarks/bundle-size/report.mjs` afterward to refresh `current.json`. +Nx caches the bundles, `measurements.json`, and `benchmark-action.json`. Git metadata does not affect the build cache. The report preserves the original `measuredAt` and build duration when measurements come from cache; `generatedAt` records when the report was generated. Running `pnpm nx run @benchmarks/bundle-size:measure` directly produces only the cacheable outputs; run `node scripts/benchmarks/bundle-size/report.mjs` afterward to refresh `current.json`. If the required packages are already built and unchanged, skip that step: diff --git a/benchmarks/bundle-size/package.json b/benchmarks/bundle-size/package.json index 283f675e44..ca34cd6cd7 100644 --- a/benchmarks/bundle-size/package.json +++ b/benchmarks/bundle-size/package.json @@ -3,12 +3,13 @@ "private": true, "type": "module", "scripts": { - "build": "node ../../scripts/benchmarks/bundle-size/measure.mjs --skip-package-builds --measurements-only", + "measure": "node ../../scripts/benchmarks/bundle-size/measure.mjs --skip-package-builds --measurements-only", "test:unit": "node --test ../../scripts/benchmarks/bundle-size/pr-report.test.mjs ../../scripts/benchmarks/bundle-size/run.test.mjs ../../scripts/benchmarks/bundle-size/report.test.mjs ../../scripts/benchmarks/bundle-size/build.test.mjs ../../scripts/benchmarks/bundle-size/compress.test.mjs ../../scripts/benchmarks/bundle-size/timings.test.mjs" }, "nx": { "targets": { - "build": { + "measure": { + "cache": true, "inputs": [ "buildProduction", "^buildProduction", @@ -67,7 +68,7 @@ "vue": "^3.5.16" }, "devDependencies": { - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-react": "^2.0.0", "@tanstack/router-plugin": "workspace:^", "@types/react": "^19.0.8", diff --git a/benchmarks/client-nav/README.md b/benchmarks/client-nav/README.md index 67ea50cb4e..ec34ecc0c1 100644 --- a/benchmarks/client-nav/README.md +++ b/benchmarks/client-nav/README.md @@ -78,6 +78,7 @@ scenarios follow these navigation/mount conventions: - Scenarios behave like a real user app: navigation happens through `` clicks dispatched on real anchor elements (unless a scenario specifically measures the imperative API), the router uses the default browser history, and `scrollRestoration` is enabled. - Each benchmark iteration advances a fixed, circular sequence of steps; every step awaits the router's `onRendered` event, so render work is included and steps cannot overlap. No two consecutive steps may target the same location, and the sequence ends back on the initial route. - Setup runs one warm-up lap through the sequence and asserts each step's observable output (e.g. `document.title`), so a scenario that silently stops doing its work fails instead of reporting a fast time. +- Apps are mounted and disposed outside timing by `benchLifecycle` (`benchmarks/cpu-simulation.ts`): CodSpeed measures a single invocation, so every invocation gets a freshly mounted app; plain `vitest bench` keeps one app per warmup/run phase. Bench functions must be `async` functions, because CodSpeed's Vitest 5 provider awaits only `AsyncFunction`s. - Determinism: no wall-clock timers (async work is resolved promises or counted `setTimeout(0)` hops), `staleTime`/`gcTime` only ever `0` or effectively-infinite, no `Math.random`/`Date.now` in the measured loop. Scroll restoration uses `getScrollRestorationKey: (location) => location.pathname` so its cache stays bounded (the default random per-entry key grows one cache entry per push navigation). The `mount` scenario opts out of `scrollRestoration` entirely and destroys its history on unmount — both register page-lifetime globals that would leak across its mount/unmount loop. - Push-only step laps grow jsdom's session-history entry list over a run (jsdom never truncates entries behind the current index). Per-push cost stays O(1) so timings are unaffected; only the `history` scenario needs — and has — a lap that is depth-stationary. - Calibration: pick per-iteration step counts so a bench's `vitest bench` run stays roughly between 8 and 30 seconds (long enough to average out, short enough for CI). @@ -102,7 +103,7 @@ Run a single scenario app manually (after building it through Nx): ```bash CI=1 NX_DAEMON=false pnpm nx run @benchmarks/client-nav--:build:client --outputStyle=stream --skipRemoteCache -cd benchmarks/client-nav && NODE_ENV=production vitest bench --config ./scenarios///vite.config.ts +cd benchmarks/client-nav && NODE_ENV=production vitest bench --mode benchmark --config ./scenarios///vite.config.ts ``` Run framework-specific flame benchmarks (10 second loop, profiled with `@platformatic/flame`, forced to `NODE_ENV=production`): @@ -178,11 +179,10 @@ task cancellation, and window disposal also run outside measurement. Diagnostic tests count Link renders or reactive evaluations and check they stop before the measured region ends; counting is disabled in the timed workload. -CodSpeed uses suite `beforeEach`/`afterEach` hooks. Ordinary Vitest instead -installs Tinybench's public Task iteration hooks from its stage-level `setup`. -Using only stage-level setup would let later iterations reuse an already -hydrated document. The hydration unit tests cover fresh-state setup through -both paths. +The bench's own `beforeEach`/`afterEach` hooks prepare and dispose every +sample outside timing, in both CodSpeed and ordinary Vitest runs. Per-phase +setup would let later iterations reuse an already hydrated document. The +hydration unit tests cover repeated fresh-state setup. Each scenario is included in its framework's aggregate build and CodSpeed run. Land the benchmark independently to establish main's baseline before comparing a @@ -196,7 +196,7 @@ construction. `scenarios/mount` includes construction but also rendering and loading. To isolate initialization, use the core construction benchmark: ```bash -CI=1 NX_DAEMON=false pnpm nx run @tanstack/router-core:test:unit --outputStyle=stream --skipRemoteCache -- bench tests/route-tree-construction.bench.ts --run --testNamePattern=1000.routes --outputJson /tmp/route-tree-construction.json +CI=1 NX_DAEMON=false pnpm nx run @tanstack/router-core:test:unit --outputStyle=stream --skipRemoteCache -- bench tests/route-tree-construction.bench.ts --run --testNamePattern=1000.routes --reporter=json --outputFile=/tmp/route-tree-construction.json ``` It covers 100, 1,000, and 10,000 static, dynamic, nested, or mixed routes. @@ -220,7 +220,7 @@ CI=1 NX_DAEMON=false pnpm nx run @benchmarks/react-link-performance:test:perf:cl CI=1 NX_DAEMON=false pnpm nx run @benchmarks/react-link-performance:test:perf:ssr --outputStyle=stream --skipRemoteCache -- --run # Select a feature and save the normal Vitest JSON report. -CI=1 NX_DAEMON=false pnpm nx run @benchmarks/react-link-performance:test:perf:client --outputStyle=stream --skipRemoteCache -- --run -t "updater|optional|splat" --outputJson /tmp/link-perf.json +CI=1 NX_DAEMON=false pnpm nx run @benchmarks/react-link-performance:test:perf:client --outputStyle=stream --skipRemoteCache -- --run -t "updater|optional|splat" --reporter=json --outputFile=/tmp/link-perf.json ``` The cases cover repeated versus unique destination params, updater functions, diff --git a/benchmarks/client-nav/link-performance/client.bench.ts b/benchmarks/client-nav/link-performance/client.bench.ts index 086fadd161..f819fab52b 100644 --- a/benchmarks/client-nav/link-performance/client.bench.ts +++ b/benchmarks/client-nav/link-performance/client.bench.ts @@ -1,4 +1,5 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../cpu-simulation' import { LINK_CASES } from './cases' import { createClientScenario, samplingOptions } from './scenario' import type * as App from './src/client' @@ -10,7 +11,7 @@ if (app.serverEnvironment !== false) { } for (const { id, label } of LINK_CASES) { - describe(label, () => { + test(label, async ({ bench }) => { const scenario = createClientScenario(app, id) function finish() { try { @@ -19,13 +20,11 @@ for (const { id, label } of LINK_CASES) { scenario.teardown() } } - beforeEach(scenario.setup) - afterEach(finish) - bench(`client Links: ${id}`, scenario.batch, { - ...samplingOptions, - setup: scenario.setup, - teardown: finish, - }) + await bench( + `client Links: ${id}`, + benchLifecycle({ before: scenario.setup, after: finish }), + scenario.batch, + ).run(samplingOptions) }) } diff --git a/benchmarks/client-nav/link-performance/project.json b/benchmarks/client-nav/link-performance/project.json index 899f013818..fd1751c081 100644 --- a/benchmarks/client-nav/link-performance/project.json +++ b/benchmarks/client-nav/link-performance/project.json @@ -36,7 +36,7 @@ "cache": false, "dependsOn": ["build:client"], "options": { - "command": "NODE_ENV=production vitest bench --config ./link-performance/vite.client.config.ts", + "command": "NODE_ENV=production vitest bench --mode benchmark --config ./link-performance/vite.client.config.ts", "cwd": "benchmarks/client-nav" } }, @@ -45,7 +45,7 @@ "cache": false, "dependsOn": ["build:ssr"], "options": { - "command": "NODE_ENV=production vitest bench --config ./link-performance/vite.ssr.config.ts", + "command": "NODE_ENV=production vitest bench --mode benchmark --config ./link-performance/vite.ssr.config.ts", "cwd": "benchmarks/client-nav" } }, diff --git a/benchmarks/client-nav/link-performance/ssr.bench.ts b/benchmarks/client-nav/link-performance/ssr.bench.ts index 2a4b431292..c30084e510 100644 --- a/benchmarks/client-nav/link-performance/ssr.bench.ts +++ b/benchmarks/client-nav/link-performance/ssr.bench.ts @@ -1,4 +1,5 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../cpu-simulation' import { LINK_CASES } from './cases' import { createSsrScenario, samplingOptions } from './scenario' import type * as App from './src/ssr' @@ -10,7 +11,7 @@ if (app.serverEnvironment !== true) { } for (const { id, label } of LINK_CASES) { - describe(label, () => { + test(label, async ({ bench }) => { const scenario = createSsrScenario(app, id) function finish() { try { @@ -19,13 +20,11 @@ for (const { id, label } of LINK_CASES) { scenario.teardown() } } - beforeEach(scenario.setup) - afterEach(finish) - bench(`SSR Links: ${id}`, scenario.batch, { - ...samplingOptions, - setup: scenario.setup, - teardown: finish, - }) + await bench( + `SSR Links: ${id}`, + benchLifecycle({ before: scenario.setup, after: finish }), + scenario.batch, + ).run(samplingOptions) }) } diff --git a/benchmarks/client-nav/package.json b/benchmarks/client-nav/package.json index bc2eb66c4c..1f878adc67 100644 --- a/benchmarks/client-nav/package.json +++ b/benchmarks/client-nav/package.json @@ -9,10 +9,10 @@ "test:flame:react": "NODE_ENV=production flame run --md-format=detailed --delay=none --node-options=\"--stack-size=65500\" ./react/speed.flame.ts", "test:flame:solid": "NODE_ENV=production flame run --md-format=detailed --delay=none --node-options=\"--stack-size=65500\" ./solid/speed.flame.ts", "test:flame:vue": "NODE_ENV=production flame run --md-format=detailed --delay=none --node-options=\"--stack-size=65500\" ./vue/speed.flame.ts", - "test:perf": "NODE_ENV=production vitest bench --config ./vitest.config.ts", - "test:perf:react": "NODE_ENV=production vitest bench --config ./vitest.react.config.ts", - "test:perf:solid": "NODE_ENV=production vitest bench --config ./vitest.solid.config.ts", - "test:perf:vue": "NODE_ENV=production vitest bench --config ./vitest.vue.config.ts", + "test:perf": "NODE_ENV=production vitest bench --mode benchmark --config ./vitest.config.ts", + "test:perf:react": "NODE_ENV=production vitest bench --mode benchmark --config ./vitest.react.config.ts", + "test:perf:solid": "NODE_ENV=production vitest bench --mode benchmark --config ./vitest.solid.config.ts", + "test:perf:vue": "NODE_ENV=production vitest bench --mode benchmark --config ./vitest.vue.config.ts", "test:types": "pnpm run test:types:react && pnpm run test:types:solid && pnpm run test:types:vue", "test:types:react": "tsc -p ./react/tsconfig.json --noEmit", "test:types:solid": "tsc -p ./solid/tsconfig.json --noEmit", @@ -31,7 +31,7 @@ }, "devDependencies": { "@platformatic/flame": "^1.6.0", - "@codspeed/vitest-plugin": "^5.7.1", + "@codspeed/vitest-plugin": "^6.0.1", "@tanstack/router-plugin": "workspace:^", "@testing-library/react": "^16.2.0", "@vitejs/plugin-react": "^6.0.1", diff --git a/benchmarks/client-nav/react/speed.bench.ts b/benchmarks/client-nav/react/speed.bench.ts index fcc15b5fbc..944f182734 100644 --- a/benchmarks/client-nav/react/speed.bench.ts +++ b/benchmarks/client-nav/react/speed.bench.ts @@ -1,34 +1,19 @@ -import { afterAll, beforeAll, bench, describe } from 'vitest' +import { test } from 'vitest' import { setup } from './setup' -describe('client-nav', () => { - const test = setup() +test('client-nav', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores "suite hooks" like `beforeAll` and `afterAll`, - * so we use tinybench's `setup` and `teardown` options to run our setup and teardown logic. - * - * But CodSpeed calls the benchmarked function directly, bypassing `setup` and `teardown`, - * but it does support `beforeAll` and `afterAll`. - * - * So it looks like we're setting up in duplicate, but in reality, it's only running once per environment, as intended. - */ - - beforeAll(test.before) - afterAll(test.after) - - bench( + await bench( 'client-side navigation loop (react)', + { beforeAll: scenario.before, afterAll: scenario.after }, async () => { for (let i = 0; i < 10; i++) { - await test.tick() + await scenario.tick() } }, - { - warmupIterations: 100, - time: 10_000, - setup: test.before, - teardown: test.after, - }, - ) + ).run({ + warmupIterations: 100, + time: 10_000, + }) }) diff --git a/benchmarks/client-nav/react/vite.config.ts b/benchmarks/client-nav/react/vite.config.ts index ea85a49a21..7df3f80e71 100644 --- a/benchmarks/client-nav/react/vite.config.ts +++ b/benchmarks/client-nav/react/vite.config.ts @@ -34,5 +34,6 @@ export default defineConfig({ watch: false, environment: 'jsdom', setupFiles: [`${rootDir}vitest.setup.ts`], + benchmark: { include: ['react/speed.bench.ts'] }, }, }) diff --git a/benchmarks/client-nav/scenarios/async-pipeline/react/speed.bench.ts b/benchmarks/client-nav/scenarios/async-pipeline/react/speed.bench.ts index c3f4c5231c..65dab0781e 100644 --- a/benchmarks/client-nav/scenarios/async-pipeline/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/async-pipeline/react/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-async-pipeline', () => { - const test = setup() +test('client-async-pipeline', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-async-pipeline navigation loop (react)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/async-pipeline/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/async-pipeline/solid/speed.bench.ts index 96082e9963..acef710469 100644 --- a/benchmarks/client-nav/scenarios/async-pipeline/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/async-pipeline/solid/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-async-pipeline', () => { - const test = setup() +test('client-async-pipeline', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-async-pipeline navigation loop (solid)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/async-pipeline/solid/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/async-pipeline/solid/src/routeTree.gen.ts index 7c15baf4e9..27b9498b11 100644 --- a/benchmarks/client-nav/scenarios/async-pipeline/solid/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/async-pipeline/solid/src/routeTree.gen.ts @@ -9,25 +9,25 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { Route as rootRouteImport } from './routes/__root' -import { Route as NestedRouteImport } from './routes/nested' import { Route as IndexRouteImport } from './routes/index' -import { Route as SlowIdRouteImport } from './routes/slow.$id' -import { Route as NestedIdRouteImport } from './routes/nested.$id' +import { Route as NestedRouteImport } from './routes/nested' import { Route as CtxIdRouteImport } from './routes/ctx.$id' +import { Route as NestedIdRouteImport } from './routes/nested.$id' +import { Route as SlowIdRouteImport } from './routes/slow.$id' -const NestedRoute = NestedRouteImport.update({ - id: '/nested', - path: '/nested', - getParentRoute: () => rootRouteImport, -} as any) const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRouteImport, } as any) -const SlowIdRoute = SlowIdRouteImport.update({ - id: '/slow/$id', - path: '/slow/$id', +const NestedRoute = NestedRouteImport.update({ + id: '/nested', + path: '/nested', + getParentRoute: () => rootRouteImport, +} as any) +const CtxIdRoute = CtxIdRouteImport.update({ + id: '/ctx/$id', + path: '/ctx/$id', getParentRoute: () => rootRouteImport, } as any) const NestedIdRoute = NestedIdRouteImport.update({ @@ -35,9 +35,9 @@ const NestedIdRoute = NestedIdRouteImport.update({ path: '/$id', getParentRoute: () => NestedRoute, } as any) -const CtxIdRoute = CtxIdRouteImport.update({ - id: '/ctx/$id', - path: '/ctx/$id', +const SlowIdRoute = SlowIdRouteImport.update({ + id: '/slow/$id', + path: '/slow/$id', getParentRoute: () => rootRouteImport, } as any) @@ -80,13 +80,6 @@ export interface RootRouteChildren { declare module '@tanstack/solid-router' { interface FileRoutesByPath { - '/nested': { - id: '/nested' - path: '/nested' - fullPath: '/nested' - preLoaderRoute: typeof NestedRouteImport - parentRoute: typeof rootRouteImport - } '/': { id: '/' path: '/' @@ -94,11 +87,18 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } - '/slow/$id': { - id: '/slow/$id' - path: '/slow/$id' - fullPath: '/slow/$id' - preLoaderRoute: typeof SlowIdRouteImport + '/nested': { + id: '/nested' + path: '/nested' + fullPath: '/nested' + preLoaderRoute: typeof NestedRouteImport + parentRoute: typeof rootRouteImport + } + '/ctx/$id': { + id: '/ctx/$id' + path: '/ctx/$id' + fullPath: '/ctx/$id' + preLoaderRoute: typeof CtxIdRouteImport parentRoute: typeof rootRouteImport } '/nested/$id': { @@ -108,11 +108,11 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof NestedIdRouteImport parentRoute: typeof NestedRoute } - '/ctx/$id': { - id: '/ctx/$id' - path: '/ctx/$id' - fullPath: '/ctx/$id' - preLoaderRoute: typeof CtxIdRouteImport + '/slow/$id': { + id: '/slow/$id' + path: '/slow/$id' + fullPath: '/slow/$id' + preLoaderRoute: typeof SlowIdRouteImport parentRoute: typeof rootRouteImport } } diff --git a/benchmarks/client-nav/scenarios/async-pipeline/vue/speed.bench.ts b/benchmarks/client-nav/scenarios/async-pipeline/vue/speed.bench.ts index 193a3837df..f0fd3e58df 100644 --- a/benchmarks/client-nav/scenarios/async-pipeline/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/async-pipeline/vue/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-async-pipeline', () => { - const test = setup() +test('client-async-pipeline', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-async-pipeline navigation loop (vue)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/control-flow/react/speed.bench.ts b/benchmarks/client-nav/scenarios/control-flow/react/speed.bench.ts index 7f1153021f..d6f2190be7 100644 --- a/benchmarks/client-nav/scenarios/control-flow/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/control-flow/react/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-control-flow', () => { - const test = setup() +test('client-control-flow', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-control-flow navigation loop (react)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/control-flow/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/control-flow/solid/speed.bench.ts index a88093ca52..d803d2a313 100644 --- a/benchmarks/client-nav/scenarios/control-flow/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/control-flow/solid/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-control-flow', () => { - const test = setup() +test('client-control-flow', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-control-flow navigation loop (solid)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/control-flow/solid/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/control-flow/solid/src/routeTree.gen.ts index 44d88e9f8d..cd84f99d5d 100644 --- a/benchmarks/client-nav/scenarios/control-flow/solid/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/control-flow/solid/src/routeTree.gen.ts @@ -9,26 +9,16 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { Route as rootRouteImport } from './routes/__root' -import { Route as TargetRouteImport } from './routes/target' -import { Route as Hop2RouteImport } from './routes/hop2' -import { Route as Hop1RouteImport } from './routes/hop1' -import { Route as BrokenRouteImport } from './routes/broken' import { Route as IndexRouteImport } from './routes/index' +import { Route as BrokenRouteImport } from './routes/broken' +import { Route as Hop1RouteImport } from './routes/hop1' +import { Route as Hop2RouteImport } from './routes/hop2' +import { Route as TargetRouteImport } from './routes/target' import { Route as MissingIdRouteImport } from './routes/missing.$id' -const TargetRoute = TargetRouteImport.update({ - id: '/target', - path: '/target', - getParentRoute: () => rootRouteImport, -} as any) -const Hop2Route = Hop2RouteImport.update({ - id: '/hop2', - path: '/hop2', - getParentRoute: () => rootRouteImport, -} as any) -const Hop1Route = Hop1RouteImport.update({ - id: '/hop1', - path: '/hop1', +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', getParentRoute: () => rootRouteImport, } as any) const BrokenRoute = BrokenRouteImport.update({ @@ -36,9 +26,19 @@ const BrokenRoute = BrokenRouteImport.update({ path: '/broken', getParentRoute: () => rootRouteImport, } as any) -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', +const Hop1Route = Hop1RouteImport.update({ + id: '/hop1', + path: '/hop1', + getParentRoute: () => rootRouteImport, +} as any) +const Hop2Route = Hop2RouteImport.update({ + id: '/hop2', + path: '/hop2', + getParentRoute: () => rootRouteImport, +} as any) +const TargetRoute = TargetRouteImport.update({ + id: '/target', + path: '/target', getParentRoute: () => rootRouteImport, } as any) const MissingIdRoute = MissingIdRouteImport.update({ @@ -98,25 +98,11 @@ export interface RootRouteChildren { declare module '@tanstack/solid-router' { interface FileRoutesByPath { - '/target': { - id: '/target' - path: '/target' - fullPath: '/target' - preLoaderRoute: typeof TargetRouteImport - parentRoute: typeof rootRouteImport - } - '/hop2': { - id: '/hop2' - path: '/hop2' - fullPath: '/hop2' - preLoaderRoute: typeof Hop2RouteImport - parentRoute: typeof rootRouteImport - } - '/hop1': { - id: '/hop1' - path: '/hop1' - fullPath: '/hop1' - preLoaderRoute: typeof Hop1RouteImport + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } '/broken': { @@ -126,11 +112,25 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof BrokenRouteImport parentRoute: typeof rootRouteImport } - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport + '/hop1': { + id: '/hop1' + path: '/hop1' + fullPath: '/hop1' + preLoaderRoute: typeof Hop1RouteImport + parentRoute: typeof rootRouteImport + } + '/hop2': { + id: '/hop2' + path: '/hop2' + fullPath: '/hop2' + preLoaderRoute: typeof Hop2RouteImport + parentRoute: typeof rootRouteImport + } + '/target': { + id: '/target' + path: '/target' + fullPath: '/target' + preLoaderRoute: typeof TargetRouteImport parentRoute: typeof rootRouteImport } '/missing/$id': { diff --git a/benchmarks/client-nav/scenarios/control-flow/vue/speed.bench.ts b/benchmarks/client-nav/scenarios/control-flow/vue/speed.bench.ts index 9a335cfb87..8a019945c7 100644 --- a/benchmarks/client-nav/scenarios/control-flow/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/control-flow/vue/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-control-flow', () => { - const test = setup() +test('client-control-flow', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-control-flow navigation loop (vue)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/head/react/speed.bench.ts b/benchmarks/client-nav/scenarios/head/react/speed.bench.ts index 97c76a1a11..d0d731a09f 100644 --- a/benchmarks/client-nav/scenarios/head/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/head/react/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-head', () => { - const test = setup() +test('client-head', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-head navigation loop (react)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/head/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/head/solid/speed.bench.ts index 075e7673de..ca156c950b 100644 --- a/benchmarks/client-nav/scenarios/head/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/head/solid/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-head', () => { - const test = setup() +test('client-head', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-head navigation loop (solid)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/head/solid/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/head/solid/src/routeTree.gen.ts index ead6a4436a..b6f217e527 100644 --- a/benchmarks/client-nav/scenarios/head/solid/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/head/solid/src/routeTree.gen.ts @@ -9,15 +9,15 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { Route as rootRouteImport } from './routes/__root' -import { Route as SettingsRouteImport } from './routes/settings' -import { Route as DocsRouteImport } from './routes/docs' import { Route as IndexRouteImport } from './routes/index' -import { Route as DocsSectionRouteImport } from './routes/docs.$section' +import { Route as DocsRouteImport } from './routes/docs' +import { Route as SettingsRouteImport } from './routes/settings' import { Route as ArticlesIdRouteImport } from './routes/articles.$id' +import { Route as DocsSectionRouteImport } from './routes/docs.$section' -const SettingsRoute = SettingsRouteImport.update({ - id: '/settings', - path: '/settings', +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', getParentRoute: () => rootRouteImport, } as any) const DocsRoute = DocsRouteImport.update({ @@ -25,9 +25,14 @@ const DocsRoute = DocsRouteImport.update({ path: '/docs', getParentRoute: () => rootRouteImport, } as any) -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', +const SettingsRoute = SettingsRouteImport.update({ + id: '/settings', + path: '/settings', + getParentRoute: () => rootRouteImport, +} as any) +const ArticlesIdRoute = ArticlesIdRouteImport.update({ + id: '/articles/$id', + path: '/articles/$id', getParentRoute: () => rootRouteImport, } as any) const DocsSectionRoute = DocsSectionRouteImport.update({ @@ -35,11 +40,6 @@ const DocsSectionRoute = DocsSectionRouteImport.update({ path: '/$section', getParentRoute: () => DocsRoute, } as any) -const ArticlesIdRoute = ArticlesIdRouteImport.update({ - id: '/articles/$id', - path: '/articles/$id', - getParentRoute: () => rootRouteImport, -} as any) export interface FileRoutesByFullPath { '/': typeof IndexRoute @@ -86,11 +86,11 @@ export interface RootRouteChildren { declare module '@tanstack/solid-router' { interface FileRoutesByPath { - '/settings': { - id: '/settings' - path: '/settings' - fullPath: '/settings' - preLoaderRoute: typeof SettingsRouteImport + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } '/docs': { @@ -100,11 +100,18 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof DocsRouteImport parentRoute: typeof rootRouteImport } - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport + '/settings': { + id: '/settings' + path: '/settings' + fullPath: '/settings' + preLoaderRoute: typeof SettingsRouteImport + parentRoute: typeof rootRouteImport + } + '/articles/$id': { + id: '/articles/$id' + path: '/articles/$id' + fullPath: '/articles/$id' + preLoaderRoute: typeof ArticlesIdRouteImport parentRoute: typeof rootRouteImport } '/docs/$section': { @@ -114,13 +121,6 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof DocsSectionRouteImport parentRoute: typeof DocsRoute } - '/articles/$id': { - id: '/articles/$id' - path: '/articles/$id' - fullPath: '/articles/$id' - preLoaderRoute: typeof ArticlesIdRouteImport - parentRoute: typeof rootRouteImport - } } } diff --git a/benchmarks/client-nav/scenarios/head/vue/speed.bench.ts b/benchmarks/client-nav/scenarios/head/vue/speed.bench.ts index 7080b4ea7d..d188a9dd7a 100644 --- a/benchmarks/client-nav/scenarios/head/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/head/vue/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-head', () => { - const test = setup() +test('client-head', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-head navigation loop (vue)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/history/react/speed.bench.ts b/benchmarks/client-nav/scenarios/history/react/speed.bench.ts index 9192258b66..6ec7031857 100644 --- a/benchmarks/client-nav/scenarios/history/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/history/react/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-history', () => { - const test = setup() +test('client-history', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-history navigation loop (react)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/history/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/history/solid/speed.bench.ts index d7f4fd898d..56af035b2b 100644 --- a/benchmarks/client-nav/scenarios/history/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/history/solid/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-history', () => { - const test = setup() +test('client-history', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-history navigation loop (solid)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/history/solid/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/history/solid/src/routeTree.gen.ts index a6ab2a4fc8..af253f4a15 100644 --- a/benchmarks/client-nav/scenarios/history/solid/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/history/solid/src/routeTree.gen.ts @@ -9,24 +9,19 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { Route as rootRouteImport } from './routes/__root' -import { Route as GalleryRouteImport } from './routes/gallery' import { Route as IndexRouteImport } from './routes/index' -import { Route as PhotosPhotoIdRouteImport } from './routes/photos.$photoId' +import { Route as GalleryRouteImport } from './routes/gallery' import { Route as PagesNRouteImport } from './routes/pages.$n' +import { Route as PhotosPhotoIdRouteImport } from './routes/photos.$photoId' -const GalleryRoute = GalleryRouteImport.update({ - id: '/gallery', - path: '/gallery', - getParentRoute: () => rootRouteImport, -} as any) const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRouteImport, } as any) -const PhotosPhotoIdRoute = PhotosPhotoIdRouteImport.update({ - id: '/photos/$photoId', - path: '/photos/$photoId', +const GalleryRoute = GalleryRouteImport.update({ + id: '/gallery', + path: '/gallery', getParentRoute: () => rootRouteImport, } as any) const PagesNRoute = PagesNRouteImport.update({ @@ -34,6 +29,11 @@ const PagesNRoute = PagesNRouteImport.update({ path: '/pages/$n', getParentRoute: () => rootRouteImport, } as any) +const PhotosPhotoIdRoute = PhotosPhotoIdRouteImport.update({ + id: '/photos/$photoId', + path: '/photos/$photoId', + getParentRoute: () => rootRouteImport, +} as any) export interface FileRoutesByFullPath { '/': typeof IndexRoute @@ -71,13 +71,6 @@ export interface RootRouteChildren { declare module '@tanstack/solid-router' { interface FileRoutesByPath { - '/gallery': { - id: '/gallery' - path: '/gallery' - fullPath: '/gallery' - preLoaderRoute: typeof GalleryRouteImport - parentRoute: typeof rootRouteImport - } '/': { id: '/' path: '/' @@ -85,11 +78,11 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } - '/photos/$photoId': { - id: '/photos/$photoId' - path: '/photos/$photoId' - fullPath: '/photos/$photoId' - preLoaderRoute: typeof PhotosPhotoIdRouteImport + '/gallery': { + id: '/gallery' + path: '/gallery' + fullPath: '/gallery' + preLoaderRoute: typeof GalleryRouteImport parentRoute: typeof rootRouteImport } '/pages/$n': { @@ -99,6 +92,13 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof PagesNRouteImport parentRoute: typeof rootRouteImport } + '/photos/$photoId': { + id: '/photos/$photoId' + path: '/photos/$photoId' + fullPath: '/photos/$photoId' + preLoaderRoute: typeof PhotosPhotoIdRouteImport + parentRoute: typeof rootRouteImport + } } } diff --git a/benchmarks/client-nav/scenarios/history/vue/speed.bench.ts b/benchmarks/client-nav/scenarios/history/vue/speed.bench.ts index a378e45ac5..3d36ac4cfa 100644 --- a/benchmarks/client-nav/scenarios/history/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/history/vue/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-history', () => { - const test = setup() +test('client-history', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-history navigation loop (vue)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/hydration/react/hydration.test.ts b/benchmarks/client-nav/scenarios/hydration/react/hydration.test.ts index 4217b66af0..7e466cbaed 100644 --- a/benchmarks/client-nav/scenarios/hydration/react/hydration.test.ts +++ b/benchmarks/client-nav/scenarios/hydration/react/hydration.test.ts @@ -36,23 +36,6 @@ test('restores data and context into fresh DOMs and includes follow-up renders', expect(schedulerTasks.size).toBe(1) }) -test('installs per-iteration preparation for the ordinary Vitest runner', async () => { - const scenario = setup() - const task: Parameters[0] = { - opts: {}, - } - scenario.installIterationHooks(task) - for (let iteration = 0; iteration < 2; iteration++) { - await task.opts.beforeEach!() - try { - expect(scenario.snapshot().diagnostics.mounted).toBe(false) - await scenario.run() - } finally { - await task.opts.afterEach!() - } - } -}) - test('rejects an empty measurement and still releases its sample', async () => { const scenario = setup() await scenario.before() diff --git a/benchmarks/client-nav/scenarios/hydration/react/project.json b/benchmarks/client-nav/scenarios/hydration/react/project.json index ece8f2de66..ca23838c0f 100644 --- a/benchmarks/client-nav/scenarios/hydration/react/project.json +++ b/benchmarks/client-nav/scenarios/hydration/react/project.json @@ -25,7 +25,7 @@ "cache": false, "dependsOn": ["build:client"], "options": { - "command": "NODE_ENV=production vitest bench --run --config ./scenarios/hydration/react/vite.config.ts", + "command": "NODE_ENV=production vitest bench --mode benchmark --run --config ./scenarios/hydration/react/vite.config.ts", "cwd": "benchmarks/client-nav" } }, diff --git a/benchmarks/client-nav/scenarios/hydration/react/setup.ts b/benchmarks/client-nav/scenarios/hydration/react/setup.ts index 8a6aa3286f..7c588af3fd 100644 --- a/benchmarks/client-nav/scenarios/hydration/react/setup.ts +++ b/benchmarks/client-nav/scenarios/hydration/react/setup.ts @@ -9,13 +9,6 @@ import type { FixtureArtifact } from './fixture' import type * as Client from './src/client' type ClientApp = typeof Client -type TaskHooks = { - opts: { - beforeEach?: () => void | Promise - afterEach?: () => void | Promise - } -} - const turn = () => new Promise((resolve) => setImmediate(resolve)) // React's scheduler ends a time slice once performance.now() has advanced 5 ms. @@ -319,11 +312,5 @@ export function setup({ countRenders = false } = {}) { after, snapshot, schedulerTasks, - // Vitest passes setup to the Tinybench Bench, where it runs once per - // warmup/run stage. Install the Task's public per-iteration hooks there. - installIterationHooks(task: TaskHooks) { - task.opts.beforeEach = before - task.opts.afterEach = after - }, } } diff --git a/benchmarks/client-nav/scenarios/hydration/react/speed.bench.ts b/benchmarks/client-nav/scenarios/hydration/react/speed.bench.ts index 6f6142b9de..643877760e 100644 --- a/benchmarks/client-nav/scenarios/hydration/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/hydration/react/speed.bench.ts @@ -1,23 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' import { setup } from './setup' -describe('client-hydration', () => { +test('client-hydration', async ({ bench }) => { const scenario = setup() - // CodSpeed uses suite hooks; ordinary Vitest uses the Tinybench Task hooks - // installed below. Both prepare and dispose every sample outside timing. - beforeEach(scenario.before) - afterEach(scenario.after) - bench( + + await bench( 'hydrate restored route state and mixed Links (react)', + { beforeEach: scenario.before, afterEach: scenario.after }, async () => { await scenario.run() }, - { - setup: scenario.installIterationHooks, - time: 5000, - warmupTime: 1000, - warmupIterations: 20, - throws: true, - }, - ) + ).run({ + time: 5000, + warmupTime: 1000, + warmupIterations: 20, + throws: true, + }) }) diff --git a/benchmarks/client-nav/scenarios/hydration/solid/hydration.test.ts b/benchmarks/client-nav/scenarios/hydration/solid/hydration.test.ts index ca519d98bb..4e5f3208ca 100644 --- a/benchmarks/client-nav/scenarios/hydration/solid/hydration.test.ts +++ b/benchmarks/client-nav/scenarios/hydration/solid/hydration.test.ts @@ -50,21 +50,17 @@ test('restores fresh DOMs and route state and completes hash-link reactivity', a } }) -test('installs per-iteration preparation for the ordinary Vitest runner', async () => { +test('prepares every sample without counting diagnostics', async () => { const scenario = setup() - const task: Parameters[0] = { - opts: {}, - } - scenario.installIterationHooks(task) for (let iteration = 0; iteration < 2; iteration++) { - await task.opts.beforeEach!() + await scenario.before() try { expect(scenario.snapshot().diagnostics.mounted).toBe(false) expect(scenario.snapshot().diagnostics.clicks).toBe(0) await scenario.run() expect(scenario.snapshot().diagnostics.hashEvaluations).toBe(0) } finally { - await task.opts.afterEach!() + await scenario.after() } } }) diff --git a/benchmarks/client-nav/scenarios/hydration/solid/project.json b/benchmarks/client-nav/scenarios/hydration/solid/project.json index 978fdc6bf7..1fa162771b 100644 --- a/benchmarks/client-nav/scenarios/hydration/solid/project.json +++ b/benchmarks/client-nav/scenarios/hydration/solid/project.json @@ -25,7 +25,7 @@ "cache": false, "dependsOn": ["build:client"], "options": { - "command": "NODE_ENV=production vitest bench --run --config ./scenarios/hydration/solid/vite.config.ts", + "command": "NODE_ENV=production vitest bench --mode benchmark --run --config ./scenarios/hydration/solid/vite.config.ts", "cwd": "benchmarks/client-nav" } }, diff --git a/benchmarks/client-nav/scenarios/hydration/solid/setup.ts b/benchmarks/client-nav/scenarios/hydration/solid/setup.ts index 29a86d6743..ebdbc8e9b2 100644 --- a/benchmarks/client-nav/scenarios/hydration/solid/setup.ts +++ b/benchmarks/client-nav/scenarios/hydration/solid/setup.ts @@ -8,13 +8,6 @@ import type { FixtureArtifact } from './fixture' import type * as Client from './src/client' type ClientApp = typeof Client -type TaskHooks = { - opts: { - beforeEach?: () => void | Promise - afterEach?: () => void | Promise - } -} - const turn = () => new Promise((resolve) => setImmediate(resolve)) const maxSettleTurns = 100 @@ -329,11 +322,5 @@ export function setup({ countUpdates = false } = {}) { run, after, snapshot, - // Vitest's Bench setup runs once per warmup/run stage. Install Tinybench's - // public Task hooks to prepare and dispose outside every measured call. - installIterationHooks(task: TaskHooks) { - task.opts.beforeEach = before - task.opts.afterEach = after - }, } } diff --git a/benchmarks/client-nav/scenarios/hydration/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/hydration/solid/speed.bench.ts index 1f91ec00f3..b386cb8215 100644 --- a/benchmarks/client-nav/scenarios/hydration/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/hydration/solid/speed.bench.ts @@ -1,23 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' import { setup } from './setup' -describe('client-hydration', () => { +test('client-hydration', async ({ bench }) => { const scenario = setup() - // CodSpeed uses suite hooks; ordinary Vitest uses the Tinybench Task hooks - // installed below. Both prepare and dispose every sample outside timing. - beforeEach(scenario.before) - afterEach(scenario.after) - bench( + + await bench( 'hydrate restored route state and mixed Links (solid)', + { beforeEach: scenario.before, afterEach: scenario.after }, async () => { await scenario.run() }, - { - setup: scenario.installIterationHooks, - time: 5000, - warmupTime: 1000, - warmupIterations: 20, - throws: true, - }, - ) + ).run({ + time: 5000, + warmupTime: 1000, + warmupIterations: 20, + throws: true, + }) }) diff --git a/benchmarks/client-nav/scenarios/link-churn/react/speed.bench.ts b/benchmarks/client-nav/scenarios/link-churn/react/speed.bench.ts index 05197319b8..ca0b370528 100644 --- a/benchmarks/client-nav/scenarios/link-churn/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/link-churn/react/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-link-churn', () => { - const test = setup() +test('client-link-churn', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-link-churn navigation loop (react)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/link-churn/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/link-churn/solid/speed.bench.ts index 9efdb6e3f8..80c4aaa6fd 100644 --- a/benchmarks/client-nav/scenarios/link-churn/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/link-churn/solid/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-link-churn', () => { - const test = setup() +test('client-link-churn', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-link-churn navigation loop (solid)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/link-churn/vue/speed.bench.ts b/benchmarks/client-nav/scenarios/link-churn/vue/speed.bench.ts index 4fbbaf4ca0..dea511c24c 100644 --- a/benchmarks/client-nav/scenarios/link-churn/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/link-churn/vue/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-link-churn', () => { - const test = setup() +test('client-link-churn', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-link-churn navigation loop (vue)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/links/react/speed.bench.ts b/benchmarks/client-nav/scenarios/links/react/speed.bench.ts index 0892308901..75f5f725d4 100644 --- a/benchmarks/client-nav/scenarios/links/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/links/react/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-links', () => { - const test = setup() +test('client-links', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-links navigation loop (react)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/links/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/links/solid/speed.bench.ts index a3d690b423..fc7f3e71e7 100644 --- a/benchmarks/client-nav/scenarios/links/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/links/solid/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-links', () => { - const test = setup() +test('client-links', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-links navigation loop (solid)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/links/solid/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/links/solid/src/routeTree.gen.ts index b61431e40d..0da70513e8 100644 --- a/benchmarks/client-nav/scenarios/links/solid/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/links/solid/src/routeTree.gen.ts @@ -9,20 +9,20 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { Route as rootRouteImport } from './routes/__root' -import { Route as AboutRouteImport } from './routes/about' import { Route as IndexRouteImport } from './routes/index' +import { Route as AboutRouteImport } from './routes/about' import { Route as ItemsIdRouteImport } from './routes/items.$id' -const AboutRoute = AboutRouteImport.update({ - id: '/about', - path: '/about', - getParentRoute: () => rootRouteImport, -} as any) const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRouteImport, } as any) +const AboutRoute = AboutRouteImport.update({ + id: '/about', + path: '/about', + getParentRoute: () => rootRouteImport, +} as any) const ItemsIdRoute = ItemsIdRouteImport.update({ id: '/items/$id', path: '/items/$id', @@ -61,13 +61,6 @@ export interface RootRouteChildren { declare module '@tanstack/solid-router' { interface FileRoutesByPath { - '/about': { - id: '/about' - path: '/about' - fullPath: '/about' - preLoaderRoute: typeof AboutRouteImport - parentRoute: typeof rootRouteImport - } '/': { id: '/' path: '/' @@ -75,6 +68,13 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } + '/about': { + id: '/about' + path: '/about' + fullPath: '/about' + preLoaderRoute: typeof AboutRouteImport + parentRoute: typeof rootRouteImport + } '/items/$id': { id: '/items/$id' path: '/items/$id' diff --git a/benchmarks/client-nav/scenarios/links/vue/speed.bench.ts b/benchmarks/client-nav/scenarios/links/vue/speed.bench.ts index e2d3f7c47a..2ace7a8409 100644 --- a/benchmarks/client-nav/scenarios/links/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/links/vue/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-links', () => { - const test = setup() +test('client-links', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-links navigation loop (vue)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/loaders/react/speed.bench.ts b/benchmarks/client-nav/scenarios/loaders/react/speed.bench.ts index f5a51b29be..8bcc53b88e 100644 --- a/benchmarks/client-nav/scenarios/loaders/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/loaders/react/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-loaders', () => { - const test = setup() +test('client-loaders', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-loaders navigation loop (react)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/loaders/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/loaders/solid/speed.bench.ts index 9f3bd397db..953a17b31a 100644 --- a/benchmarks/client-nav/scenarios/loaders/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/loaders/solid/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-loaders', () => { - const test = setup() +test('client-loaders', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-loaders navigation loop (solid)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/loaders/solid/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/loaders/solid/src/routeTree.gen.ts index bdec400237..fa5d032141 100644 --- a/benchmarks/client-nav/scenarios/loaders/solid/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/loaders/solid/src/routeTree.gen.ts @@ -9,24 +9,19 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { Route as rootRouteImport } from './routes/__root' -import { Route as DepsRouteImport } from './routes/deps' import { Route as IndexRouteImport } from './routes/index' -import { Route as FreshIdRouteImport } from './routes/fresh.$id' +import { Route as DepsRouteImport } from './routes/deps' import { Route as CachedIdRouteImport } from './routes/cached.$id' +import { Route as FreshIdRouteImport } from './routes/fresh.$id' -const DepsRoute = DepsRouteImport.update({ - id: '/deps', - path: '/deps', - getParentRoute: () => rootRouteImport, -} as any) const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRouteImport, } as any) -const FreshIdRoute = FreshIdRouteImport.update({ - id: '/fresh/$id', - path: '/fresh/$id', +const DepsRoute = DepsRouteImport.update({ + id: '/deps', + path: '/deps', getParentRoute: () => rootRouteImport, } as any) const CachedIdRoute = CachedIdRouteImport.update({ @@ -34,6 +29,11 @@ const CachedIdRoute = CachedIdRouteImport.update({ path: '/cached/$id', getParentRoute: () => rootRouteImport, } as any) +const FreshIdRoute = FreshIdRouteImport.update({ + id: '/fresh/$id', + path: '/fresh/$id', + getParentRoute: () => rootRouteImport, +} as any) export interface FileRoutesByFullPath { '/': typeof IndexRoute @@ -71,13 +71,6 @@ export interface RootRouteChildren { declare module '@tanstack/solid-router' { interface FileRoutesByPath { - '/deps': { - id: '/deps' - path: '/deps' - fullPath: '/deps' - preLoaderRoute: typeof DepsRouteImport - parentRoute: typeof rootRouteImport - } '/': { id: '/' path: '/' @@ -85,11 +78,11 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } - '/fresh/$id': { - id: '/fresh/$id' - path: '/fresh/$id' - fullPath: '/fresh/$id' - preLoaderRoute: typeof FreshIdRouteImport + '/deps': { + id: '/deps' + path: '/deps' + fullPath: '/deps' + preLoaderRoute: typeof DepsRouteImport parentRoute: typeof rootRouteImport } '/cached/$id': { @@ -99,6 +92,13 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof CachedIdRouteImport parentRoute: typeof rootRouteImport } + '/fresh/$id': { + id: '/fresh/$id' + path: '/fresh/$id' + fullPath: '/fresh/$id' + preLoaderRoute: typeof FreshIdRouteImport + parentRoute: typeof rootRouteImport + } } } diff --git a/benchmarks/client-nav/scenarios/loaders/vue/speed.bench.ts b/benchmarks/client-nav/scenarios/loaders/vue/speed.bench.ts index 819fe020b0..1ae2f89a56 100644 --- a/benchmarks/client-nav/scenarios/loaders/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/loaders/vue/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-loaders', () => { - const test = setup() +test('client-loaders', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-loaders navigation loop (vue)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/mount/react/speed.bench.ts b/benchmarks/client-nav/scenarios/mount/react/speed.bench.ts index 2d675ff259..6c3a64b026 100644 --- a/benchmarks/client-nav/scenarios/mount/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/mount/react/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-mount', () => { - const test = setup() +test('client-mount', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-mount loop (react)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/mount/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/mount/solid/speed.bench.ts index eaf7f1ed34..236f875f57 100644 --- a/benchmarks/client-nav/scenarios/mount/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/mount/solid/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-mount', () => { - const test = setup() +test('client-mount', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-mount loop (solid)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/mount/solid/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/mount/solid/src/routeTree.gen.ts index dc0acc183d..30247636dd 100644 --- a/benchmarks/client-nav/scenarios/mount/solid/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/mount/solid/src/routeTree.gen.ts @@ -9,35 +9,20 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { Route as rootRouteImport } from './routes/__root' -import { Route as ShopRouteImport } from './routes/shop' -import { Route as SettingsRouteImport } from './routes/settings' -import { Route as SearchRouteImport } from './routes/search' -import { Route as BlogRouteImport } from './routes/blog' -import { Route as AboutRouteImport } from './routes/about' import { Route as IndexRouteImport } from './routes/index' -import { Route as ShopIndexRouteImport } from './routes/shop.index' +import { Route as AboutRouteImport } from './routes/about' +import { Route as BlogRouteImport } from './routes/blog' +import { Route as SearchRouteImport } from './routes/search' +import { Route as SettingsRouteImport } from './routes/settings' +import { Route as ShopRouteImport } from './routes/shop' import { Route as BlogIndexRouteImport } from './routes/blog.index' -import { Route as ShopProductIdRouteImport } from './routes/shop.$productId' import { Route as BlogSlugRouteImport } from './routes/blog.$slug' +import { Route as ShopIndexRouteImport } from './routes/shop.index' +import { Route as ShopProductIdRouteImport } from './routes/shop.$productId' -const ShopRoute = ShopRouteImport.update({ - id: '/shop', - path: '/shop', - getParentRoute: () => rootRouteImport, -} as any) -const SettingsRoute = SettingsRouteImport.update({ - id: '/settings', - path: '/settings', - getParentRoute: () => rootRouteImport, -} as any) -const SearchRoute = SearchRouteImport.update({ - id: '/search', - path: '/search', - getParentRoute: () => rootRouteImport, -} as any) -const BlogRoute = BlogRouteImport.update({ - id: '/blog', - path: '/blog', +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', getParentRoute: () => rootRouteImport, } as any) const AboutRoute = AboutRouteImport.update({ @@ -45,31 +30,46 @@ const AboutRoute = AboutRouteImport.update({ path: '/about', getParentRoute: () => rootRouteImport, } as any) -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', +const BlogRoute = BlogRouteImport.update({ + id: '/blog', + path: '/blog', getParentRoute: () => rootRouteImport, } as any) -const ShopIndexRoute = ShopIndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => ShopRoute, +const SearchRoute = SearchRouteImport.update({ + id: '/search', + path: '/search', + getParentRoute: () => rootRouteImport, +} as any) +const SettingsRoute = SettingsRouteImport.update({ + id: '/settings', + path: '/settings', + getParentRoute: () => rootRouteImport, +} as any) +const ShopRoute = ShopRouteImport.update({ + id: '/shop', + path: '/shop', + getParentRoute: () => rootRouteImport, } as any) const BlogIndexRoute = BlogIndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => BlogRoute, } as any) -const ShopProductIdRoute = ShopProductIdRouteImport.update({ - id: '/$productId', - path: '/$productId', - getParentRoute: () => ShopRoute, -} as any) const BlogSlugRoute = BlogSlugRouteImport.update({ id: '/$slug', path: '/$slug', getParentRoute: () => BlogRoute, } as any) +const ShopIndexRoute = ShopIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => ShopRoute, +} as any) +const ShopProductIdRoute = ShopProductIdRouteImport.update({ + id: '/$productId', + path: '/$productId', + getParentRoute: () => ShopRoute, +} as any) export interface FileRoutesByFullPath { '/': typeof IndexRoute @@ -154,32 +154,11 @@ export interface RootRouteChildren { declare module '@tanstack/solid-router' { interface FileRoutesByPath { - '/shop': { - id: '/shop' - path: '/shop' - fullPath: '/shop' - preLoaderRoute: typeof ShopRouteImport - parentRoute: typeof rootRouteImport - } - '/settings': { - id: '/settings' - path: '/settings' - fullPath: '/settings' - preLoaderRoute: typeof SettingsRouteImport - parentRoute: typeof rootRouteImport - } - '/search': { - id: '/search' - path: '/search' - fullPath: '/search' - preLoaderRoute: typeof SearchRouteImport - parentRoute: typeof rootRouteImport - } - '/blog': { - id: '/blog' - path: '/blog' - fullPath: '/blog' - preLoaderRoute: typeof BlogRouteImport + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } '/about': { @@ -189,19 +168,33 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof AboutRouteImport parentRoute: typeof rootRouteImport } - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport + '/blog': { + id: '/blog' + path: '/blog' + fullPath: '/blog' + preLoaderRoute: typeof BlogRouteImport parentRoute: typeof rootRouteImport } - '/shop/': { - id: '/shop/' - path: '/' - fullPath: '/shop/' - preLoaderRoute: typeof ShopIndexRouteImport - parentRoute: typeof ShopRoute + '/search': { + id: '/search' + path: '/search' + fullPath: '/search' + preLoaderRoute: typeof SearchRouteImport + parentRoute: typeof rootRouteImport + } + '/settings': { + id: '/settings' + path: '/settings' + fullPath: '/settings' + preLoaderRoute: typeof SettingsRouteImport + parentRoute: typeof rootRouteImport + } + '/shop': { + id: '/shop' + path: '/shop' + fullPath: '/shop' + preLoaderRoute: typeof ShopRouteImport + parentRoute: typeof rootRouteImport } '/blog/': { id: '/blog/' @@ -210,13 +203,6 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof BlogIndexRouteImport parentRoute: typeof BlogRoute } - '/shop/$productId': { - id: '/shop/$productId' - path: '/$productId' - fullPath: '/shop/$productId' - preLoaderRoute: typeof ShopProductIdRouteImport - parentRoute: typeof ShopRoute - } '/blog/$slug': { id: '/blog/$slug' path: '/$slug' @@ -224,6 +210,20 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof BlogSlugRouteImport parentRoute: typeof BlogRoute } + '/shop/': { + id: '/shop/' + path: '/' + fullPath: '/shop/' + preLoaderRoute: typeof ShopIndexRouteImport + parentRoute: typeof ShopRoute + } + '/shop/$productId': { + id: '/shop/$productId' + path: '/$productId' + fullPath: '/shop/$productId' + preLoaderRoute: typeof ShopProductIdRouteImport + parentRoute: typeof ShopRoute + } } } diff --git a/benchmarks/client-nav/scenarios/mount/vue/speed.bench.ts b/benchmarks/client-nav/scenarios/mount/vue/speed.bench.ts index f5538dd49c..d9268ba91b 100644 --- a/benchmarks/client-nav/scenarios/mount/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/mount/vue/speed.bench.ts @@ -1,32 +1,15 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-mount', () => { - const test = setup() +test('client-mount', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( - 'client-mount loop (vue)', - async () => { - for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() - } - await test.finishBatch() - }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + await bench('client-mount loop (vue)', benchLifecycle(scenario), async () => { + for (let i = 0; i < ticksPerIteration; i++) { + await scenario.tick() + } + await scenario.finishBatch() + }).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/nested-params/react/speed.bench.ts b/benchmarks/client-nav/scenarios/nested-params/react/speed.bench.ts index 3dfe93c117..fa5809c1fd 100644 --- a/benchmarks/client-nav/scenarios/nested-params/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/nested-params/react/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-nested-params', () => { - const test = setup() +test('client-nested-params', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-nested-params navigation loop (react)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/nested-params/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/nested-params/solid/speed.bench.ts index dc7ec11f6b..2c64d9a221 100644 --- a/benchmarks/client-nav/scenarios/nested-params/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/nested-params/solid/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-nested-params', () => { - const test = setup() +test('client-nested-params', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-nested-params navigation loop (solid)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/nested-params/vue/speed.bench.ts b/benchmarks/client-nav/scenarios/nested-params/vue/speed.bench.ts index fcb336d1db..bd3e82e070 100644 --- a/benchmarks/client-nav/scenarios/nested-params/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/nested-params/vue/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-nested-params', () => { - const test = setup() +test('client-nested-params', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-nested-params navigation loop (vue)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/preload/react/speed.bench.ts b/benchmarks/client-nav/scenarios/preload/react/speed.bench.ts index 5b188a0a0b..5c210b2fd7 100644 --- a/benchmarks/client-nav/scenarios/preload/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/preload/react/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-preload', () => { - const test = setup() +test('client-preload', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-preload interaction loop (react)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/preload/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/preload/solid/speed.bench.ts index 267c9fd41d..f835b4a7b9 100644 --- a/benchmarks/client-nav/scenarios/preload/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/preload/solid/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-preload', () => { - const test = setup() +test('client-preload', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-preload interaction loop (solid)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/preload/solid/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/preload/solid/src/routeTree.gen.ts index 645d925238..97e215b6da 100644 --- a/benchmarks/client-nav/scenarios/preload/solid/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/preload/solid/src/routeTree.gen.ts @@ -9,20 +9,20 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { Route as rootRouteImport } from './routes/__root' -import { Route as DocsRouteImport } from './routes/docs' import { Route as IndexRouteImport } from './routes/index' +import { Route as DocsRouteImport } from './routes/docs' import { Route as SectionsSectionRouteImport } from './routes/sections.$section' -const DocsRoute = DocsRouteImport.update({ - id: '/docs', - path: '/docs', - getParentRoute: () => rootRouteImport, -} as any) const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRouteImport, } as any) +const DocsRoute = DocsRouteImport.update({ + id: '/docs', + path: '/docs', + getParentRoute: () => rootRouteImport, +} as any) const SectionsSectionRoute = SectionsSectionRouteImport.update({ id: '/sections/$section', path: '/sections/$section', @@ -61,13 +61,6 @@ export interface RootRouteChildren { declare module '@tanstack/solid-router' { interface FileRoutesByPath { - '/docs': { - id: '/docs' - path: '/docs' - fullPath: '/docs' - preLoaderRoute: typeof DocsRouteImport - parentRoute: typeof rootRouteImport - } '/': { id: '/' path: '/' @@ -75,6 +68,13 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } + '/docs': { + id: '/docs' + path: '/docs' + fullPath: '/docs' + preLoaderRoute: typeof DocsRouteImport + parentRoute: typeof rootRouteImport + } '/sections/$section': { id: '/sections/$section' path: '/sections/$section' diff --git a/benchmarks/client-nav/scenarios/preload/vue/speed.bench.ts b/benchmarks/client-nav/scenarios/preload/vue/speed.bench.ts index 38a2e9e664..e0ec83619b 100644 --- a/benchmarks/client-nav/scenarios/preload/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/preload/vue/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-preload', () => { - const test = setup() +test('client-preload', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-preload interaction loop (vue)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/rewrites/react/speed.bench.ts b/benchmarks/client-nav/scenarios/rewrites/react/speed.bench.ts index 8e79c6db7e..dd1b6f3686 100644 --- a/benchmarks/client-nav/scenarios/rewrites/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/rewrites/react/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-rewrites', () => { - const test = setup() +test('client-rewrites', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-rewrites navigation loop (react)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/rewrites/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/rewrites/solid/speed.bench.ts index cf70bcaa40..9c4313e2ff 100644 --- a/benchmarks/client-nav/scenarios/rewrites/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/rewrites/solid/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-rewrites', () => { - const test = setup() +test('client-rewrites', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-rewrites navigation loop (solid)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/rewrites/vue/speed.bench.ts b/benchmarks/client-nav/scenarios/rewrites/vue/speed.bench.ts index 2dc9eb2679..e96aff39eb 100644 --- a/benchmarks/client-nav/scenarios/rewrites/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/rewrites/vue/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-rewrites', () => { - const test = setup() +test('client-rewrites', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-rewrites navigation loop (vue)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/react/speed.bench.ts b/benchmarks/client-nav/scenarios/route-tree-scale/react/speed.bench.ts index 337ba35b73..6f4b448775 100644 --- a/benchmarks/client-nav/scenarios/route-tree-scale/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/route-tree-scale/react/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-route-tree-scale', () => { - const test = setup() +test('client-route-tree-scale', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-route-tree-scale navigation loop (react)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/route-tree-scale/solid/speed.bench.ts index 545b501617..9244ef1350 100644 --- a/benchmarks/client-nav/scenarios/route-tree-scale/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-route-tree-scale', () => { - const test = setup() +test('client-route-tree-scale', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-route-tree-scale navigation loop (solid)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routeTree.gen.ts index 20b4af6146..e6f3596562 100644 --- a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/routeTree.gen.ts @@ -9,68 +9,52 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { Route as rootRouteImport } from './routes/__root' -import { Route as SecFRouteImport } from './routes/sec-f' -import { Route as SecERouteImport } from './routes/sec-e' -import { Route as SecDRouteImport } from './routes/sec-d' -import { Route as SecCRouteImport } from './routes/sec-c' -import { Route as SecBRouteImport } from './routes/sec-b' -import { Route as SecARouteImport } from './routes/sec-a' -import { Route as LayoutRouteImport } from './routes/_layout' import { Route as IndexRouteImport } from './routes/index' -import { Route as SecFIndexRouteImport } from './routes/sec-f.index' -import { Route as SecEIndexRouteImport } from './routes/sec-e.index' -import { Route as SecDIndexRouteImport } from './routes/sec-d.index' -import { Route as SecCIndexRouteImport } from './routes/sec-c.index' -import { Route as SecBIndexRouteImport } from './routes/sec-b.index' -import { Route as SecAIndexRouteImport } from './routes/sec-a.index' -import { Route as SecFSettingsRouteImport } from './routes/sec-f.settings' -import { Route as SecFAboutRouteImport } from './routes/sec-f.about' -import { Route as SecFIdRouteImport } from './routes/sec-f.$id' -import { Route as SecESettingsRouteImport } from './routes/sec-e.settings' -import { Route as SecEAboutRouteImport } from './routes/sec-e.about' -import { Route as SecEIdRouteImport } from './routes/sec-e.$id' -import { Route as SecDSettingsRouteImport } from './routes/sec-d.settings' -import { Route as SecDAboutRouteImport } from './routes/sec-d.about' -import { Route as SecDIdRouteImport } from './routes/sec-d.$id' -import { Route as SecCSettingsRouteImport } from './routes/sec-c.settings' -import { Route as SecCAboutRouteImport } from './routes/sec-c.about' -import { Route as SecCIdRouteImport } from './routes/sec-c.$id' -import { Route as SecBSettingsRouteImport } from './routes/sec-b.settings' -import { Route as SecBAboutRouteImport } from './routes/sec-b.about' -import { Route as SecBIdRouteImport } from './routes/sec-b.$id' -import { Route as SecASettingsRouteImport } from './routes/sec-a.settings' -import { Route as SecAAboutRouteImport } from './routes/sec-a.about' -import { Route as SecAIdRouteImport } from './routes/sec-a.$id' -import { Route as ReleaseVChar123versionChar125RouteImport } from './routes/release.v{$version}' -import { Route as FilesSplatRouteImport } from './routes/files.$' -import { Route as LayoutBetaRouteImport } from './routes/_layout.beta' -import { Route as LayoutAlphaRouteImport } from './routes/_layout.alpha' -import { Route as marketingPromoRouteImport } from './routes/(marketing)/promo' +import { Route as LayoutRouteImport } from './routes/_layout' +import { Route as SecARouteImport } from './routes/sec-a' +import { Route as SecBRouteImport } from './routes/sec-b' +import { Route as SecCRouteImport } from './routes/sec-c' +import { Route as SecDRouteImport } from './routes/sec-d' +import { Route as SecERouteImport } from './routes/sec-e' +import { Route as SecFRouteImport } from './routes/sec-f' import { Route as marketingPricingRouteImport } from './routes/(marketing)/pricing' +import { Route as marketingPromoRouteImport } from './routes/(marketing)/promo' +import { Route as LayoutAlphaRouteImport } from './routes/_layout.alpha' +import { Route as LayoutBetaRouteImport } from './routes/_layout.beta' +import { Route as FilesSplatRouteImport } from './routes/files.$' +import { Route as ReleaseVChar123versionChar125RouteImport } from './routes/release.v{$version}' +import { Route as SecAIndexRouteImport } from './routes/sec-a.index' +import { Route as SecAIdRouteImport } from './routes/sec-a.$id' +import { Route as SecAAboutRouteImport } from './routes/sec-a.about' +import { Route as SecASettingsRouteImport } from './routes/sec-a.settings' +import { Route as SecBIndexRouteImport } from './routes/sec-b.index' +import { Route as SecBIdRouteImport } from './routes/sec-b.$id' +import { Route as SecBAboutRouteImport } from './routes/sec-b.about' +import { Route as SecBSettingsRouteImport } from './routes/sec-b.settings' +import { Route as SecCIndexRouteImport } from './routes/sec-c.index' +import { Route as SecCIdRouteImport } from './routes/sec-c.$id' +import { Route as SecCAboutRouteImport } from './routes/sec-c.about' +import { Route as SecCSettingsRouteImport } from './routes/sec-c.settings' +import { Route as SecDIndexRouteImport } from './routes/sec-d.index' +import { Route as SecDIdRouteImport } from './routes/sec-d.$id' +import { Route as SecDAboutRouteImport } from './routes/sec-d.about' +import { Route as SecDSettingsRouteImport } from './routes/sec-d.settings' +import { Route as SecEIndexRouteImport } from './routes/sec-e.index' +import { Route as SecEIdRouteImport } from './routes/sec-e.$id' +import { Route as SecEAboutRouteImport } from './routes/sec-e.about' +import { Route as SecESettingsRouteImport } from './routes/sec-e.settings' +import { Route as SecFIndexRouteImport } from './routes/sec-f.index' +import { Route as SecFIdRouteImport } from './routes/sec-f.$id' +import { Route as SecFAboutRouteImport } from './routes/sec-f.about' +import { Route as SecFSettingsRouteImport } from './routes/sec-f.settings' -const SecFRoute = SecFRouteImport.update({ - id: '/sec-f', - path: '/sec-f', +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', getParentRoute: () => rootRouteImport, } as any) -const SecERoute = SecERouteImport.update({ - id: '/sec-e', - path: '/sec-e', - getParentRoute: () => rootRouteImport, -} as any) -const SecDRoute = SecDRouteImport.update({ - id: '/sec-d', - path: '/sec-d', - getParentRoute: () => rootRouteImport, -} as any) -const SecCRoute = SecCRouteImport.update({ - id: '/sec-c', - path: '/sec-c', - getParentRoute: () => rootRouteImport, -} as any) -const SecBRoute = SecBRouteImport.update({ - id: '/sec-b', - path: '/sec-b', +const LayoutRoute = LayoutRouteImport.update({ + id: '/_layout', getParentRoute: () => rootRouteImport, } as any) const SecARoute = SecARouteImport.update({ @@ -78,134 +62,55 @@ const SecARoute = SecARouteImport.update({ path: '/sec-a', getParentRoute: () => rootRouteImport, } as any) -const LayoutRoute = LayoutRouteImport.update({ - id: '/_layout', +const SecBRoute = SecBRouteImport.update({ + id: '/sec-b', + path: '/sec-b', getParentRoute: () => rootRouteImport, } as any) -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', +const SecCRoute = SecCRouteImport.update({ + id: '/sec-c', + path: '/sec-c', getParentRoute: () => rootRouteImport, } as any) -const SecFIndexRoute = SecFIndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => SecFRoute, +const SecDRoute = SecDRouteImport.update({ + id: '/sec-d', + path: '/sec-d', + getParentRoute: () => rootRouteImport, } as any) -const SecEIndexRoute = SecEIndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => SecERoute, +const SecERoute = SecERouteImport.update({ + id: '/sec-e', + path: '/sec-e', + getParentRoute: () => rootRouteImport, } as any) -const SecDIndexRoute = SecDIndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => SecDRoute, +const SecFRoute = SecFRouteImport.update({ + id: '/sec-f', + path: '/sec-f', + getParentRoute: () => rootRouteImport, } as any) -const SecCIndexRoute = SecCIndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => SecCRoute, +const marketingPricingRoute = marketingPricingRouteImport.update({ + id: '/(marketing)/pricing', + path: '/pricing', + getParentRoute: () => rootRouteImport, } as any) -const SecBIndexRoute = SecBIndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => SecBRoute, +const marketingPromoRoute = marketingPromoRouteImport.update({ + id: '/(marketing)/promo', + path: '/promo', + getParentRoute: () => rootRouteImport, } as any) -const SecAIndexRoute = SecAIndexRouteImport.update({ - id: '/', - path: '/', - getParentRoute: () => SecARoute, +const LayoutAlphaRoute = LayoutAlphaRouteImport.update({ + id: '/alpha', + path: '/alpha', + getParentRoute: () => LayoutRoute, } as any) -const SecFSettingsRoute = SecFSettingsRouteImport.update({ - id: '/settings', - path: '/settings', - getParentRoute: () => SecFRoute, +const LayoutBetaRoute = LayoutBetaRouteImport.update({ + id: '/beta', + path: '/beta', + getParentRoute: () => LayoutRoute, } as any) -const SecFAboutRoute = SecFAboutRouteImport.update({ - id: '/about', - path: '/about', - getParentRoute: () => SecFRoute, -} as any) -const SecFIdRoute = SecFIdRouteImport.update({ - id: '/$id', - path: '/$id', - getParentRoute: () => SecFRoute, -} as any) -const SecESettingsRoute = SecESettingsRouteImport.update({ - id: '/settings', - path: '/settings', - getParentRoute: () => SecERoute, -} as any) -const SecEAboutRoute = SecEAboutRouteImport.update({ - id: '/about', - path: '/about', - getParentRoute: () => SecERoute, -} as any) -const SecEIdRoute = SecEIdRouteImport.update({ - id: '/$id', - path: '/$id', - getParentRoute: () => SecERoute, -} as any) -const SecDSettingsRoute = SecDSettingsRouteImport.update({ - id: '/settings', - path: '/settings', - getParentRoute: () => SecDRoute, -} as any) -const SecDAboutRoute = SecDAboutRouteImport.update({ - id: '/about', - path: '/about', - getParentRoute: () => SecDRoute, -} as any) -const SecDIdRoute = SecDIdRouteImport.update({ - id: '/$id', - path: '/$id', - getParentRoute: () => SecDRoute, -} as any) -const SecCSettingsRoute = SecCSettingsRouteImport.update({ - id: '/settings', - path: '/settings', - getParentRoute: () => SecCRoute, -} as any) -const SecCAboutRoute = SecCAboutRouteImport.update({ - id: '/about', - path: '/about', - getParentRoute: () => SecCRoute, -} as any) -const SecCIdRoute = SecCIdRouteImport.update({ - id: '/$id', - path: '/$id', - getParentRoute: () => SecCRoute, -} as any) -const SecBSettingsRoute = SecBSettingsRouteImport.update({ - id: '/settings', - path: '/settings', - getParentRoute: () => SecBRoute, -} as any) -const SecBAboutRoute = SecBAboutRouteImport.update({ - id: '/about', - path: '/about', - getParentRoute: () => SecBRoute, -} as any) -const SecBIdRoute = SecBIdRouteImport.update({ - id: '/$id', - path: '/$id', - getParentRoute: () => SecBRoute, -} as any) -const SecASettingsRoute = SecASettingsRouteImport.update({ - id: '/settings', - path: '/settings', - getParentRoute: () => SecARoute, -} as any) -const SecAAboutRoute = SecAAboutRouteImport.update({ - id: '/about', - path: '/about', - getParentRoute: () => SecARoute, -} as any) -const SecAIdRoute = SecAIdRouteImport.update({ - id: '/$id', - path: '/$id', - getParentRoute: () => SecARoute, +const FilesSplatRoute = FilesSplatRouteImport.update({ + id: '/files/$', + path: '/files/$', + getParentRoute: () => rootRouteImport, } as any) const ReleaseVChar123versionChar125Route = ReleaseVChar123versionChar125RouteImport.update({ @@ -213,30 +118,125 @@ const ReleaseVChar123versionChar125Route = path: '/release/v{$version}', getParentRoute: () => rootRouteImport, } as any) -const FilesSplatRoute = FilesSplatRouteImport.update({ - id: '/files/$', - path: '/files/$', - getParentRoute: () => rootRouteImport, +const SecAIndexRoute = SecAIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => SecARoute, } as any) -const LayoutBetaRoute = LayoutBetaRouteImport.update({ - id: '/beta', - path: '/beta', - getParentRoute: () => LayoutRoute, +const SecAIdRoute = SecAIdRouteImport.update({ + id: '/$id', + path: '/$id', + getParentRoute: () => SecARoute, } as any) -const LayoutAlphaRoute = LayoutAlphaRouteImport.update({ - id: '/alpha', - path: '/alpha', - getParentRoute: () => LayoutRoute, +const SecAAboutRoute = SecAAboutRouteImport.update({ + id: '/about', + path: '/about', + getParentRoute: () => SecARoute, } as any) -const marketingPromoRoute = marketingPromoRouteImport.update({ - id: '/(marketing)/promo', - path: '/promo', - getParentRoute: () => rootRouteImport, +const SecASettingsRoute = SecASettingsRouteImport.update({ + id: '/settings', + path: '/settings', + getParentRoute: () => SecARoute, } as any) -const marketingPricingRoute = marketingPricingRouteImport.update({ - id: '/(marketing)/pricing', - path: '/pricing', - getParentRoute: () => rootRouteImport, +const SecBIndexRoute = SecBIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => SecBRoute, +} as any) +const SecBIdRoute = SecBIdRouteImport.update({ + id: '/$id', + path: '/$id', + getParentRoute: () => SecBRoute, +} as any) +const SecBAboutRoute = SecBAboutRouteImport.update({ + id: '/about', + path: '/about', + getParentRoute: () => SecBRoute, +} as any) +const SecBSettingsRoute = SecBSettingsRouteImport.update({ + id: '/settings', + path: '/settings', + getParentRoute: () => SecBRoute, +} as any) +const SecCIndexRoute = SecCIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => SecCRoute, +} as any) +const SecCIdRoute = SecCIdRouteImport.update({ + id: '/$id', + path: '/$id', + getParentRoute: () => SecCRoute, +} as any) +const SecCAboutRoute = SecCAboutRouteImport.update({ + id: '/about', + path: '/about', + getParentRoute: () => SecCRoute, +} as any) +const SecCSettingsRoute = SecCSettingsRouteImport.update({ + id: '/settings', + path: '/settings', + getParentRoute: () => SecCRoute, +} as any) +const SecDIndexRoute = SecDIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => SecDRoute, +} as any) +const SecDIdRoute = SecDIdRouteImport.update({ + id: '/$id', + path: '/$id', + getParentRoute: () => SecDRoute, +} as any) +const SecDAboutRoute = SecDAboutRouteImport.update({ + id: '/about', + path: '/about', + getParentRoute: () => SecDRoute, +} as any) +const SecDSettingsRoute = SecDSettingsRouteImport.update({ + id: '/settings', + path: '/settings', + getParentRoute: () => SecDRoute, +} as any) +const SecEIndexRoute = SecEIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => SecERoute, +} as any) +const SecEIdRoute = SecEIdRouteImport.update({ + id: '/$id', + path: '/$id', + getParentRoute: () => SecERoute, +} as any) +const SecEAboutRoute = SecEAboutRouteImport.update({ + id: '/about', + path: '/about', + getParentRoute: () => SecERoute, +} as any) +const SecESettingsRoute = SecESettingsRouteImport.update({ + id: '/settings', + path: '/settings', + getParentRoute: () => SecERoute, +} as any) +const SecFIndexRoute = SecFIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => SecFRoute, +} as any) +const SecFIdRoute = SecFIdRouteImport.update({ + id: '/$id', + path: '/$id', + getParentRoute: () => SecFRoute, +} as any) +const SecFAboutRoute = SecFAboutRouteImport.update({ + id: '/about', + path: '/about', + getParentRoute: () => SecFRoute, +} as any) +const SecFSettingsRoute = SecFSettingsRouteImport.update({ + id: '/settings', + path: '/settings', + getParentRoute: () => SecFRoute, } as any) export interface FileRoutesByFullPath { @@ -484,46 +484,11 @@ export interface RootRouteChildren { declare module '@tanstack/solid-router' { interface FileRoutesByPath { - '/sec-f': { - id: '/sec-f' - path: '/sec-f' - fullPath: '/sec-f' - preLoaderRoute: typeof SecFRouteImport - parentRoute: typeof rootRouteImport - } - '/sec-e': { - id: '/sec-e' - path: '/sec-e' - fullPath: '/sec-e' - preLoaderRoute: typeof SecERouteImport - parentRoute: typeof rootRouteImport - } - '/sec-d': { - id: '/sec-d' - path: '/sec-d' - fullPath: '/sec-d' - preLoaderRoute: typeof SecDRouteImport - parentRoute: typeof rootRouteImport - } - '/sec-c': { - id: '/sec-c' - path: '/sec-c' - fullPath: '/sec-c' - preLoaderRoute: typeof SecCRouteImport - parentRoute: typeof rootRouteImport - } - '/sec-b': { - id: '/sec-b' - path: '/sec-b' - fullPath: '/sec-b' - preLoaderRoute: typeof SecBRouteImport - parentRoute: typeof rootRouteImport - } - '/sec-a': { - id: '/sec-a' - path: '/sec-a' - fullPath: '/sec-a' - preLoaderRoute: typeof SecARouteImport + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } '/_layout': { @@ -533,47 +498,89 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof LayoutRouteImport parentRoute: typeof rootRouteImport } - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport + '/sec-a': { + id: '/sec-a' + path: '/sec-a' + fullPath: '/sec-a' + preLoaderRoute: typeof SecARouteImport parentRoute: typeof rootRouteImport } - '/sec-f/': { - id: '/sec-f/' - path: '/' - fullPath: '/sec-f/' - preLoaderRoute: typeof SecFIndexRouteImport - parentRoute: typeof SecFRoute + '/sec-b': { + id: '/sec-b' + path: '/sec-b' + fullPath: '/sec-b' + preLoaderRoute: typeof SecBRouteImport + parentRoute: typeof rootRouteImport } - '/sec-e/': { - id: '/sec-e/' - path: '/' - fullPath: '/sec-e/' - preLoaderRoute: typeof SecEIndexRouteImport - parentRoute: typeof SecERoute + '/sec-c': { + id: '/sec-c' + path: '/sec-c' + fullPath: '/sec-c' + preLoaderRoute: typeof SecCRouteImport + parentRoute: typeof rootRouteImport } - '/sec-d/': { - id: '/sec-d/' - path: '/' - fullPath: '/sec-d/' - preLoaderRoute: typeof SecDIndexRouteImport - parentRoute: typeof SecDRoute + '/sec-d': { + id: '/sec-d' + path: '/sec-d' + fullPath: '/sec-d' + preLoaderRoute: typeof SecDRouteImport + parentRoute: typeof rootRouteImport } - '/sec-c/': { - id: '/sec-c/' - path: '/' - fullPath: '/sec-c/' - preLoaderRoute: typeof SecCIndexRouteImport - parentRoute: typeof SecCRoute + '/sec-e': { + id: '/sec-e' + path: '/sec-e' + fullPath: '/sec-e' + preLoaderRoute: typeof SecERouteImport + parentRoute: typeof rootRouteImport } - '/sec-b/': { - id: '/sec-b/' - path: '/' - fullPath: '/sec-b/' - preLoaderRoute: typeof SecBIndexRouteImport - parentRoute: typeof SecBRoute + '/sec-f': { + id: '/sec-f' + path: '/sec-f' + fullPath: '/sec-f' + preLoaderRoute: typeof SecFRouteImport + parentRoute: typeof rootRouteImport + } + '/(marketing)/pricing': { + id: '/(marketing)/pricing' + path: '/pricing' + fullPath: '/pricing' + preLoaderRoute: typeof marketingPricingRouteImport + parentRoute: typeof rootRouteImport + } + '/(marketing)/promo': { + id: '/(marketing)/promo' + path: '/promo' + fullPath: '/promo' + preLoaderRoute: typeof marketingPromoRouteImport + parentRoute: typeof rootRouteImport + } + '/_layout/alpha': { + id: '/_layout/alpha' + path: '/alpha' + fullPath: '/alpha' + preLoaderRoute: typeof LayoutAlphaRouteImport + parentRoute: typeof LayoutRoute + } + '/_layout/beta': { + id: '/_layout/beta' + path: '/beta' + fullPath: '/beta' + preLoaderRoute: typeof LayoutBetaRouteImport + parentRoute: typeof LayoutRoute + } + '/files/$': { + id: '/files/$' + path: '/files/$' + fullPath: '/files/$' + preLoaderRoute: typeof FilesSplatRouteImport + parentRoute: typeof rootRouteImport + } + '/release/v{$version}': { + id: '/release/v{$version}' + path: '/release/v{$version}' + fullPath: '/release/v{$version}' + preLoaderRoute: typeof ReleaseVChar123versionChar125RouteImport + parentRoute: typeof rootRouteImport } '/sec-a/': { id: '/sec-a/' @@ -582,125 +589,6 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof SecAIndexRouteImport parentRoute: typeof SecARoute } - '/sec-f/settings': { - id: '/sec-f/settings' - path: '/settings' - fullPath: '/sec-f/settings' - preLoaderRoute: typeof SecFSettingsRouteImport - parentRoute: typeof SecFRoute - } - '/sec-f/about': { - id: '/sec-f/about' - path: '/about' - fullPath: '/sec-f/about' - preLoaderRoute: typeof SecFAboutRouteImport - parentRoute: typeof SecFRoute - } - '/sec-f/$id': { - id: '/sec-f/$id' - path: '/$id' - fullPath: '/sec-f/$id' - preLoaderRoute: typeof SecFIdRouteImport - parentRoute: typeof SecFRoute - } - '/sec-e/settings': { - id: '/sec-e/settings' - path: '/settings' - fullPath: '/sec-e/settings' - preLoaderRoute: typeof SecESettingsRouteImport - parentRoute: typeof SecERoute - } - '/sec-e/about': { - id: '/sec-e/about' - path: '/about' - fullPath: '/sec-e/about' - preLoaderRoute: typeof SecEAboutRouteImport - parentRoute: typeof SecERoute - } - '/sec-e/$id': { - id: '/sec-e/$id' - path: '/$id' - fullPath: '/sec-e/$id' - preLoaderRoute: typeof SecEIdRouteImport - parentRoute: typeof SecERoute - } - '/sec-d/settings': { - id: '/sec-d/settings' - path: '/settings' - fullPath: '/sec-d/settings' - preLoaderRoute: typeof SecDSettingsRouteImport - parentRoute: typeof SecDRoute - } - '/sec-d/about': { - id: '/sec-d/about' - path: '/about' - fullPath: '/sec-d/about' - preLoaderRoute: typeof SecDAboutRouteImport - parentRoute: typeof SecDRoute - } - '/sec-d/$id': { - id: '/sec-d/$id' - path: '/$id' - fullPath: '/sec-d/$id' - preLoaderRoute: typeof SecDIdRouteImport - parentRoute: typeof SecDRoute - } - '/sec-c/settings': { - id: '/sec-c/settings' - path: '/settings' - fullPath: '/sec-c/settings' - preLoaderRoute: typeof SecCSettingsRouteImport - parentRoute: typeof SecCRoute - } - '/sec-c/about': { - id: '/sec-c/about' - path: '/about' - fullPath: '/sec-c/about' - preLoaderRoute: typeof SecCAboutRouteImport - parentRoute: typeof SecCRoute - } - '/sec-c/$id': { - id: '/sec-c/$id' - path: '/$id' - fullPath: '/sec-c/$id' - preLoaderRoute: typeof SecCIdRouteImport - parentRoute: typeof SecCRoute - } - '/sec-b/settings': { - id: '/sec-b/settings' - path: '/settings' - fullPath: '/sec-b/settings' - preLoaderRoute: typeof SecBSettingsRouteImport - parentRoute: typeof SecBRoute - } - '/sec-b/about': { - id: '/sec-b/about' - path: '/about' - fullPath: '/sec-b/about' - preLoaderRoute: typeof SecBAboutRouteImport - parentRoute: typeof SecBRoute - } - '/sec-b/$id': { - id: '/sec-b/$id' - path: '/$id' - fullPath: '/sec-b/$id' - preLoaderRoute: typeof SecBIdRouteImport - parentRoute: typeof SecBRoute - } - '/sec-a/settings': { - id: '/sec-a/settings' - path: '/settings' - fullPath: '/sec-a/settings' - preLoaderRoute: typeof SecASettingsRouteImport - parentRoute: typeof SecARoute - } - '/sec-a/about': { - id: '/sec-a/about' - path: '/about' - fullPath: '/sec-a/about' - preLoaderRoute: typeof SecAAboutRouteImport - parentRoute: typeof SecARoute - } '/sec-a/$id': { id: '/sec-a/$id' path: '/$id' @@ -708,47 +596,159 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof SecAIdRouteImport parentRoute: typeof SecARoute } - '/release/v{$version}': { - id: '/release/v{$version}' - path: '/release/v{$version}' - fullPath: '/release/v{$version}' - preLoaderRoute: typeof ReleaseVChar123versionChar125RouteImport - parentRoute: typeof rootRouteImport + '/sec-a/about': { + id: '/sec-a/about' + path: '/about' + fullPath: '/sec-a/about' + preLoaderRoute: typeof SecAAboutRouteImport + parentRoute: typeof SecARoute } - '/files/$': { - id: '/files/$' - path: '/files/$' - fullPath: '/files/$' - preLoaderRoute: typeof FilesSplatRouteImport - parentRoute: typeof rootRouteImport + '/sec-a/settings': { + id: '/sec-a/settings' + path: '/settings' + fullPath: '/sec-a/settings' + preLoaderRoute: typeof SecASettingsRouteImport + parentRoute: typeof SecARoute } - '/_layout/beta': { - id: '/_layout/beta' - path: '/beta' - fullPath: '/beta' - preLoaderRoute: typeof LayoutBetaRouteImport - parentRoute: typeof LayoutRoute + '/sec-b/': { + id: '/sec-b/' + path: '/' + fullPath: '/sec-b/' + preLoaderRoute: typeof SecBIndexRouteImport + parentRoute: typeof SecBRoute } - '/_layout/alpha': { - id: '/_layout/alpha' - path: '/alpha' - fullPath: '/alpha' - preLoaderRoute: typeof LayoutAlphaRouteImport - parentRoute: typeof LayoutRoute + '/sec-b/$id': { + id: '/sec-b/$id' + path: '/$id' + fullPath: '/sec-b/$id' + preLoaderRoute: typeof SecBIdRouteImport + parentRoute: typeof SecBRoute } - '/(marketing)/promo': { - id: '/(marketing)/promo' - path: '/promo' - fullPath: '/promo' - preLoaderRoute: typeof marketingPromoRouteImport - parentRoute: typeof rootRouteImport + '/sec-b/about': { + id: '/sec-b/about' + path: '/about' + fullPath: '/sec-b/about' + preLoaderRoute: typeof SecBAboutRouteImport + parentRoute: typeof SecBRoute } - '/(marketing)/pricing': { - id: '/(marketing)/pricing' - path: '/pricing' - fullPath: '/pricing' - preLoaderRoute: typeof marketingPricingRouteImport - parentRoute: typeof rootRouteImport + '/sec-b/settings': { + id: '/sec-b/settings' + path: '/settings' + fullPath: '/sec-b/settings' + preLoaderRoute: typeof SecBSettingsRouteImport + parentRoute: typeof SecBRoute + } + '/sec-c/': { + id: '/sec-c/' + path: '/' + fullPath: '/sec-c/' + preLoaderRoute: typeof SecCIndexRouteImport + parentRoute: typeof SecCRoute + } + '/sec-c/$id': { + id: '/sec-c/$id' + path: '/$id' + fullPath: '/sec-c/$id' + preLoaderRoute: typeof SecCIdRouteImport + parentRoute: typeof SecCRoute + } + '/sec-c/about': { + id: '/sec-c/about' + path: '/about' + fullPath: '/sec-c/about' + preLoaderRoute: typeof SecCAboutRouteImport + parentRoute: typeof SecCRoute + } + '/sec-c/settings': { + id: '/sec-c/settings' + path: '/settings' + fullPath: '/sec-c/settings' + preLoaderRoute: typeof SecCSettingsRouteImport + parentRoute: typeof SecCRoute + } + '/sec-d/': { + id: '/sec-d/' + path: '/' + fullPath: '/sec-d/' + preLoaderRoute: typeof SecDIndexRouteImport + parentRoute: typeof SecDRoute + } + '/sec-d/$id': { + id: '/sec-d/$id' + path: '/$id' + fullPath: '/sec-d/$id' + preLoaderRoute: typeof SecDIdRouteImport + parentRoute: typeof SecDRoute + } + '/sec-d/about': { + id: '/sec-d/about' + path: '/about' + fullPath: '/sec-d/about' + preLoaderRoute: typeof SecDAboutRouteImport + parentRoute: typeof SecDRoute + } + '/sec-d/settings': { + id: '/sec-d/settings' + path: '/settings' + fullPath: '/sec-d/settings' + preLoaderRoute: typeof SecDSettingsRouteImport + parentRoute: typeof SecDRoute + } + '/sec-e/': { + id: '/sec-e/' + path: '/' + fullPath: '/sec-e/' + preLoaderRoute: typeof SecEIndexRouteImport + parentRoute: typeof SecERoute + } + '/sec-e/$id': { + id: '/sec-e/$id' + path: '/$id' + fullPath: '/sec-e/$id' + preLoaderRoute: typeof SecEIdRouteImport + parentRoute: typeof SecERoute + } + '/sec-e/about': { + id: '/sec-e/about' + path: '/about' + fullPath: '/sec-e/about' + preLoaderRoute: typeof SecEAboutRouteImport + parentRoute: typeof SecERoute + } + '/sec-e/settings': { + id: '/sec-e/settings' + path: '/settings' + fullPath: '/sec-e/settings' + preLoaderRoute: typeof SecESettingsRouteImport + parentRoute: typeof SecERoute + } + '/sec-f/': { + id: '/sec-f/' + path: '/' + fullPath: '/sec-f/' + preLoaderRoute: typeof SecFIndexRouteImport + parentRoute: typeof SecFRoute + } + '/sec-f/$id': { + id: '/sec-f/$id' + path: '/$id' + fullPath: '/sec-f/$id' + preLoaderRoute: typeof SecFIdRouteImport + parentRoute: typeof SecFRoute + } + '/sec-f/about': { + id: '/sec-f/about' + path: '/about' + fullPath: '/sec-f/about' + preLoaderRoute: typeof SecFAboutRouteImport + parentRoute: typeof SecFRoute + } + '/sec-f/settings': { + id: '/sec-f/settings' + path: '/settings' + fullPath: '/sec-f/settings' + preLoaderRoute: typeof SecFSettingsRouteImport + parentRoute: typeof SecFRoute } } } diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/vue/speed.bench.ts b/benchmarks/client-nav/scenarios/route-tree-scale/vue/speed.bench.ts index 9365231579..331e8e008f 100644 --- a/benchmarks/client-nav/scenarios/route-tree-scale/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/route-tree-scale/vue/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-route-tree-scale', () => { - const test = setup() +test('client-route-tree-scale', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-route-tree-scale navigation loop (vue)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/search-params/react/speed.bench.ts b/benchmarks/client-nav/scenarios/search-params/react/speed.bench.ts index 5bdd994e32..0b38f7bddb 100644 --- a/benchmarks/client-nav/scenarios/search-params/react/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/search-params/react/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-search-params', () => { - const test = setup() +test('client-search-params', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-search-params navigation loop (react)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/search-params/solid/speed.bench.ts b/benchmarks/client-nav/scenarios/search-params/solid/speed.bench.ts index ea0baa1098..caa626c596 100644 --- a/benchmarks/client-nav/scenarios/search-params/solid/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/search-params/solid/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-search-params', () => { - const test = setup() +test('client-search-params', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-search-params navigation loop (solid)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/scenarios/search-params/solid/src/routeTree.gen.ts b/benchmarks/client-nav/scenarios/search-params/solid/src/routeTree.gen.ts index 96d211d64c..b15beed09b 100644 --- a/benchmarks/client-nav/scenarios/search-params/solid/src/routeTree.gen.ts +++ b/benchmarks/client-nav/scenarios/search-params/solid/src/routeTree.gen.ts @@ -9,13 +9,13 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { Route as rootRouteImport } from './routes/__root' -import { Route as ProductsRouteImport } from './routes/products' -import { Route as CatalogRouteImport } from './routes/catalog' import { Route as IndexRouteImport } from './routes/index' +import { Route as CatalogRouteImport } from './routes/catalog' +import { Route as ProductsRouteImport } from './routes/products' -const ProductsRoute = ProductsRouteImport.update({ - id: '/products', - path: '/products', +const IndexRoute = IndexRouteImport.update({ + id: '/', + path: '/', getParentRoute: () => rootRouteImport, } as any) const CatalogRoute = CatalogRouteImport.update({ @@ -23,9 +23,9 @@ const CatalogRoute = CatalogRouteImport.update({ path: '/catalog', getParentRoute: () => rootRouteImport, } as any) -const IndexRoute = IndexRouteImport.update({ - id: '/', - path: '/', +const ProductsRoute = ProductsRouteImport.update({ + id: '/products', + path: '/products', getParentRoute: () => rootRouteImport, } as any) @@ -61,11 +61,11 @@ export interface RootRouteChildren { declare module '@tanstack/solid-router' { interface FileRoutesByPath { - '/products': { - id: '/products' - path: '/products' - fullPath: '/products' - preLoaderRoute: typeof ProductsRouteImport + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } '/catalog': { @@ -75,11 +75,11 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof CatalogRouteImport parentRoute: typeof rootRouteImport } - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexRouteImport + '/products': { + id: '/products' + path: '/products' + fullPath: '/products' + preLoaderRoute: typeof ProductsRouteImport parentRoute: typeof rootRouteImport } } diff --git a/benchmarks/client-nav/scenarios/search-params/vue/speed.bench.ts b/benchmarks/client-nav/scenarios/search-params/vue/speed.bench.ts index c82efd49c9..728d2779e8 100644 --- a/benchmarks/client-nav/scenarios/search-params/vue/speed.bench.ts +++ b/benchmarks/client-nav/scenarios/search-params/vue/speed.bench.ts @@ -1,32 +1,19 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' +import { test } from 'vitest' +import { benchLifecycle } from '../../../../cpu-simulation' import { benchOptions, ticksPerIteration } from '../shared' import { setup } from './setup' -describe('client-search-params', () => { - const test = setup() +test('client-search-params', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores suite hooks, so Tinybench uses the `setup` - * and `teardown` options below. CodSpeed bypasses those options but supports - * `beforeEach` and `afterEach`. Only one lifecycle path runs in either - * environment, and every measured invocation receives fresh application state. - */ - - beforeEach(test.before) - afterEach(test.after) - - bench( + await bench( 'client-search-params navigation loop (vue)', + benchLifecycle(scenario), async () => { for (let i = 0; i < ticksPerIteration; i++) { - await test.tick() + await scenario.tick() } - await test.finishBatch() + await scenario.finishBatch() }, - { - ...benchOptions, - setup: test.before, - teardown: test.after, - }, - ) + ).run(benchOptions) }) diff --git a/benchmarks/client-nav/solid/speed.bench.ts b/benchmarks/client-nav/solid/speed.bench.ts index 34791180ce..d629da17a8 100644 --- a/benchmarks/client-nav/solid/speed.bench.ts +++ b/benchmarks/client-nav/solid/speed.bench.ts @@ -1,34 +1,19 @@ -import { afterAll, beforeAll, bench, describe } from 'vitest' +import { test } from 'vitest' import { setup } from './setup' -describe('client-nav', () => { - const test = setup() +test('client-nav', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores "suite hooks" like `beforeAll` and `afterAll`, - * so we use tinybench's `setup` and `teardown` options to run our setup and teardown logic. - * - * But CodSpeed calls the benchmarked function directly, bypassing `setup` and `teardown`, - * but it does support `beforeAll` and `afterAll`. - * - * So it looks like we're setting up in duplicate, but in reality, it's only running once per environment, as intended. - */ - - beforeAll(test.before) - afterAll(test.after) - - bench( + await bench( 'client-side navigation loop (solid)', + { beforeAll: scenario.before, afterAll: scenario.after }, async () => { for (let i = 0; i < 10; i++) { - await test.tick() + await scenario.tick() } }, - { - warmupIterations: 100, - time: 10_000, - setup: test.before, - teardown: test.after, - }, - ) + ).run({ + warmupIterations: 100, + time: 10_000, + }) }) diff --git a/benchmarks/client-nav/solid/vite.config.ts b/benchmarks/client-nav/solid/vite.config.ts index 1dd8e1e15c..0c26b32f5f 100644 --- a/benchmarks/client-nav/solid/vite.config.ts +++ b/benchmarks/client-nav/solid/vite.config.ts @@ -37,6 +37,7 @@ export default defineConfig({ watch: false, environment: 'jsdom', setupFiles: [`${rootDir}vitest.setup.ts`], + benchmark: { include: ['solid/speed.bench.ts'] }, server: { deps: { inline: [/@solidjs/, /@tanstack\/solid-store/], diff --git a/benchmarks/client-nav/vue/speed.bench.ts b/benchmarks/client-nav/vue/speed.bench.ts index f9e532f5ba..503e91e7b7 100644 --- a/benchmarks/client-nav/vue/speed.bench.ts +++ b/benchmarks/client-nav/vue/speed.bench.ts @@ -1,34 +1,19 @@ -import { afterAll, beforeAll, bench, describe } from 'vitest' +import { test } from 'vitest' import { setup } from './setup' -describe('client-nav', () => { - const test = setup() +test('client-nav', async ({ bench }) => { + const scenario = setup() - /** - * Running `vitest bench` ignores "suite hooks" like `beforeAll` and `afterAll`, - * so we use tinybench's `setup` and `teardown` options to run our setup and teardown logic. - * - * But CodSpeed calls the benchmarked function directly, bypassing `setup` and `teardown`, - * but it does support `beforeAll` and `afterAll`. - * - * So it looks like we're setting up in duplicate, but in reality, it's only running once per environment, as intended. - */ - - beforeAll(test.before) - afterAll(test.after) - - bench( + await bench( 'client-side navigation loop (vue)', + { beforeAll: scenario.before, afterAll: scenario.after }, async () => { for (let i = 0; i < 10; i++) { - await test.tick() + await scenario.tick() } }, - { - warmupIterations: 100, - time: 10_000, - setup: test.before, - teardown: test.after, - }, - ) + ).run({ + warmupIterations: 100, + time: 10_000, + }) }) diff --git a/benchmarks/client-nav/vue/vite.config.ts b/benchmarks/client-nav/vue/vite.config.ts index 7abe24b455..78d8ae5638 100644 --- a/benchmarks/client-nav/vue/vite.config.ts +++ b/benchmarks/client-nav/vue/vite.config.ts @@ -36,5 +36,6 @@ export default defineConfig({ watch: false, environment: 'jsdom', setupFiles: [`${rootDir}vitest.setup.ts`], + benchmark: { include: ['vue/speed.bench.ts'] }, }, }) diff --git a/benchmarks/cpu-simulation.ts b/benchmarks/cpu-simulation.ts index 7e16bf4c5a..9b8859f74d 100644 --- a/benchmarks/cpu-simulation.ts +++ b/benchmarks/cpu-simulation.ts @@ -1,9 +1,23 @@ +function codspeedRunnerMode() { + return process.env.CODSPEED_ENV === undefined + ? undefined + : process.env.CODSPEED_RUNNER_MODE +} + +/** + * Whether CodSpeed's simulation or memory instrument drives the run. Both + * measure one invocation after a few warmup calls instead of sampling. + */ +export function isCodSpeedAnalysis() { + const mode = codspeedRunnerMode() + return ( + mode === 'simulation' || mode === 'instrumentation' || mode === 'memory' + ) +} + /** Extra worker flags for CodSpeed CPU simulation, not walltime benchmarks. */ export function cpuSimulationExecArgv() { - const mode = - process.env.CODSPEED_ENV === undefined - ? undefined - : process.env.CODSPEED_RUNNER_MODE + const mode = codspeedRunnerMode() if (mode === 'simulation' || mode === 'instrumentation') { // CodSpeed supplies --no-opt, which only disables TurboFan on Node 24. // Maglev can still compile and inline hot functions between measured runs. @@ -22,3 +36,18 @@ export function cpuSimulationExecArgv() { } return [] } + +/** + * Per-bench lifecycle for apps that a bench prepares and disposes outside + * timing. CodSpeed measures one invocation, so each invocation gets fresh + * state. Tinybench samples thousands of iterations and keeps one instance per + * warmup/run phase instead of preparing it for every iteration. + */ +export function benchLifecycle(hooks: { + before: () => Promise | void + after: () => Promise | void +}) { + return isCodSpeedAnalysis() + ? { beforeEach: hooks.before, afterEach: hooks.after } + : { beforeAll: hooks.before, afterAll: hooks.after } +} diff --git a/benchmarks/memory/README.md b/benchmarks/memory/README.md index 65a13f04a3..18b68768f9 100644 --- a/benchmarks/memory/README.md +++ b/benchmarks/memory/README.md @@ -2,7 +2,7 @@ Dedicated memory benchmarks for TanStack Router / Start, measured with the CodSpeed **memory instrument** (`mode: memory` in -`.github/workflows/client-nav-benchmarks.yml`). The workflow runs on every +`.github/workflows/benchmarks.yml`). The workflow runs on every push to `main` except docs/examples/e2e-only pushes: CodSpeed compares a PR against the run on its merge-base commit, and a main commit without a run makes CodSpeed silently fall back to an older base — a single outlier base run then @@ -34,8 +34,8 @@ benchmarks/memory// One app per scenario; apps and bench names are stable once landed (CodSpeed continuity). Never grow an existing scenario for a new case — add a scenario. `setup.ts` imports the built app and exports the concrete workload; -`memory.bench.ts` registers `bench(...)` directly, and `memory.flame.ts` runs the -same workload through the Flame profiler. +`memory.bench.ts` registers it with Vitest's `bench` test fixture, and +`memory.flame.ts` runs the same workload through the Flame profiler. ## How the memory instrument executes a bench @@ -43,19 +43,21 @@ same workload through the Flame profiler. after a forced GC. Under plain `vitest bench` the suites only smoke-test: timing output is meaningless; real numbers come from CodSpeed. - Under CodSpeed the bench fn runs several warmup invocations plus the - measured one. Client suite hooks mount a fresh app before each invocation - and tear it down afterward, outside the measurement window. This prevents - warmup navigation history and caches from changing the starting state. - Module-level counters/LCGs keep generated URLs unique across invocations. -- Plain `vitest bench` never runs suite hooks (`beforeEach`/`afterEach`) and - only honors tinybench's `setup`/`teardown` options; the CodSpeed runner - does the exact opposite. Client benches therefore register **both** — in - any given mode exactly one pair runs. + measured one. The bench's `beforeEach`/`afterEach` hooks + (`memoryBenchHooks`) run around every invocation, outside the measurement + window: client workloads mount a fresh app before each invocation and tear + it down afterward. This prevents warmup navigation history and caches from + changing the starting state. Plain `vitest bench` runs the same hooks around + its warmup and measured iteration. Module-level counters/LCGs keep generated + URLs unique across invocations. +- Workload `run` functions must be `async` functions. CodSpeed's Vitest 5 + provider awaits only `AsyncFunction`s; a plain function that returns a + promise would be measured only up to its first suspension. - Worker flags live in `runtime.ts` and apply only to the CodSpeed memory instrument. They supplement the integration's predictable execution flags; the retained overrides are described below. -- Before each CodSpeed invocation, a setup hook yields to the event loop, - outside the measurement marker and before CodSpeed forces GC. Promise-only +- Before each CodSpeed invocation, the `beforeEach` hook yields to the event + loop, outside the measurement marker and before CodSpeed forces GC. Promise-only warmup chains can keep WeakRef targets alive through a collection in the same job. Client app setup also runs before the forced GC. - Do not force GC inside a measured request loop or poll `heapUsed` to choose @@ -256,7 +258,7 @@ WITH_INSTRUMENTATION=1 codspeed run --mode memory -- pnpm nx run @benchmarks/mem Run the benchmark workflow on an experiment branch: ```bash -gh workflow run client-nav-benchmarks.yml --ref +gh workflow run benchmarks.yml --ref ``` Repeat at the same commit, using distinct branch names if runs should overlap diff --git a/benchmarks/memory/client/bench-utils.ts b/benchmarks/memory/client/bench-utils.ts index 0cbaedbd71..785e8fac7f 100644 --- a/benchmarks/memory/client/bench-utils.ts +++ b/benchmarks/memory/client/bench-utils.ts @@ -1,3 +1,5 @@ +export { memoryBenchHooks } from '../turn' + export const memoryBenchOptions = { iterations: 1, warmupIterations: 1, diff --git a/benchmarks/memory/client/benchmark.ts b/benchmarks/memory/client/benchmark.ts index 8b877b0740..463047f4d9 100644 --- a/benchmarks/memory/client/benchmark.ts +++ b/benchmarks/memory/client/benchmark.ts @@ -1,6 +1,10 @@ export interface ClientMemoryWorkload { name: string before?: () => Promise | void + /** + * Must be an `async` function: CodSpeed's Vitest 5 provider awaits only + * `AsyncFunction`s and otherwise measures just the synchronous part. + */ run: () => Promise | void sanity: () => Promise | void after?: () => Promise | void diff --git a/benchmarks/memory/client/package.json b/benchmarks/memory/client/package.json index 2da6cb4ad8..4dc6246183 100644 --- a/benchmarks/memory/client/package.json +++ b/benchmarks/memory/client/package.json @@ -22,7 +22,7 @@ "vue": "^3.5.16" }, "devDependencies": { - "@codspeed/vitest-plugin": "^5.7.1", + "@codspeed/vitest-plugin": "^6.0.1", "@datadog/pprof": "^5.13.2", "@platformatic/flame": "^1.6.0", "@testing-library/react": "^16.2.0", @@ -202,7 +202,7 @@ "build:react" ], "options": { - "command": "NODE_ENV=production vitest bench --config ./vitest.react.config.ts", + "command": "NODE_ENV=production vitest bench --mode benchmark --config ./vitest.react.config.ts", "cwd": "benchmarks/memory/client" } }, @@ -214,7 +214,7 @@ "build:solid" ], "options": { - "command": "NODE_ENV=production vitest bench --config ./vitest.solid.config.ts", + "command": "NODE_ENV=production vitest bench --mode benchmark --config ./vitest.solid.config.ts", "cwd": "benchmarks/memory/client" } }, @@ -226,7 +226,7 @@ "build:vue" ], "options": { - "command": "NODE_ENV=production vitest bench --config ./vitest.vue.config.ts", + "command": "NODE_ENV=production vitest bench --mode benchmark --config ./vitest.vue.config.ts", "cwd": "benchmarks/memory/client" } }, diff --git a/benchmarks/memory/client/scenarios/interrupted-navigations/react/memory.bench.ts b/benchmarks/memory/client/scenarios/interrupted-navigations/react/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/interrupted-navigations/react/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/interrupted-navigations/react/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/scenarios/interrupted-navigations/solid/memory.bench.ts b/benchmarks/memory/client/scenarios/interrupted-navigations/solid/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/interrupted-navigations/solid/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/interrupted-navigations/solid/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/scenarios/interrupted-navigations/vue/memory.bench.ts b/benchmarks/memory/client/scenarios/interrupted-navigations/vue/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/interrupted-navigations/vue/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/interrupted-navigations/vue/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/scenarios/loader-data-retention/react/memory.bench.ts b/benchmarks/memory/client/scenarios/loader-data-retention/react/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/loader-data-retention/react/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/loader-data-retention/react/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/scenarios/loader-data-retention/solid/memory.bench.ts b/benchmarks/memory/client/scenarios/loader-data-retention/solid/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/loader-data-retention/solid/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/loader-data-retention/solid/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/scenarios/loader-data-retention/vue/memory.bench.ts b/benchmarks/memory/client/scenarios/loader-data-retention/vue/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/loader-data-retention/vue/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/loader-data-retention/vue/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/scenarios/mount-unmount/react/memory.bench.ts b/benchmarks/memory/client/scenarios/mount-unmount/react/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/mount-unmount/react/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/mount-unmount/react/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/scenarios/mount-unmount/solid/memory.bench.ts b/benchmarks/memory/client/scenarios/mount-unmount/solid/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/mount-unmount/solid/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/mount-unmount/solid/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/scenarios/mount-unmount/vue/memory.bench.ts b/benchmarks/memory/client/scenarios/mount-unmount/vue/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/mount-unmount/vue/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/mount-unmount/vue/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/scenarios/navigation-churn/react/memory.bench.ts b/benchmarks/memory/client/scenarios/navigation-churn/react/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/navigation-churn/react/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/navigation-churn/react/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/scenarios/navigation-churn/solid/memory.bench.ts b/benchmarks/memory/client/scenarios/navigation-churn/solid/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/navigation-churn/solid/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/navigation-churn/solid/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/scenarios/navigation-churn/vue/memory.bench.ts b/benchmarks/memory/client/scenarios/navigation-churn/vue/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/navigation-churn/vue/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/navigation-churn/vue/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/scenarios/preload-churn/react/memory.bench.ts b/benchmarks/memory/client/scenarios/preload-churn/react/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/preload-churn/react/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/preload-churn/react/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/scenarios/preload-churn/solid/memory.bench.ts b/benchmarks/memory/client/scenarios/preload-churn/solid/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/preload-churn/solid/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/preload-churn/solid/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/scenarios/preload-churn/vue/memory.bench.ts b/benchmarks/memory/client/scenarios/preload-churn/vue/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/preload-churn/vue/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/preload-churn/vue/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/scenarios/unique-location-churn/react/memory.bench.ts b/benchmarks/memory/client/scenarios/unique-location-churn/react/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/unique-location-churn/react/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/unique-location-churn/react/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/scenarios/unique-location-churn/solid/memory.bench.ts b/benchmarks/memory/client/scenarios/unique-location-churn/solid/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/unique-location-churn/solid/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/unique-location-churn/solid/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/scenarios/unique-location-churn/vue/memory.bench.ts b/benchmarks/memory/client/scenarios/unique-location-churn/vue/memory.bench.ts index 85a1f11ee6..43ab822de3 100644 --- a/benchmarks/memory/client/scenarios/unique-location-churn/vue/memory.bench.ts +++ b/benchmarks/memory/client/scenarios/unique-location-churn/vue/memory.bench.ts @@ -1,21 +1,14 @@ -import { afterEach, beforeEach, bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-client/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-client/bench-utils' import { workload } from './setup' await workload.sanity() -describe('memory', () => { - if (workload.before && workload.after) { - beforeEach(workload.before) - afterEach(workload.after) - - bench(workload.name, workload.run, { - ...memoryBenchOptions, - setup: workload.before, - teardown: workload.after, - }) - return - } - - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(workload), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/client/vitest.setup.ts b/benchmarks/memory/client/vitest.setup.ts index 5f78f1a7d1..ce3127275a 100644 --- a/benchmarks/memory/client/vitest.setup.ts +++ b/benchmarks/memory/client/vitest.setup.ts @@ -1,6 +1,3 @@ -import { beforeEach } from 'vitest' -import { endMemoryTurn, isMemoryInstrumented } from '../turn' - // @ts-expect-error global.IS_REACT_ACT_ENVIRONMENT = true @@ -10,7 +7,3 @@ window.scrollTo = scrollTo globalThis.scrollTo = scrollTo export {} - -if (isMemoryInstrumented()) { - beforeEach(endMemoryTurn) -} diff --git a/benchmarks/memory/runtime.ts b/benchmarks/memory/runtime.ts index 85f84d922b..010149b4df 100644 --- a/benchmarks/memory/runtime.ts +++ b/benchmarks/memory/runtime.ts @@ -29,8 +29,8 @@ export function memoryConfig(side: 'client' | 'server') { return { execArgv, setupFiles: - side === 'client' || isMemoryInstrumented() - ? [fileURLToPath(new URL(`./${side}/vitest.setup.ts`, import.meta.url))] + side === 'client' + ? [fileURLToPath(new URL('./client/vitest.setup.ts', import.meta.url))] : [], } } diff --git a/benchmarks/memory/server/bench-utils.ts b/benchmarks/memory/server/bench-utils.ts index 8893d5be4b..9caaf63384 100644 --- a/benchmarks/memory/server/bench-utils.ts +++ b/benchmarks/memory/server/bench-utils.ts @@ -1,3 +1,5 @@ +export { memoryBenchHooks } from '../turn' + export interface StartRequestHandler { fetch: (request: Request) => Promise | Response } diff --git a/benchmarks/memory/server/benchmark.ts b/benchmarks/memory/server/benchmark.ts index 301a9f956d..9b8dc2c76f 100644 --- a/benchmarks/memory/server/benchmark.ts +++ b/benchmarks/memory/server/benchmark.ts @@ -1,5 +1,9 @@ export interface ServerMemoryWorkload { name: string + /** + * Must be an `async` function: CodSpeed's Vitest 5 provider awaits only + * `AsyncFunction`s and otherwise measures just the synchronous part. + */ run: () => Promise | void } diff --git a/benchmarks/memory/server/package.json b/benchmarks/memory/server/package.json index 5d59987e68..d09343c7b6 100644 --- a/benchmarks/memory/server/package.json +++ b/benchmarks/memory/server/package.json @@ -23,7 +23,7 @@ "vue": "^3.5.16" }, "devDependencies": { - "@codspeed/vitest-plugin": "^5.7.1", + "@codspeed/vitest-plugin": "^6.0.1", "@datadog/pprof": "^5.13.2", "@platformatic/flame": "^1.6.0", "@vitejs/plugin-react": "^6.0.1", @@ -208,7 +208,7 @@ "build:react" ], "options": { - "command": "NODE_ENV=production vitest bench --config ./vitest.react.config.ts", + "command": "NODE_ENV=production vitest bench --mode benchmark --config ./vitest.react.config.ts", "cwd": "benchmarks/memory/server" } }, @@ -220,7 +220,7 @@ "build:solid" ], "options": { - "command": "NODE_ENV=production vitest bench --config ./vitest.solid.config.ts", + "command": "NODE_ENV=production vitest bench --mode benchmark --config ./vitest.solid.config.ts", "cwd": "benchmarks/memory/server" } }, @@ -232,7 +232,7 @@ "build:vue" ], "options": { - "command": "NODE_ENV=production vitest bench --config ./vitest.vue.config.ts", + "command": "NODE_ENV=production vitest bench --mode benchmark --config ./vitest.vue.config.ts", "cwd": "benchmarks/memory/server" } }, diff --git a/benchmarks/memory/server/scenarios/aborted-requests/react/memory.bench.ts b/benchmarks/memory/server/scenarios/aborted-requests/react/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/aborted-requests/react/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/aborted-requests/react/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/scenarios/aborted-requests/shared.ts b/benchmarks/memory/server/scenarios/aborted-requests/shared.ts index b5a61594ba..29eca99e00 100644 --- a/benchmarks/memory/server/scenarios/aborted-requests/shared.ts +++ b/benchmarks/memory/server/scenarios/aborted-requests/shared.ts @@ -221,7 +221,7 @@ export function createWorkloadGroup( handler: StartRequestHandler, ) { const mode = abortedRequestModes[framework] - const run = () => runAbortedRequestLoop(handler, mode) + const run = async () => runAbortedRequestLoop(handler, mode) return { sanity: () => assertAbortedRequestsSanity(handler, mode), diff --git a/benchmarks/memory/server/scenarios/aborted-requests/solid/memory.bench.ts b/benchmarks/memory/server/scenarios/aborted-requests/solid/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/aborted-requests/solid/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/aborted-requests/solid/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/scenarios/aborted-requests/vue/memory.bench.ts b/benchmarks/memory/server/scenarios/aborted-requests/vue/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/aborted-requests/vue/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/aborted-requests/vue/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/scenarios/error-paths/react/memory.bench.ts b/benchmarks/memory/server/scenarios/error-paths/react/memory.bench.ts index 2780830cb2..a6f07b97be 100644 --- a/benchmarks/memory/server/scenarios/error-paths/react/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/error-paths/react/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[0]! -describe('memory', () => { - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/server/scenarios/error-paths/react/memory.error.bench.ts b/benchmarks/memory/server/scenarios/error-paths/react/memory.error.bench.ts index d41877e6ce..89071137c3 100644 --- a/benchmarks/memory/server/scenarios/error-paths/react/memory.error.bench.ts +++ b/benchmarks/memory/server/scenarios/error-paths/react/memory.error.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[2]! -describe('memory', () => { - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/server/scenarios/error-paths/react/memory.not-found.bench.ts b/benchmarks/memory/server/scenarios/error-paths/react/memory.not-found.bench.ts index 42d67b1164..fa6a6693ed 100644 --- a/benchmarks/memory/server/scenarios/error-paths/react/memory.not-found.bench.ts +++ b/benchmarks/memory/server/scenarios/error-paths/react/memory.not-found.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[1]! -describe('memory', () => { - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/server/scenarios/error-paths/react/memory.unmatched.bench.ts b/benchmarks/memory/server/scenarios/error-paths/react/memory.unmatched.bench.ts index 6179e469dd..b2c3d24200 100644 --- a/benchmarks/memory/server/scenarios/error-paths/react/memory.unmatched.bench.ts +++ b/benchmarks/memory/server/scenarios/error-paths/react/memory.unmatched.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[3]! -describe('memory', () => { - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/server/scenarios/error-paths/shared.ts b/benchmarks/memory/server/scenarios/error-paths/shared.ts index 966505f3a0..11ed293d22 100644 --- a/benchmarks/memory/server/scenarios/error-paths/shared.ts +++ b/benchmarks/memory/server/scenarios/error-paths/shared.ts @@ -136,7 +136,7 @@ export function createWorkloadGroup( framework: Framework, handler: StartRequestHandler, ) { - const runRedirect = () => + const runRedirect = async () => runSequentialRequestLoop(handler, { random: redirectRandom, iterations: errorPathsIterations, @@ -144,7 +144,7 @@ export function createWorkloadGroup( validateResponse: validateRedirectResponse, }) - const runNotFound = () => + const runNotFound = async () => runSequentialRequestLoop(handler, { random: notFoundRandom, iterations: errorPathsIterations, @@ -152,7 +152,7 @@ export function createWorkloadGroup( validateResponse: validateNotFoundResponse, }) - const runError = () => + const runError = async () => runSequentialRequestLoop(handler, { random: errorRandom, iterations: errorPathsIterations, @@ -160,7 +160,7 @@ export function createWorkloadGroup( validateResponse: validateErrorResponse, }) - const runUnmatched = () => + const runUnmatched = async () => runSequentialRequestLoop(handler, { random: unmatchedRandom, iterations: errorPathsIterations, diff --git a/benchmarks/memory/server/scenarios/error-paths/solid/memory.bench.ts b/benchmarks/memory/server/scenarios/error-paths/solid/memory.bench.ts index 2780830cb2..a6f07b97be 100644 --- a/benchmarks/memory/server/scenarios/error-paths/solid/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/error-paths/solid/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[0]! -describe('memory', () => { - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/server/scenarios/error-paths/solid/memory.error.bench.ts b/benchmarks/memory/server/scenarios/error-paths/solid/memory.error.bench.ts index d41877e6ce..89071137c3 100644 --- a/benchmarks/memory/server/scenarios/error-paths/solid/memory.error.bench.ts +++ b/benchmarks/memory/server/scenarios/error-paths/solid/memory.error.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[2]! -describe('memory', () => { - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/server/scenarios/error-paths/solid/memory.not-found.bench.ts b/benchmarks/memory/server/scenarios/error-paths/solid/memory.not-found.bench.ts index 42d67b1164..fa6a6693ed 100644 --- a/benchmarks/memory/server/scenarios/error-paths/solid/memory.not-found.bench.ts +++ b/benchmarks/memory/server/scenarios/error-paths/solid/memory.not-found.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[1]! -describe('memory', () => { - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/server/scenarios/error-paths/solid/memory.unmatched.bench.ts b/benchmarks/memory/server/scenarios/error-paths/solid/memory.unmatched.bench.ts index 6179e469dd..b2c3d24200 100644 --- a/benchmarks/memory/server/scenarios/error-paths/solid/memory.unmatched.bench.ts +++ b/benchmarks/memory/server/scenarios/error-paths/solid/memory.unmatched.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[3]! -describe('memory', () => { - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/server/scenarios/error-paths/vue/memory.bench.ts b/benchmarks/memory/server/scenarios/error-paths/vue/memory.bench.ts index 2780830cb2..a6f07b97be 100644 --- a/benchmarks/memory/server/scenarios/error-paths/vue/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/error-paths/vue/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[0]! -describe('memory', () => { - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/server/scenarios/error-paths/vue/memory.error.bench.ts b/benchmarks/memory/server/scenarios/error-paths/vue/memory.error.bench.ts index d41877e6ce..89071137c3 100644 --- a/benchmarks/memory/server/scenarios/error-paths/vue/memory.error.bench.ts +++ b/benchmarks/memory/server/scenarios/error-paths/vue/memory.error.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[2]! -describe('memory', () => { - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/server/scenarios/error-paths/vue/memory.not-found.bench.ts b/benchmarks/memory/server/scenarios/error-paths/vue/memory.not-found.bench.ts index 42d67b1164..fa6a6693ed 100644 --- a/benchmarks/memory/server/scenarios/error-paths/vue/memory.not-found.bench.ts +++ b/benchmarks/memory/server/scenarios/error-paths/vue/memory.not-found.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[1]! -describe('memory', () => { - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/server/scenarios/error-paths/vue/memory.unmatched.bench.ts b/benchmarks/memory/server/scenarios/error-paths/vue/memory.unmatched.bench.ts index 6179e469dd..b2c3d24200 100644 --- a/benchmarks/memory/server/scenarios/error-paths/vue/memory.unmatched.bench.ts +++ b/benchmarks/memory/server/scenarios/error-paths/vue/memory.unmatched.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() const workload = workloadGroup.workloads[3]! -describe('memory', () => { - bench(workload.name, workload.run, memoryBenchOptions) +test('memory', async ({ bench }) => { + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) }) diff --git a/benchmarks/memory/server/scenarios/peak-large-page/react/memory.bench.ts b/benchmarks/memory/server/scenarios/peak-large-page/react/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/peak-large-page/react/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/peak-large-page/react/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/scenarios/peak-large-page/shared.ts b/benchmarks/memory/server/scenarios/peak-large-page/shared.ts index 486c025f5a..085e576244 100644 --- a/benchmarks/memory/server/scenarios/peak-large-page/shared.ts +++ b/benchmarks/memory/server/scenarios/peak-large-page/shared.ts @@ -48,7 +48,7 @@ export function createWorkloadGroup( framework: Framework, handler: StartRequestHandler, ) { - const run = () => + const run = async () => runSequentialRequestLoop(handler, { seed: benchmarkSeed, iterations: peakLargePageIterations, diff --git a/benchmarks/memory/server/scenarios/peak-large-page/solid/memory.bench.ts b/benchmarks/memory/server/scenarios/peak-large-page/solid/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/peak-large-page/solid/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/peak-large-page/solid/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/scenarios/peak-large-page/vue/memory.bench.ts b/benchmarks/memory/server/scenarios/peak-large-page/vue/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/peak-large-page/vue/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/peak-large-page/vue/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/scenarios/request-churn/react/memory.bench.ts b/benchmarks/memory/server/scenarios/request-churn/react/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/request-churn/react/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/request-churn/react/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/scenarios/request-churn/shared.ts b/benchmarks/memory/server/scenarios/request-churn/shared.ts index 32125148cd..b200c96ed6 100644 --- a/benchmarks/memory/server/scenarios/request-churn/shared.ts +++ b/benchmarks/memory/server/scenarios/request-churn/shared.ts @@ -62,7 +62,7 @@ export function createWorkloadGroup( return new Request(`http://localhost/items/${id}?q=${q}`, requestInit) } - const run = () => + const run = async () => runSequentialRequestLoop(handler, { random: benchmarkRandom, iterations: requestChurnIterations, diff --git a/benchmarks/memory/server/scenarios/request-churn/solid/memory.bench.ts b/benchmarks/memory/server/scenarios/request-churn/solid/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/request-churn/solid/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/request-churn/solid/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/scenarios/request-churn/vue/memory.bench.ts b/benchmarks/memory/server/scenarios/request-churn/vue/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/request-churn/vue/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/request-churn/vue/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/scenarios/serialization-payload/react/memory.bench.ts b/benchmarks/memory/server/scenarios/serialization-payload/react/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/serialization-payload/react/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/serialization-payload/react/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/scenarios/serialization-payload/shared.ts b/benchmarks/memory/server/scenarios/serialization-payload/shared.ts index 7f40aeb9d2..14ec8f7e0a 100644 --- a/benchmarks/memory/server/scenarios/serialization-payload/shared.ts +++ b/benchmarks/memory/server/scenarios/serialization-payload/shared.ts @@ -55,7 +55,7 @@ export function createWorkloadGroup( framework: Framework, handler: StartRequestHandler, ) { - const run = () => + const run = async () => runSequentialRequestLoop(handler, { seed: benchmarkSeed, iterations: serializationPayloadIterations, diff --git a/benchmarks/memory/server/scenarios/serialization-payload/solid/memory.bench.ts b/benchmarks/memory/server/scenarios/serialization-payload/solid/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/serialization-payload/solid/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/serialization-payload/solid/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/scenarios/serialization-payload/vue/memory.bench.ts b/benchmarks/memory/server/scenarios/serialization-payload/vue/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/serialization-payload/vue/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/serialization-payload/vue/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/scenarios/server-fn-churn/react/memory.bench.ts b/benchmarks/memory/server/scenarios/server-fn-churn/react/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/server-fn-churn/react/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/server-fn-churn/react/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/scenarios/server-fn-churn/shared.ts b/benchmarks/memory/server/scenarios/server-fn-churn/shared.ts index 5fd1e22632..167b24d3b6 100644 --- a/benchmarks/memory/server/scenarios/server-fn-churn/shared.ts +++ b/benchmarks/memory/server/scenarios/server-fn-churn/shared.ts @@ -202,7 +202,7 @@ export async function createWorkloadGroup( handler: StartRequestHandler, ) { const urls = await discoverUrls(handler) - const run = () => + const run = async () => runSequentialRequestLoop(handler, { seed: benchmarkSeed, iterations: serverFnChurnIterations, diff --git a/benchmarks/memory/server/scenarios/server-fn-churn/solid/memory.bench.ts b/benchmarks/memory/server/scenarios/server-fn-churn/solid/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/server-fn-churn/solid/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/server-fn-churn/solid/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/scenarios/server-fn-churn/vue/memory.bench.ts b/benchmarks/memory/server/scenarios/server-fn-churn/vue/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/server-fn-churn/vue/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/server-fn-churn/vue/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/scenarios/streaming-peak/react/memory.bench.ts b/benchmarks/memory/server/scenarios/streaming-peak/react/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/streaming-peak/react/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/streaming-peak/react/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/scenarios/streaming-peak/shared.ts b/benchmarks/memory/server/scenarios/streaming-peak/shared.ts index 01917c4743..c027047408 100644 --- a/benchmarks/memory/server/scenarios/streaming-peak/shared.ts +++ b/benchmarks/memory/server/scenarios/streaming-peak/shared.ts @@ -92,7 +92,7 @@ export function createWorkloadGroup( framework: Framework, handler: StartRequestHandler, ) { - const run = () => + const run = async () => runSequentialRequestLoop(handler, { seed: benchmarkSeed, iterations: streamingPeakIterations, diff --git a/benchmarks/memory/server/scenarios/streaming-peak/solid/memory.bench.ts b/benchmarks/memory/server/scenarios/streaming-peak/solid/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/streaming-peak/solid/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/streaming-peak/solid/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/scenarios/streaming-peak/vue/memory.bench.ts b/benchmarks/memory/server/scenarios/streaming-peak/vue/memory.bench.ts index 9a5c211fee..8b5f16ad63 100644 --- a/benchmarks/memory/server/scenarios/streaming-peak/vue/memory.bench.ts +++ b/benchmarks/memory/server/scenarios/streaming-peak/vue/memory.bench.ts @@ -1,11 +1,16 @@ -import { bench, describe } from 'vitest' -import { memoryBenchOptions } from '#memory-server/bench-utils' +import { test } from 'vitest' +import { + memoryBenchHooks, + memoryBenchOptions, +} from '#memory-server/bench-utils' import { workloadGroup } from './setup' await workloadGroup.sanity() -describe('memory', () => { +test('memory', async ({ bench }) => { for (const workload of workloadGroup.workloads) { - bench(workload.name, workload.run, memoryBenchOptions) + await bench(workload.name, memoryBenchHooks(), workload.run).run( + memoryBenchOptions, + ) } }) diff --git a/benchmarks/memory/server/vitest.setup.ts b/benchmarks/memory/server/vitest.setup.ts deleted file mode 100644 index be96c0067a..0000000000 --- a/benchmarks/memory/server/vitest.setup.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { beforeEach } from 'vitest' -import { endMemoryTurn } from '../turn' - -beforeEach(endMemoryTurn) diff --git a/benchmarks/memory/turn.ts b/benchmarks/memory/turn.ts index 3ee6d53833..08729685fe 100644 --- a/benchmarks/memory/turn.ts +++ b/benchmarks/memory/turn.ts @@ -10,3 +10,25 @@ export function isMemoryInstrumented() { export function endMemoryTurn() { return new Promise((resolve) => setImmediate(resolve)) } + +/** + * Per-invocation bench hooks. CodSpeed runs them around every warmup + * invocation and the measured one, outside the measurement marker: the turn + * ends first, then the workload prepares fresh state before the forced GC. + */ +export function memoryBenchHooks( + workload: { + before?: () => Promise | void + after?: () => Promise | void + } = {}, +) { + return { + async beforeEach() { + if (isMemoryInstrumented()) { + await endMemoryTurn() + } + await workload.before?.() + }, + afterEach: workload.after, + } +} diff --git a/benchmarks/ssr/package.json b/benchmarks/ssr/package.json index a6ab62efa5..20c1837468 100644 --- a/benchmarks/ssr/package.json +++ b/benchmarks/ssr/package.json @@ -15,7 +15,7 @@ "vue": "^3.5.16" }, "devDependencies": { - "@codspeed/vitest-plugin": "^5.7.1", + "@codspeed/vitest-plugin": "^6.0.1", "@vitejs/plugin-react": "^6.0.1", "@vitejs/plugin-vue-jsx": "^5.1.5", "@types/react": "catalog:", @@ -116,7 +116,7 @@ "build:vue" ], "options": { - "command": "NODE_ENV=production vitest bench", + "command": "NODE_ENV=production vitest bench --mode benchmark", "cwd": "benchmarks/ssr" } }, @@ -134,7 +134,7 @@ "build:react" ], "options": { - "command": "NODE_ENV=production vitest bench --config ./vitest.react.config.ts", + "command": "NODE_ENV=production vitest bench --mode benchmark --config ./vitest.react.config.ts", "cwd": "benchmarks/ssr" } }, @@ -145,7 +145,7 @@ "build:solid" ], "options": { - "command": "NODE_ENV=production vitest bench --config ./vitest.solid.config.ts", + "command": "NODE_ENV=production vitest bench --mode benchmark --config ./vitest.solid.config.ts", "cwd": "benchmarks/ssr" } }, @@ -156,7 +156,7 @@ "build:vue" ], "options": { - "command": "NODE_ENV=production vitest bench --config ./vitest.vue.config.ts", + "command": "NODE_ENV=production vitest bench --mode benchmark --config ./vitest.vue.config.ts", "cwd": "benchmarks/ssr" } }, diff --git a/benchmarks/ssr/react/speed.bench.ts b/benchmarks/ssr/react/speed.bench.ts index 419b1ccb36..6825a7ddfb 100644 --- a/benchmarks/ssr/react/speed.bench.ts +++ b/benchmarks/ssr/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { runSsrRequestLoop } from '../bench-utils' import type { StartRequestHandler } from '../bench-utils' @@ -11,14 +11,12 @@ const { default: handler } = (await import( default: StartRequestHandler } -describe('ssr', () => { - bench( - 'ssr request loop (react)', - () => runSsrRequestLoop(handler, { seed: benchmarkSeed }), - { - warmupIterations: 100, - time: 10_000, - throws: true, - }, - ) +test('ssr', async ({ bench }) => { + await bench('ssr request loop (react)', async () => + runSsrRequestLoop(handler, { seed: benchmarkSeed }), + ).run({ + warmupIterations: 100, + time: 10_000, + throws: true, + }) }) diff --git a/benchmarks/ssr/scenarios/assets/react/speed.assets-linked-css-control.bench.ts b/benchmarks/ssr/scenarios/assets/react/speed.assets-linked-css-control.bench.ts index 6413559b92..0496613afb 100644 --- a/benchmarks/ssr/scenarios/assets/react/speed.assets-linked-css-control.bench.ts +++ b/benchmarks/ssr/scenarios/assets/react/speed.assets-linked-css-control.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertAssetsScenario, assetsBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertAssetsScenario(handler) -describe('ssr', () => { - bench( - 'ssr assets linked-css control (react)', - () => runAssetsLinkedControlLoop(handler), - assetsBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr assets linked-css control (react)', async () => + runAssetsLinkedControlLoop(handler), + ).run(assetsBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/assets/react/speed.bench.ts b/benchmarks/ssr/scenarios/assets/react/speed.bench.ts index 5970b88f0b..7dc57d89f1 100644 --- a/benchmarks/ssr/scenarios/assets/react/speed.bench.ts +++ b/benchmarks/ssr/scenarios/assets/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertAssetsScenario, assetsBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertAssetsScenario(handler) -describe('ssr', () => { - bench( - 'ssr assets inline-css cdn (react)', - () => runAssetsInlineLoop(handler), - assetsBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr assets inline-css cdn (react)', async () => + runAssetsInlineLoop(handler), + ).run(assetsBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/assets/solid/speed.assets-linked-css-control.bench.ts b/benchmarks/ssr/scenarios/assets/solid/speed.assets-linked-css-control.bench.ts index 63fa209ac3..d159124a04 100644 --- a/benchmarks/ssr/scenarios/assets/solid/speed.assets-linked-css-control.bench.ts +++ b/benchmarks/ssr/scenarios/assets/solid/speed.assets-linked-css-control.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertAssetsScenario, assetsBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertAssetsScenario(handler) -describe('ssr', () => { - bench( - 'ssr assets linked-css control (solid)', - () => runAssetsLinkedControlLoop(handler), - assetsBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr assets linked-css control (solid)', async () => + runAssetsLinkedControlLoop(handler), + ).run(assetsBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/assets/solid/speed.bench.ts b/benchmarks/ssr/scenarios/assets/solid/speed.bench.ts index fb5631a50e..47f483df11 100644 --- a/benchmarks/ssr/scenarios/assets/solid/speed.bench.ts +++ b/benchmarks/ssr/scenarios/assets/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertAssetsScenario, assetsBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertAssetsScenario(handler) -describe('ssr', () => { - bench( - 'ssr assets inline-css cdn (solid)', - () => runAssetsInlineLoop(handler), - assetsBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr assets inline-css cdn (solid)', async () => + runAssetsInlineLoop(handler), + ).run(assetsBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/assets/vue/speed.assets-linked-css-control.bench.ts b/benchmarks/ssr/scenarios/assets/vue/speed.assets-linked-css-control.bench.ts index ae8712da75..e56d41df6b 100644 --- a/benchmarks/ssr/scenarios/assets/vue/speed.assets-linked-css-control.bench.ts +++ b/benchmarks/ssr/scenarios/assets/vue/speed.assets-linked-css-control.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertAssetsScenario, assetsBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertAssetsScenario(handler) -describe('ssr', () => { - bench( - 'ssr assets linked-css control (vue)', - () => runAssetsLinkedControlLoop(handler), - assetsBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr assets linked-css control (vue)', async () => + runAssetsLinkedControlLoop(handler), + ).run(assetsBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/assets/vue/speed.bench.ts b/benchmarks/ssr/scenarios/assets/vue/speed.bench.ts index 5225e3dc66..3f77a0dcc1 100644 --- a/benchmarks/ssr/scenarios/assets/vue/speed.bench.ts +++ b/benchmarks/ssr/scenarios/assets/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertAssetsScenario, assetsBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertAssetsScenario(handler) -describe('ssr', () => { - bench( - 'ssr assets inline-css cdn (vue)', - () => runAssetsInlineLoop(handler), - assetsBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr assets inline-css cdn (vue)', async () => + runAssetsInlineLoop(handler), + ).run(assetsBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/before-load/react/speed.bench.ts b/benchmarks/ssr/scenarios/before-load/react/speed.bench.ts index 09073687c0..8a4355a168 100644 --- a/benchmarks/ssr/scenarios/before-load/react/speed.bench.ts +++ b/benchmarks/ssr/scenarios/before-load/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertBeforeLoadScenario, beforeLoadBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertBeforeLoadScenario(handler) -describe('ssr', () => { - bench( - 'ssr before-load chain (react)', - () => runBeforeLoadLoop(handler), - beforeLoadBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr before-load chain (react)', async () => + runBeforeLoadLoop(handler), + ).run(beforeLoadBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/before-load/solid/speed.bench.ts b/benchmarks/ssr/scenarios/before-load/solid/speed.bench.ts index 5f6e8baf8a..27e0d3a64c 100644 --- a/benchmarks/ssr/scenarios/before-load/solid/speed.bench.ts +++ b/benchmarks/ssr/scenarios/before-load/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertBeforeLoadScenario, beforeLoadBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertBeforeLoadScenario(handler) -describe('ssr', () => { - bench( - 'ssr before-load chain (solid)', - () => runBeforeLoadLoop(handler), - beforeLoadBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr before-load chain (solid)', async () => + runBeforeLoadLoop(handler), + ).run(beforeLoadBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/before-load/vue/speed.bench.ts b/benchmarks/ssr/scenarios/before-load/vue/speed.bench.ts index d2cfd6814b..8684c159eb 100644 --- a/benchmarks/ssr/scenarios/before-load/vue/speed.bench.ts +++ b/benchmarks/ssr/scenarios/before-load/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertBeforeLoadScenario, beforeLoadBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertBeforeLoadScenario(handler) -describe('ssr', () => { - bench( - 'ssr before-load chain (vue)', - () => runBeforeLoadLoop(handler), - beforeLoadBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr before-load chain (vue)', async () => + runBeforeLoadLoop(handler), + ).run(beforeLoadBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/control-flow/react/speed.bench.ts b/benchmarks/ssr/scenarios/control-flow/react/speed.bench.ts index 3c0a3f502e..899f400799 100644 --- a/benchmarks/ssr/scenarios/control-flow/react/speed.bench.ts +++ b/benchmarks/ssr/scenarios/control-flow/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -describe('ssr', () => { - bench( - 'ssr redirect (react)', - () => runRedirectLoop(handler), +test('ssr', async ({ bench }) => { + await bench('ssr redirect (react)', async () => runRedirectLoop(handler)).run( controlFlowBenchOptions, ) }) diff --git a/benchmarks/ssr/scenarios/control-flow/react/speed.control-flow-error-500.bench.ts b/benchmarks/ssr/scenarios/control-flow/react/speed.control-flow-error-500.bench.ts index 3e117895d8..0a93c5eac3 100644 --- a/benchmarks/ssr/scenarios/control-flow/react/speed.control-flow-error-500.bench.ts +++ b/benchmarks/ssr/scenarios/control-flow/react/speed.control-flow-error-500.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -describe('ssr', () => { - bench( - 'ssr control-flow error 500 (react)', - () => runErrorLoop(handler), - controlFlowBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr control-flow error 500 (react)', async () => + runErrorLoop(handler), + ).run(controlFlowBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/control-flow/react/speed.control-flow-route-headers.bench.ts b/benchmarks/ssr/scenarios/control-flow/react/speed.control-flow-route-headers.bench.ts index 566748735e..53e09fd34e 100644 --- a/benchmarks/ssr/scenarios/control-flow/react/speed.control-flow-route-headers.bench.ts +++ b/benchmarks/ssr/scenarios/control-flow/react/speed.control-flow-route-headers.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -describe('ssr', () => { - bench( - 'ssr control-flow route headers (react)', - () => runRouteHeadersLoop(handler), - controlFlowBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr control-flow route headers (react)', async () => + runRouteHeadersLoop(handler), + ).run(controlFlowBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/control-flow/react/speed.control-flow-unmatched-404.bench.ts b/benchmarks/ssr/scenarios/control-flow/react/speed.control-flow-unmatched-404.bench.ts index b7c25a0bb2..1cd7c1044c 100644 --- a/benchmarks/ssr/scenarios/control-flow/react/speed.control-flow-unmatched-404.bench.ts +++ b/benchmarks/ssr/scenarios/control-flow/react/speed.control-flow-unmatched-404.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -describe('ssr', () => { - bench( - 'ssr control-flow unmatched 404 (react)', - () => runUnmatchedLoop(handler), - controlFlowBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr control-flow unmatched 404 (react)', async () => + runUnmatchedLoop(handler), + ).run(controlFlowBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/control-flow/react/speed.not-found.bench.ts b/benchmarks/ssr/scenarios/control-flow/react/speed.not-found.bench.ts index e56335c602..1e8abfd318 100644 --- a/benchmarks/ssr/scenarios/control-flow/react/speed.not-found.bench.ts +++ b/benchmarks/ssr/scenarios/control-flow/react/speed.not-found.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -describe('ssr', () => { - bench( - 'ssr not-found (react)', - () => runNotFoundLoop(handler), - controlFlowBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr not-found (react)', async () => + runNotFoundLoop(handler), + ).run(controlFlowBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/control-flow/solid/speed.bench.ts b/benchmarks/ssr/scenarios/control-flow/solid/speed.bench.ts index b76cd741df..904b693e25 100644 --- a/benchmarks/ssr/scenarios/control-flow/solid/speed.bench.ts +++ b/benchmarks/ssr/scenarios/control-flow/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -describe('ssr', () => { - bench( - 'ssr redirect (solid)', - () => runRedirectLoop(handler), +test('ssr', async ({ bench }) => { + await bench('ssr redirect (solid)', async () => runRedirectLoop(handler)).run( controlFlowBenchOptions, ) }) diff --git a/benchmarks/ssr/scenarios/control-flow/solid/speed.control-flow-error-500.bench.ts b/benchmarks/ssr/scenarios/control-flow/solid/speed.control-flow-error-500.bench.ts index 119f65c9ee..57a2f0fbe9 100644 --- a/benchmarks/ssr/scenarios/control-flow/solid/speed.control-flow-error-500.bench.ts +++ b/benchmarks/ssr/scenarios/control-flow/solid/speed.control-flow-error-500.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -describe('ssr', () => { - bench( - 'ssr control-flow error 500 (solid)', - () => runErrorLoop(handler), - controlFlowBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr control-flow error 500 (solid)', async () => + runErrorLoop(handler), + ).run(controlFlowBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/control-flow/solid/speed.control-flow-route-headers.bench.ts b/benchmarks/ssr/scenarios/control-flow/solid/speed.control-flow-route-headers.bench.ts index 8954e67986..6581e92b39 100644 --- a/benchmarks/ssr/scenarios/control-flow/solid/speed.control-flow-route-headers.bench.ts +++ b/benchmarks/ssr/scenarios/control-flow/solid/speed.control-flow-route-headers.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -describe('ssr', () => { - bench( - 'ssr control-flow route headers (solid)', - () => runRouteHeadersLoop(handler), - controlFlowBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr control-flow route headers (solid)', async () => + runRouteHeadersLoop(handler), + ).run(controlFlowBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/control-flow/solid/speed.control-flow-unmatched-404.bench.ts b/benchmarks/ssr/scenarios/control-flow/solid/speed.control-flow-unmatched-404.bench.ts index d59282def9..40f1679320 100644 --- a/benchmarks/ssr/scenarios/control-flow/solid/speed.control-flow-unmatched-404.bench.ts +++ b/benchmarks/ssr/scenarios/control-flow/solid/speed.control-flow-unmatched-404.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -describe('ssr', () => { - bench( - 'ssr control-flow unmatched 404 (solid)', - () => runUnmatchedLoop(handler), - controlFlowBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr control-flow unmatched 404 (solid)', async () => + runUnmatchedLoop(handler), + ).run(controlFlowBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/control-flow/solid/speed.not-found.bench.ts b/benchmarks/ssr/scenarios/control-flow/solid/speed.not-found.bench.ts index 66cf63fe79..efcb7cc229 100644 --- a/benchmarks/ssr/scenarios/control-flow/solid/speed.not-found.bench.ts +++ b/benchmarks/ssr/scenarios/control-flow/solid/speed.not-found.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -describe('ssr', () => { - bench( - 'ssr not-found (solid)', - () => runNotFoundLoop(handler), - controlFlowBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr not-found (solid)', async () => + runNotFoundLoop(handler), + ).run(controlFlowBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/control-flow/solid/src/routeTree.gen.ts b/benchmarks/ssr/scenarios/control-flow/solid/src/routeTree.gen.ts index 5e7342c172..3cec17d9c8 100644 --- a/benchmarks/ssr/scenarios/control-flow/solid/src/routeTree.gen.ts +++ b/benchmarks/ssr/scenarios/control-flow/solid/src/routeTree.gen.ts @@ -10,30 +10,20 @@ import { Route as rootRouteImport } from './routes/__root' import { Route as IndexRouteImport } from './routes/index' -import { Route as TargetIdRouteImport } from './routes/target.$id' -import { Route as MissingIdRouteImport } from './routes/missing.$id' -import { Route as HeadersIdRouteImport } from './routes/headers.$id' -import { Route as FromIdRouteImport } from './routes/from.$id' import { Route as BoomIdRouteImport } from './routes/boom.$id' +import { Route as FromIdRouteImport } from './routes/from.$id' +import { Route as HeadersIdRouteImport } from './routes/headers.$id' +import { Route as MissingIdRouteImport } from './routes/missing.$id' +import { Route as TargetIdRouteImport } from './routes/target.$id' const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRouteImport, } as any) -const TargetIdRoute = TargetIdRouteImport.update({ - id: '/target/$id', - path: '/target/$id', - getParentRoute: () => rootRouteImport, -} as any) -const MissingIdRoute = MissingIdRouteImport.update({ - id: '/missing/$id', - path: '/missing/$id', - getParentRoute: () => rootRouteImport, -} as any) -const HeadersIdRoute = HeadersIdRouteImport.update({ - id: '/headers/$id', - path: '/headers/$id', +const BoomIdRoute = BoomIdRouteImport.update({ + id: '/boom/$id', + path: '/boom/$id', getParentRoute: () => rootRouteImport, } as any) const FromIdRoute = FromIdRouteImport.update({ @@ -41,9 +31,19 @@ const FromIdRoute = FromIdRouteImport.update({ path: '/from/$id', getParentRoute: () => rootRouteImport, } as any) -const BoomIdRoute = BoomIdRouteImport.update({ - id: '/boom/$id', - path: '/boom/$id', +const HeadersIdRoute = HeadersIdRouteImport.update({ + id: '/headers/$id', + path: '/headers/$id', + getParentRoute: () => rootRouteImport, +} as any) +const MissingIdRoute = MissingIdRouteImport.update({ + id: '/missing/$id', + path: '/missing/$id', + getParentRoute: () => rootRouteImport, +} as any) +const TargetIdRoute = TargetIdRouteImport.update({ + id: '/target/$id', + path: '/target/$id', getParentRoute: () => rootRouteImport, } as any) @@ -117,25 +117,11 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } - '/target/$id': { - id: '/target/$id' - path: '/target/$id' - fullPath: '/target/$id' - preLoaderRoute: typeof TargetIdRouteImport - parentRoute: typeof rootRouteImport - } - '/missing/$id': { - id: '/missing/$id' - path: '/missing/$id' - fullPath: '/missing/$id' - preLoaderRoute: typeof MissingIdRouteImport - parentRoute: typeof rootRouteImport - } - '/headers/$id': { - id: '/headers/$id' - path: '/headers/$id' - fullPath: '/headers/$id' - preLoaderRoute: typeof HeadersIdRouteImport + '/boom/$id': { + id: '/boom/$id' + path: '/boom/$id' + fullPath: '/boom/$id' + preLoaderRoute: typeof BoomIdRouteImport parentRoute: typeof rootRouteImport } '/from/$id': { @@ -145,11 +131,25 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof FromIdRouteImport parentRoute: typeof rootRouteImport } - '/boom/$id': { - id: '/boom/$id' - path: '/boom/$id' - fullPath: '/boom/$id' - preLoaderRoute: typeof BoomIdRouteImport + '/headers/$id': { + id: '/headers/$id' + path: '/headers/$id' + fullPath: '/headers/$id' + preLoaderRoute: typeof HeadersIdRouteImport + parentRoute: typeof rootRouteImport + } + '/missing/$id': { + id: '/missing/$id' + path: '/missing/$id' + fullPath: '/missing/$id' + preLoaderRoute: typeof MissingIdRouteImport + parentRoute: typeof rootRouteImport + } + '/target/$id': { + id: '/target/$id' + path: '/target/$id' + fullPath: '/target/$id' + preLoaderRoute: typeof TargetIdRouteImport parentRoute: typeof rootRouteImport } } diff --git a/benchmarks/ssr/scenarios/control-flow/vue/speed.bench.ts b/benchmarks/ssr/scenarios/control-flow/vue/speed.bench.ts index e57ec26b52..0b95f426f2 100644 --- a/benchmarks/ssr/scenarios/control-flow/vue/speed.bench.ts +++ b/benchmarks/ssr/scenarios/control-flow/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -describe('ssr', () => { - bench( - 'ssr redirect (vue)', - () => runRedirectLoop(handler), +test('ssr', async ({ bench }) => { + await bench('ssr redirect (vue)', async () => runRedirectLoop(handler)).run( controlFlowBenchOptions, ) }) diff --git a/benchmarks/ssr/scenarios/control-flow/vue/speed.control-flow-error-500.bench.ts b/benchmarks/ssr/scenarios/control-flow/vue/speed.control-flow-error-500.bench.ts index e118e1dd28..262ca951af 100644 --- a/benchmarks/ssr/scenarios/control-flow/vue/speed.control-flow-error-500.bench.ts +++ b/benchmarks/ssr/scenarios/control-flow/vue/speed.control-flow-error-500.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -describe('ssr', () => { - bench( - 'ssr control-flow error 500 (vue)', - () => runErrorLoop(handler), - controlFlowBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr control-flow error 500 (vue)', async () => + runErrorLoop(handler), + ).run(controlFlowBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/control-flow/vue/speed.control-flow-route-headers.bench.ts b/benchmarks/ssr/scenarios/control-flow/vue/speed.control-flow-route-headers.bench.ts index 0bef524eaf..bf8c90a8a1 100644 --- a/benchmarks/ssr/scenarios/control-flow/vue/speed.control-flow-route-headers.bench.ts +++ b/benchmarks/ssr/scenarios/control-flow/vue/speed.control-flow-route-headers.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -describe('ssr', () => { - bench( - 'ssr control-flow route headers (vue)', - () => runRouteHeadersLoop(handler), - controlFlowBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr control-flow route headers (vue)', async () => + runRouteHeadersLoop(handler), + ).run(controlFlowBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/control-flow/vue/speed.control-flow-unmatched-404.bench.ts b/benchmarks/ssr/scenarios/control-flow/vue/speed.control-flow-unmatched-404.bench.ts index e29919dc56..d7f8ebeb9e 100644 --- a/benchmarks/ssr/scenarios/control-flow/vue/speed.control-flow-unmatched-404.bench.ts +++ b/benchmarks/ssr/scenarios/control-flow/vue/speed.control-flow-unmatched-404.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -describe('ssr', () => { - bench( - 'ssr control-flow unmatched 404 (vue)', - () => runUnmatchedLoop(handler), - controlFlowBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr control-flow unmatched 404 (vue)', async () => + runUnmatchedLoop(handler), + ).run(controlFlowBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/control-flow/vue/speed.not-found.bench.ts b/benchmarks/ssr/scenarios/control-flow/vue/speed.not-found.bench.ts index b2ab3af3c7..4b84fb594c 100644 --- a/benchmarks/ssr/scenarios/control-flow/vue/speed.not-found.bench.ts +++ b/benchmarks/ssr/scenarios/control-flow/vue/speed.not-found.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertControlFlowSanity, controlFlowBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertControlFlowSanity(handler) -describe('ssr', () => { - bench( - 'ssr not-found (vue)', - () => runNotFoundLoop(handler), +test('ssr', async ({ bench }) => { + await bench('ssr not-found (vue)', async () => runNotFoundLoop(handler)).run( controlFlowBenchOptions, ) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/react/speed.bench.ts b/benchmarks/ssr/scenarios/global-middleware/react/speed.bench.ts index c68d718262..cb3f9f427c 100644 --- a/benchmarks/ssr/scenarios/global-middleware/react/speed.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw document (react)', - () => runGlobalMiddlewareDocumentLoop(handler), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw document (react)', async () => + runGlobalMiddlewareDocumentLoop(handler), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-fn.bench.ts b/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-fn.bench.ts index 2655ef2f49..48c444de77 100644 --- a/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-fn.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-fn.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw server-fn (react)', - () => runGlobalMiddlewareServerFnLoop(handler, context), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw server-fn (react)', async () => + runGlobalMiddlewareServerFnLoop(handler, context), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-0-middleware.bench.ts b/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-0-middleware.bench.ts index 2a784ec987..22f53883ee 100644 --- a/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-0-middleware.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-0-middleware.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw server-route 0 middleware (react)', - () => runGlobalMiddlewareServerRouteLoop(handler, 0), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw server-route 0 middleware (react)', async () => + runGlobalMiddlewareServerRouteLoop(handler, 0), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-1-middleware.bench.ts b/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-1-middleware.bench.ts index 64e18cfe61..f01b48d66e 100644 --- a/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-1-middleware.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-1-middleware.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw server-route 1 middleware (react)', - () => runGlobalMiddlewareServerRouteLoop(handler, 1), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw server-route 1 middleware (react)', async () => + runGlobalMiddlewareServerRouteLoop(handler, 1), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-2-middleware.bench.ts b/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-2-middleware.bench.ts index 4418f0867e..b01957f806 100644 --- a/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-2-middleware.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route-2-middleware.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw server-route 2 middlewares (react)', - () => runGlobalMiddlewareServerRouteLoop(handler, 2), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw server-route 2 middlewares (react)', async () => + runGlobalMiddlewareServerRouteLoop(handler, 2), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route.bench.ts b/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route.bench.ts index 189f3b7ef6..08d97fcaf6 100644 --- a/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/react/speed.global-mw-server-route.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw server-route 3 middlewares (react)', - () => runGlobalMiddlewareServerRouteLoop(handler, 3), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw server-route 3 middlewares (react)', async () => + runGlobalMiddlewareServerRouteLoop(handler, 3), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/solid/speed.bench.ts b/benchmarks/ssr/scenarios/global-middleware/solid/speed.bench.ts index 5f27210e36..0e5f504090 100644 --- a/benchmarks/ssr/scenarios/global-middleware/solid/speed.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw document (solid)', - () => runGlobalMiddlewareDocumentLoop(handler), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw document (solid)', async () => + runGlobalMiddlewareDocumentLoop(handler), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-fn.bench.ts b/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-fn.bench.ts index eb19e10ec9..915507ef9f 100644 --- a/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-fn.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-fn.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw server-fn (solid)', - () => runGlobalMiddlewareServerFnLoop(handler, context), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw server-fn (solid)', async () => + runGlobalMiddlewareServerFnLoop(handler, context), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-0-middleware.bench.ts b/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-0-middleware.bench.ts index c7485b4ef4..a791145935 100644 --- a/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-0-middleware.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-0-middleware.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw server-route 0 middleware (solid)', - () => runGlobalMiddlewareServerRouteLoop(handler, 0), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw server-route 0 middleware (solid)', async () => + runGlobalMiddlewareServerRouteLoop(handler, 0), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-1-middleware.bench.ts b/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-1-middleware.bench.ts index ac18e0ca79..1baab0f344 100644 --- a/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-1-middleware.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-1-middleware.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw server-route 1 middleware (solid)', - () => runGlobalMiddlewareServerRouteLoop(handler, 1), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw server-route 1 middleware (solid)', async () => + runGlobalMiddlewareServerRouteLoop(handler, 1), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-2-middleware.bench.ts b/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-2-middleware.bench.ts index 7c2be97b01..d6fde20764 100644 --- a/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-2-middleware.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route-2-middleware.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw server-route 2 middlewares (solid)', - () => runGlobalMiddlewareServerRouteLoop(handler, 2), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw server-route 2 middlewares (solid)', async () => + runGlobalMiddlewareServerRouteLoop(handler, 2), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route.bench.ts b/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route.bench.ts index 7d21d72067..558ebeb9a4 100644 --- a/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/solid/speed.global-mw-server-route.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw server-route 3 middlewares (solid)', - () => runGlobalMiddlewareServerRouteLoop(handler, 3), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw server-route 3 middlewares (solid)', async () => + runGlobalMiddlewareServerRouteLoop(handler, 3), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/solid/src/routeTree.gen.ts b/benchmarks/ssr/scenarios/global-middleware/solid/src/routeTree.gen.ts index 28d816525e..65f7fa5848 100644 --- a/benchmarks/ssr/scenarios/global-middleware/solid/src/routeTree.gen.ts +++ b/benchmarks/ssr/scenarios/global-middleware/solid/src/routeTree.gen.ts @@ -10,8 +10,8 @@ import { Route as rootRouteImport } from './routes/__root' import { Route as IndexRouteImport } from './routes/index' -import { Route as PageIdRouteImport } from './routes/page.$id' import { Route as ApiFnUrlsRouteImport } from './routes/api.fn-urls' +import { Route as PageIdRouteImport } from './routes/page.$id' import { Route as ApiPingIdRouteImport } from './routes/api.ping.$id' const IndexRoute = IndexRouteImport.update({ @@ -19,16 +19,16 @@ const IndexRoute = IndexRouteImport.update({ path: '/', getParentRoute: () => rootRouteImport, } as any) -const PageIdRoute = PageIdRouteImport.update({ - id: '/page/$id', - path: '/page/$id', - getParentRoute: () => rootRouteImport, -} as any) const ApiFnUrlsRoute = ApiFnUrlsRouteImport.update({ id: '/api/fn-urls', path: '/api/fn-urls', getParentRoute: () => rootRouteImport, } as any) +const PageIdRoute = PageIdRouteImport.update({ + id: '/page/$id', + path: '/page/$id', + getParentRoute: () => rootRouteImport, +} as any) const ApiPingIdRoute = ApiPingIdRouteImport.update({ id: '/api/ping/$id', path: '/api/ping/$id', @@ -78,13 +78,6 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } - '/page/$id': { - id: '/page/$id' - path: '/page/$id' - fullPath: '/page/$id' - preLoaderRoute: typeof PageIdRouteImport - parentRoute: typeof rootRouteImport - } '/api/fn-urls': { id: '/api/fn-urls' path: '/api/fn-urls' @@ -92,6 +85,13 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof ApiFnUrlsRouteImport parentRoute: typeof rootRouteImport } + '/page/$id': { + id: '/page/$id' + path: '/page/$id' + fullPath: '/page/$id' + preLoaderRoute: typeof PageIdRouteImport + parentRoute: typeof rootRouteImport + } '/api/ping/$id': { id: '/api/ping/$id' path: '/api/ping/$id' diff --git a/benchmarks/ssr/scenarios/global-middleware/vue/speed.bench.ts b/benchmarks/ssr/scenarios/global-middleware/vue/speed.bench.ts index 5d92aab849..9660f29d07 100644 --- a/benchmarks/ssr/scenarios/global-middleware/vue/speed.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw document (vue)', - () => runGlobalMiddlewareDocumentLoop(handler), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw document (vue)', async () => + runGlobalMiddlewareDocumentLoop(handler), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-fn.bench.ts b/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-fn.bench.ts index ab158504c8..297e8cee7b 100644 --- a/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-fn.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-fn.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw server-fn (vue)', - () => runGlobalMiddlewareServerFnLoop(handler, context), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw server-fn (vue)', async () => + runGlobalMiddlewareServerFnLoop(handler, context), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-0-middleware.bench.ts b/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-0-middleware.bench.ts index c334af8b65..d023dd458a 100644 --- a/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-0-middleware.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-0-middleware.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw server-route 0 middleware (vue)', - () => runGlobalMiddlewareServerRouteLoop(handler, 0), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw server-route 0 middleware (vue)', async () => + runGlobalMiddlewareServerRouteLoop(handler, 0), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-1-middleware.bench.ts b/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-1-middleware.bench.ts index 7c1b91a0ea..5018163631 100644 --- a/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-1-middleware.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-1-middleware.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw server-route 1 middleware (vue)', - () => runGlobalMiddlewareServerRouteLoop(handler, 1), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw server-route 1 middleware (vue)', async () => + runGlobalMiddlewareServerRouteLoop(handler, 1), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-2-middleware.bench.ts b/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-2-middleware.bench.ts index 5b00bd3ca9..f9abd8eb60 100644 --- a/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-2-middleware.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route-2-middleware.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw server-route 2 middlewares (vue)', - () => runGlobalMiddlewareServerRouteLoop(handler, 2), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw server-route 2 middlewares (vue)', async () => + runGlobalMiddlewareServerRouteLoop(handler, 2), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route.bench.ts b/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route.bench.ts index 6cdc34241e..adcec3019f 100644 --- a/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route.bench.ts +++ b/benchmarks/ssr/scenarios/global-middleware/vue/speed.global-mw-server-route.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertGlobalMiddlewareScenario, globalMiddlewareBenchOptions, @@ -18,10 +18,8 @@ const context = await setupGlobalMiddlewareBench(handler) await assertGlobalMiddlewareScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr global-mw server-route 3 middlewares (vue)', - () => runGlobalMiddlewareServerRouteLoop(handler, 3), - globalMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr global-mw server-route 3 middlewares (vue)', async () => + runGlobalMiddlewareServerRouteLoop(handler, 3), + ).run(globalMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/head/react/speed.bench.ts b/benchmarks/ssr/scenarios/head/react/speed.bench.ts index 19158b32a9..f75008506e 100644 --- a/benchmarks/ssr/scenarios/head/react/speed.bench.ts +++ b/benchmarks/ssr/scenarios/head/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertHeadSanity, headBenchOptions, runHeadLoop } from '../shared' import type { StartRequestHandler } from '../shared' @@ -12,6 +12,8 @@ const { default: handler } = (await import( await assertHeadSanity(handler) -describe('ssr', () => { - bench('ssr head (react)', () => runHeadLoop(handler), headBenchOptions) +test('ssr', async ({ bench }) => { + await bench('ssr head (react)', async () => runHeadLoop(handler)).run( + headBenchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/head/solid/speed.bench.ts b/benchmarks/ssr/scenarios/head/solid/speed.bench.ts index ad5bf52809..333e2f091b 100644 --- a/benchmarks/ssr/scenarios/head/solid/speed.bench.ts +++ b/benchmarks/ssr/scenarios/head/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertHeadSanity, headBenchOptions, runHeadLoop } from '../shared' import type { StartRequestHandler } from '../shared' @@ -12,6 +12,8 @@ const { default: handler } = (await import( await assertHeadSanity(handler) -describe('ssr', () => { - bench('ssr head (solid)', () => runHeadLoop(handler), headBenchOptions) +test('ssr', async ({ bench }) => { + await bench('ssr head (solid)', async () => runHeadLoop(handler)).run( + headBenchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/head/vue/speed.bench.ts b/benchmarks/ssr/scenarios/head/vue/speed.bench.ts index 5d8243b588..936735a909 100644 --- a/benchmarks/ssr/scenarios/head/vue/speed.bench.ts +++ b/benchmarks/ssr/scenarios/head/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertHeadSanity, headBenchOptions, runHeadLoop } from '../shared' import type { StartRequestHandler } from '../shared' @@ -12,6 +12,8 @@ const { default: handler } = (await import( await assertHeadSanity(handler) -describe('ssr', () => { - bench('ssr head (vue)', () => runHeadLoop(handler), headBenchOptions) +test('ssr', async ({ bench }) => { + await bench('ssr head (vue)', async () => runHeadLoop(handler)).run( + headBenchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/loaders/react/speed.bench.ts b/benchmarks/ssr/scenarios/loaders/react/speed.bench.ts index a5eecfc648..7acd43c635 100644 --- a/benchmarks/ssr/scenarios/loaders/react/speed.bench.ts +++ b/benchmarks/ssr/scenarios/loaders/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertLoadersSanity, benchOptions, @@ -16,6 +16,8 @@ const { default: handler } = (await import( await assertLoadersSanity(handler) -describe('ssr', () => { - bench('ssr loaders (react)', () => runLoadersLoop(handler), benchOptions) +test('ssr', async ({ bench }) => { + await bench('ssr loaders (react)', async () => runLoadersLoop(handler)).run( + benchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/loaders/solid/speed.bench.ts b/benchmarks/ssr/scenarios/loaders/solid/speed.bench.ts index 7b3f6247ea..7fc8d88389 100644 --- a/benchmarks/ssr/scenarios/loaders/solid/speed.bench.ts +++ b/benchmarks/ssr/scenarios/loaders/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertLoadersSanity, benchOptions, @@ -16,6 +16,8 @@ const { default: handler } = (await import( await assertLoadersSanity(handler) -describe('ssr', () => { - bench('ssr loaders (solid)', () => runLoadersLoop(handler), benchOptions) +test('ssr', async ({ bench }) => { + await bench('ssr loaders (solid)', async () => runLoadersLoop(handler)).run( + benchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/loaders/vue/speed.bench.ts b/benchmarks/ssr/scenarios/loaders/vue/speed.bench.ts index fb39e0652c..321350d98c 100644 --- a/benchmarks/ssr/scenarios/loaders/vue/speed.bench.ts +++ b/benchmarks/ssr/scenarios/loaders/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertLoadersSanity, benchOptions, @@ -16,6 +16,8 @@ const { default: handler } = (await import( await assertLoadersSanity(handler) -describe('ssr', () => { - bench('ssr loaders (vue)', () => runLoadersLoop(handler), benchOptions) +test('ssr', async ({ bench }) => { + await bench('ssr loaders (vue)', async () => runLoadersLoop(handler)).run( + benchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/rewrites/react/speed.bench.ts b/benchmarks/ssr/scenarios/rewrites/react/speed.bench.ts index a8af260279..920186c5db 100644 --- a/benchmarks/ssr/scenarios/rewrites/react/speed.bench.ts +++ b/benchmarks/ssr/scenarios/rewrites/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertRewriteScenario, rewriteBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertRewriteScenario(handler) -describe('ssr', () => { - bench( - 'ssr rewrite localized (react)', - () => runRewriteLocalizedLoop(handler), - rewriteBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr rewrite localized (react)', async () => + runRewriteLocalizedLoop(handler), + ).run(rewriteBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/rewrites/react/speed.rewrite-passthrough.bench.ts b/benchmarks/ssr/scenarios/rewrites/react/speed.rewrite-passthrough.bench.ts index cffabcafb5..f5d09089a6 100644 --- a/benchmarks/ssr/scenarios/rewrites/react/speed.rewrite-passthrough.bench.ts +++ b/benchmarks/ssr/scenarios/rewrites/react/speed.rewrite-passthrough.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertRewriteScenario, rewriteBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertRewriteScenario(handler) -describe('ssr', () => { - bench( - 'ssr rewrite passthrough (react)', - () => runRewritePassthroughLoop(handler), - rewriteBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr rewrite passthrough (react)', async () => + runRewritePassthroughLoop(handler), + ).run(rewriteBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/rewrites/solid/speed.bench.ts b/benchmarks/ssr/scenarios/rewrites/solid/speed.bench.ts index 5fdef077c9..488fb2ca52 100644 --- a/benchmarks/ssr/scenarios/rewrites/solid/speed.bench.ts +++ b/benchmarks/ssr/scenarios/rewrites/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertRewriteScenario, rewriteBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertRewriteScenario(handler) -describe('ssr', () => { - bench( - 'ssr rewrite localized (solid)', - () => runRewriteLocalizedLoop(handler), - rewriteBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr rewrite localized (solid)', async () => + runRewriteLocalizedLoop(handler), + ).run(rewriteBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/rewrites/solid/speed.rewrite-passthrough.bench.ts b/benchmarks/ssr/scenarios/rewrites/solid/speed.rewrite-passthrough.bench.ts index 2458a59b69..7b86e2ba11 100644 --- a/benchmarks/ssr/scenarios/rewrites/solid/speed.rewrite-passthrough.bench.ts +++ b/benchmarks/ssr/scenarios/rewrites/solid/speed.rewrite-passthrough.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertRewriteScenario, rewriteBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertRewriteScenario(handler) -describe('ssr', () => { - bench( - 'ssr rewrite passthrough (solid)', - () => runRewritePassthroughLoop(handler), - rewriteBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr rewrite passthrough (solid)', async () => + runRewritePassthroughLoop(handler), + ).run(rewriteBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/rewrites/vue/speed.bench.ts b/benchmarks/ssr/scenarios/rewrites/vue/speed.bench.ts index b8a98c3408..5fd4da9d3e 100644 --- a/benchmarks/ssr/scenarios/rewrites/vue/speed.bench.ts +++ b/benchmarks/ssr/scenarios/rewrites/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertRewriteScenario, rewriteBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertRewriteScenario(handler) -describe('ssr', () => { - bench( - 'ssr rewrite localized (vue)', - () => runRewriteLocalizedLoop(handler), - rewriteBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr rewrite localized (vue)', async () => + runRewriteLocalizedLoop(handler), + ).run(rewriteBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/rewrites/vue/speed.rewrite-passthrough.bench.ts b/benchmarks/ssr/scenarios/rewrites/vue/speed.rewrite-passthrough.bench.ts index e011a9fc8d..f3664b5f21 100644 --- a/benchmarks/ssr/scenarios/rewrites/vue/speed.rewrite-passthrough.bench.ts +++ b/benchmarks/ssr/scenarios/rewrites/vue/speed.rewrite-passthrough.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertRewriteScenario, rewriteBenchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertRewriteScenario(handler) -describe('ssr', () => { - bench( - 'ssr rewrite passthrough (vue)', - () => runRewritePassthroughLoop(handler), - rewriteBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr rewrite passthrough (vue)', async () => + runRewritePassthroughLoop(handler), + ).run(rewriteBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/selective-ssr/react/speed.bench.ts b/benchmarks/ssr/scenarios/selective-ssr/react/speed.bench.ts index e0e8a0e3c4..ba6bd4a61d 100644 --- a/benchmarks/ssr/scenarios/selective-ssr/react/speed.bench.ts +++ b/benchmarks/ssr/scenarios/selective-ssr/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertSelectiveSanity, benchOptions, @@ -16,6 +16,8 @@ const { default: handler } = (await import( await assertSelectiveSanity(handler) -describe('ssr', () => { - bench('ssr selective (react)', () => runSelectiveLoop(handler), benchOptions) +test('ssr', async ({ bench }) => { + await bench('ssr selective (react)', async () => + runSelectiveLoop(handler), + ).run(benchOptions) }) diff --git a/benchmarks/ssr/scenarios/selective-ssr/solid/speed.bench.ts b/benchmarks/ssr/scenarios/selective-ssr/solid/speed.bench.ts index 6a2803d45f..76265397ab 100644 --- a/benchmarks/ssr/scenarios/selective-ssr/solid/speed.bench.ts +++ b/benchmarks/ssr/scenarios/selective-ssr/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertSelectiveSanity, benchOptions, @@ -16,6 +16,8 @@ const { default: handler } = (await import( await assertSelectiveSanity(handler) -describe('ssr', () => { - bench('ssr selective (solid)', () => runSelectiveLoop(handler), benchOptions) +test('ssr', async ({ bench }) => { + await bench('ssr selective (solid)', async () => + runSelectiveLoop(handler), + ).run(benchOptions) }) diff --git a/benchmarks/ssr/scenarios/selective-ssr/vue/speed.bench.ts b/benchmarks/ssr/scenarios/selective-ssr/vue/speed.bench.ts index f3082a102d..ff60341b27 100644 --- a/benchmarks/ssr/scenarios/selective-ssr/vue/speed.bench.ts +++ b/benchmarks/ssr/scenarios/selective-ssr/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertSelectiveSanity, benchOptions, @@ -16,6 +16,8 @@ const { default: handler } = (await import( await assertSelectiveSanity(handler) -describe('ssr', () => { - bench('ssr selective (vue)', () => runSelectiveLoop(handler), benchOptions) +test('ssr', async ({ bench }) => { + await bench('ssr selective (vue)', async () => runSelectiveLoop(handler)).run( + benchOptions, + ) }) diff --git a/benchmarks/ssr/scenarios/serialization/react/speed.bench.ts b/benchmarks/ssr/scenarios/serialization/react/speed.bench.ts index 9032280e51..8be07d2643 100644 --- a/benchmarks/ssr/scenarios/serialization/react/speed.bench.ts +++ b/benchmarks/ssr/scenarios/serialization/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertSerializationScenario, runRichSerializationLoop, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertSerializationScenario(handler) -describe('ssr', () => { - bench( - 'ssr dehydrate rich types (react)', - () => runRichSerializationLoop(handler), - serializationBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr dehydrate rich types (react)', async () => + runRichSerializationLoop(handler), + ).run(serializationBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/serialization/react/speed.dehydrate-plain-control.bench.ts b/benchmarks/ssr/scenarios/serialization/react/speed.dehydrate-plain-control.bench.ts index a6c8d99fb6..c70fddc6c4 100644 --- a/benchmarks/ssr/scenarios/serialization/react/speed.dehydrate-plain-control.bench.ts +++ b/benchmarks/ssr/scenarios/serialization/react/speed.dehydrate-plain-control.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertSerializationScenario, runPlainSerializationLoop, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertSerializationScenario(handler) -describe('ssr', () => { - bench( - 'ssr dehydrate plain control (react)', - () => runPlainSerializationLoop(handler), - serializationBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr dehydrate plain control (react)', async () => + runPlainSerializationLoop(handler), + ).run(serializationBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/serialization/solid/speed.bench.ts b/benchmarks/ssr/scenarios/serialization/solid/speed.bench.ts index 3fa22ccea9..70bda8c7af 100644 --- a/benchmarks/ssr/scenarios/serialization/solid/speed.bench.ts +++ b/benchmarks/ssr/scenarios/serialization/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertSerializationScenario, runRichSerializationLoop, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertSerializationScenario(handler) -describe('ssr', () => { - bench( - 'ssr dehydrate rich types (solid)', - () => runRichSerializationLoop(handler), - serializationBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr dehydrate rich types (solid)', async () => + runRichSerializationLoop(handler), + ).run(serializationBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/serialization/solid/speed.dehydrate-plain-control.bench.ts b/benchmarks/ssr/scenarios/serialization/solid/speed.dehydrate-plain-control.bench.ts index 354512e09d..d7ccb16f6f 100644 --- a/benchmarks/ssr/scenarios/serialization/solid/speed.dehydrate-plain-control.bench.ts +++ b/benchmarks/ssr/scenarios/serialization/solid/speed.dehydrate-plain-control.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertSerializationScenario, runPlainSerializationLoop, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertSerializationScenario(handler) -describe('ssr', () => { - bench( - 'ssr dehydrate plain control (solid)', - () => runPlainSerializationLoop(handler), - serializationBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr dehydrate plain control (solid)', async () => + runPlainSerializationLoop(handler), + ).run(serializationBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/serialization/solid/src/routeTree.gen.ts b/benchmarks/ssr/scenarios/serialization/solid/src/routeTree.gen.ts index 69b63cffe9..b9e25f918e 100644 --- a/benchmarks/ssr/scenarios/serialization/solid/src/routeTree.gen.ts +++ b/benchmarks/ssr/scenarios/serialization/solid/src/routeTree.gen.ts @@ -9,19 +9,19 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { Route as rootRouteImport } from './routes/__root' -import { Route as RichIdRouteImport } from './routes/rich.$id' import { Route as PlainIdRouteImport } from './routes/plain.$id' +import { Route as RichIdRouteImport } from './routes/rich.$id' -const RichIdRoute = RichIdRouteImport.update({ - id: '/rich/$id', - path: '/rich/$id', - getParentRoute: () => rootRouteImport, -} as any) const PlainIdRoute = PlainIdRouteImport.update({ id: '/plain/$id', path: '/plain/$id', getParentRoute: () => rootRouteImport, } as any) +const RichIdRoute = RichIdRouteImport.update({ + id: '/rich/$id', + path: '/rich/$id', + getParentRoute: () => rootRouteImport, +} as any) export interface FileRoutesByFullPath { '/plain/$id': typeof PlainIdRoute @@ -51,13 +51,6 @@ export interface RootRouteChildren { declare module '@tanstack/solid-router' { interface FileRoutesByPath { - '/rich/$id': { - id: '/rich/$id' - path: '/rich/$id' - fullPath: '/rich/$id' - preLoaderRoute: typeof RichIdRouteImport - parentRoute: typeof rootRouteImport - } '/plain/$id': { id: '/plain/$id' path: '/plain/$id' @@ -65,6 +58,13 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof PlainIdRouteImport parentRoute: typeof rootRouteImport } + '/rich/$id': { + id: '/rich/$id' + path: '/rich/$id' + fullPath: '/rich/$id' + preLoaderRoute: typeof RichIdRouteImport + parentRoute: typeof rootRouteImport + } } } diff --git a/benchmarks/ssr/scenarios/serialization/vue/speed.bench.ts b/benchmarks/ssr/scenarios/serialization/vue/speed.bench.ts index d68c615fdc..7f733dd601 100644 --- a/benchmarks/ssr/scenarios/serialization/vue/speed.bench.ts +++ b/benchmarks/ssr/scenarios/serialization/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertSerializationScenario, runRichSerializationLoop, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertSerializationScenario(handler) -describe('ssr', () => { - bench( - 'ssr dehydrate rich types (vue)', - () => runRichSerializationLoop(handler), - serializationBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr dehydrate rich types (vue)', async () => + runRichSerializationLoop(handler), + ).run(serializationBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/serialization/vue/speed.dehydrate-plain-control.bench.ts b/benchmarks/ssr/scenarios/serialization/vue/speed.dehydrate-plain-control.bench.ts index 875a858226..8efdeb6c79 100644 --- a/benchmarks/ssr/scenarios/serialization/vue/speed.dehydrate-plain-control.bench.ts +++ b/benchmarks/ssr/scenarios/serialization/vue/speed.dehydrate-plain-control.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertSerializationScenario, runPlainSerializationLoop, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertSerializationScenario(handler) -describe('ssr', () => { - bench( - 'ssr dehydrate plain control (vue)', - () => runPlainSerializationLoop(handler), - serializationBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr dehydrate plain control (vue)', async () => + runPlainSerializationLoop(handler), + ).run(serializationBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fn-transport/react/speed.bench.ts b/benchmarks/ssr/scenarios/server-fn-transport/react/speed.bench.ts index 149ff591ed..fa80cdb690 100644 --- a/benchmarks/ssr/scenarios/server-fn-transport/react/speed.bench.ts +++ b/benchmarks/ssr/scenarios/server-fn-transport/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnTransportScenario, runServerFnMultipartRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnTransportBench(handler) await assertServerFnTransportScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn multipart (react)', - () => runServerFnMultipartRequestLoop(handler, context), - serverFnTransportBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn multipart (react)', async () => + runServerFnMultipartRequestLoop(handler, context), + ).run(serverFnTransportBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fn-transport/react/speed.server-fn-raw-response.bench.ts b/benchmarks/ssr/scenarios/server-fn-transport/react/speed.server-fn-raw-response.bench.ts index 43b31c609d..fd535ee313 100644 --- a/benchmarks/ssr/scenarios/server-fn-transport/react/speed.server-fn-raw-response.bench.ts +++ b/benchmarks/ssr/scenarios/server-fn-transport/react/speed.server-fn-raw-response.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnTransportScenario, runServerFnRawResponseRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnTransportBench(handler) await assertServerFnTransportScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn raw-response (react)', - () => runServerFnRawResponseRequestLoop(handler, context), - serverFnTransportBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn raw-response (react)', async () => + runServerFnRawResponseRequestLoop(handler, context), + ).run(serverFnTransportBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fn-transport/react/speed.server-fn-raw-stream.bench.ts b/benchmarks/ssr/scenarios/server-fn-transport/react/speed.server-fn-raw-stream.bench.ts index 4c90ffb847..8fbce405dd 100644 --- a/benchmarks/ssr/scenarios/server-fn-transport/react/speed.server-fn-raw-stream.bench.ts +++ b/benchmarks/ssr/scenarios/server-fn-transport/react/speed.server-fn-raw-stream.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnTransportScenario, runServerFnRawStreamRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnTransportBench(handler) await assertServerFnTransportScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn raw-stream (react)', - () => runServerFnRawStreamRequestLoop(handler, context), - serverFnTransportBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn raw-stream (react)', async () => + runServerFnRawStreamRequestLoop(handler, context), + ).run(serverFnTransportBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fn-transport/solid/speed.bench.ts b/benchmarks/ssr/scenarios/server-fn-transport/solid/speed.bench.ts index aaa2028902..adac07cb22 100644 --- a/benchmarks/ssr/scenarios/server-fn-transport/solid/speed.bench.ts +++ b/benchmarks/ssr/scenarios/server-fn-transport/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnTransportScenario, runServerFnMultipartRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnTransportBench(handler) await assertServerFnTransportScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn multipart (solid)', - () => runServerFnMultipartRequestLoop(handler, context), - serverFnTransportBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn multipart (solid)', async () => + runServerFnMultipartRequestLoop(handler, context), + ).run(serverFnTransportBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fn-transport/solid/speed.server-fn-raw-response.bench.ts b/benchmarks/ssr/scenarios/server-fn-transport/solid/speed.server-fn-raw-response.bench.ts index 661430c3ae..843a4c97ce 100644 --- a/benchmarks/ssr/scenarios/server-fn-transport/solid/speed.server-fn-raw-response.bench.ts +++ b/benchmarks/ssr/scenarios/server-fn-transport/solid/speed.server-fn-raw-response.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnTransportScenario, runServerFnRawResponseRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnTransportBench(handler) await assertServerFnTransportScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn raw-response (solid)', - () => runServerFnRawResponseRequestLoop(handler, context), - serverFnTransportBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn raw-response (solid)', async () => + runServerFnRawResponseRequestLoop(handler, context), + ).run(serverFnTransportBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fn-transport/solid/speed.server-fn-raw-stream.bench.ts b/benchmarks/ssr/scenarios/server-fn-transport/solid/speed.server-fn-raw-stream.bench.ts index 37d9b86e12..aa24d55e79 100644 --- a/benchmarks/ssr/scenarios/server-fn-transport/solid/speed.server-fn-raw-stream.bench.ts +++ b/benchmarks/ssr/scenarios/server-fn-transport/solid/speed.server-fn-raw-stream.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnTransportScenario, runServerFnRawStreamRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnTransportBench(handler) await assertServerFnTransportScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn raw-stream (solid)', - () => runServerFnRawStreamRequestLoop(handler, context), - serverFnTransportBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn raw-stream (solid)', async () => + runServerFnRawStreamRequestLoop(handler, context), + ).run(serverFnTransportBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fn-transport/vue/speed.bench.ts b/benchmarks/ssr/scenarios/server-fn-transport/vue/speed.bench.ts index 99d266298d..24305cf1bc 100644 --- a/benchmarks/ssr/scenarios/server-fn-transport/vue/speed.bench.ts +++ b/benchmarks/ssr/scenarios/server-fn-transport/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnTransportScenario, runServerFnMultipartRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnTransportBench(handler) await assertServerFnTransportScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn multipart (vue)', - () => runServerFnMultipartRequestLoop(handler, context), - serverFnTransportBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn multipart (vue)', async () => + runServerFnMultipartRequestLoop(handler, context), + ).run(serverFnTransportBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fn-transport/vue/speed.server-fn-raw-response.bench.ts b/benchmarks/ssr/scenarios/server-fn-transport/vue/speed.server-fn-raw-response.bench.ts index 36e1b9ed22..2eeb9a4f6b 100644 --- a/benchmarks/ssr/scenarios/server-fn-transport/vue/speed.server-fn-raw-response.bench.ts +++ b/benchmarks/ssr/scenarios/server-fn-transport/vue/speed.server-fn-raw-response.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnTransportScenario, runServerFnRawResponseRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnTransportBench(handler) await assertServerFnTransportScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn raw-response (vue)', - () => runServerFnRawResponseRequestLoop(handler, context), - serverFnTransportBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn raw-response (vue)', async () => + runServerFnRawResponseRequestLoop(handler, context), + ).run(serverFnTransportBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fn-transport/vue/speed.server-fn-raw-stream.bench.ts b/benchmarks/ssr/scenarios/server-fn-transport/vue/speed.server-fn-raw-stream.bench.ts index 4c9e5dc752..a73905004d 100644 --- a/benchmarks/ssr/scenarios/server-fn-transport/vue/speed.server-fn-raw-stream.bench.ts +++ b/benchmarks/ssr/scenarios/server-fn-transport/vue/speed.server-fn-raw-stream.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnTransportScenario, runServerFnRawStreamRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnTransportBench(handler) await assertServerFnTransportScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn raw-stream (vue)', - () => runServerFnRawStreamRequestLoop(handler, context), - serverFnTransportBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn raw-stream (vue)', async () => + runServerFnRawStreamRequestLoop(handler, context), + ).run(serverFnTransportBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/react/speed.bench.ts b/benchmarks/ssr/scenarios/server-fns/react/speed.bench.ts index 697bfe967a..c876772ad1 100644 --- a/benchmarks/ssr/scenarios/server-fns/react/speed.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnGetRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn GET (react)', - () => runServerFnGetRequestLoop(handler, context), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn GET (react)', async () => + runServerFnGetRequestLoop(handler, context), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-during-document-ssr.bench.ts b/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-during-document-ssr.bench.ts index 4b1c7c7d1e..6a0cb55f78 100644 --- a/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-during-document-ssr.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-during-document-ssr.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnDocumentSsrRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn during document ssr (react)', - () => runServerFnDocumentSsrRequestLoop(handler), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn during document ssr (react)', async () => + runServerFnDocumentSsrRequestLoop(handler), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-not-found.bench.ts b/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-not-found.bench.ts index 1f600dd8cf..96f1160078 100644 --- a/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-not-found.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-not-found.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnNotFoundRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn not-found (react)', - () => runServerFnNotFoundRequestLoop(handler, context), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn not-found (react)', async () => + runServerFnNotFoundRequestLoop(handler, context), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-post.bench.ts b/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-post.bench.ts index 0b4b3e5d6c..e85d5debd3 100644 --- a/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-post.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-post.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnPostRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn POST (react)', - () => runServerFnPostRequestLoop(handler, context), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn POST (react)', async () => + runServerFnPostRequestLoop(handler, context), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-redirect.bench.ts b/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-redirect.bench.ts index d07b4ab583..5dae598549 100644 --- a/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-redirect.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-redirect.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnRedirectRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn redirect (react)', - () => runServerFnRedirectRequestLoop(handler, context), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn redirect (react)', async () => + runServerFnRedirectRequestLoop(handler, context), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-send-context.bench.ts b/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-send-context.bench.ts index 589e2ccaf3..40d6961206 100644 --- a/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-send-context.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/react/speed.server-fn-send-context.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnSendContextRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn send-context (react)', - () => runServerFnSendContextRequestLoop(handler, context), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn send-context (react)', async () => + runServerFnSendContextRequestLoop(handler, context), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/solid/speed.bench.ts b/benchmarks/ssr/scenarios/server-fns/solid/speed.bench.ts index 42e57c4ce2..f6bbdc9e73 100644 --- a/benchmarks/ssr/scenarios/server-fns/solid/speed.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnGetRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn GET (solid)', - () => runServerFnGetRequestLoop(handler, context), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn GET (solid)', async () => + runServerFnGetRequestLoop(handler, context), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-during-document-ssr.bench.ts b/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-during-document-ssr.bench.ts index 1cbe7ef20b..933f61b59c 100644 --- a/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-during-document-ssr.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-during-document-ssr.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnDocumentSsrRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn during document ssr (solid)', - () => runServerFnDocumentSsrRequestLoop(handler), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn during document ssr (solid)', async () => + runServerFnDocumentSsrRequestLoop(handler), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-not-found.bench.ts b/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-not-found.bench.ts index bd5cc10457..513b69f4ba 100644 --- a/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-not-found.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-not-found.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnNotFoundRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn not-found (solid)', - () => runServerFnNotFoundRequestLoop(handler, context), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn not-found (solid)', async () => + runServerFnNotFoundRequestLoop(handler, context), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-post.bench.ts b/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-post.bench.ts index d2cf977cfa..e2ce8ad9ee 100644 --- a/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-post.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-post.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnPostRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn POST (solid)', - () => runServerFnPostRequestLoop(handler, context), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn POST (solid)', async () => + runServerFnPostRequestLoop(handler, context), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-redirect.bench.ts b/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-redirect.bench.ts index 017ac79af0..14353f1290 100644 --- a/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-redirect.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-redirect.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnRedirectRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn redirect (solid)', - () => runServerFnRedirectRequestLoop(handler, context), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn redirect (solid)', async () => + runServerFnRedirectRequestLoop(handler, context), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-send-context.bench.ts b/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-send-context.bench.ts index a3d0a991d1..76d3a554bd 100644 --- a/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-send-context.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/solid/speed.server-fn-send-context.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnSendContextRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn send-context (solid)', - () => runServerFnSendContextRequestLoop(handler, context), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn send-context (solid)', async () => + runServerFnSendContextRequestLoop(handler, context), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/solid/src/routeTree.gen.ts b/benchmarks/ssr/scenarios/server-fns/solid/src/routeTree.gen.ts index 3db5e487b3..3d0bd34eaa 100644 --- a/benchmarks/ssr/scenarios/server-fns/solid/src/routeTree.gen.ts +++ b/benchmarks/ssr/scenarios/server-fns/solid/src/routeTree.gen.ts @@ -10,24 +10,24 @@ import { Route as rootRouteImport } from './routes/__root' import { Route as IndexRouteImport } from './routes/index' -import { Route as SsrCallIdRouteImport } from './routes/ssr-call.$id' import { Route as ApiFnUrlsRouteImport } from './routes/api.fn-urls' +import { Route as SsrCallIdRouteImport } from './routes/ssr-call.$id' const IndexRoute = IndexRouteImport.update({ id: '/', path: '/', getParentRoute: () => rootRouteImport, } as any) -const SsrCallIdRoute = SsrCallIdRouteImport.update({ - id: '/ssr-call/$id', - path: '/ssr-call/$id', - getParentRoute: () => rootRouteImport, -} as any) const ApiFnUrlsRoute = ApiFnUrlsRouteImport.update({ id: '/api/fn-urls', path: '/api/fn-urls', getParentRoute: () => rootRouteImport, } as any) +const SsrCallIdRoute = SsrCallIdRouteImport.update({ + id: '/ssr-call/$id', + path: '/ssr-call/$id', + getParentRoute: () => rootRouteImport, +} as any) export interface FileRoutesByFullPath { '/': typeof IndexRoute @@ -68,13 +68,6 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } - '/ssr-call/$id': { - id: '/ssr-call/$id' - path: '/ssr-call/$id' - fullPath: '/ssr-call/$id' - preLoaderRoute: typeof SsrCallIdRouteImport - parentRoute: typeof rootRouteImport - } '/api/fn-urls': { id: '/api/fn-urls' path: '/api/fn-urls' @@ -82,6 +75,13 @@ declare module '@tanstack/solid-router' { preLoaderRoute: typeof ApiFnUrlsRouteImport parentRoute: typeof rootRouteImport } + '/ssr-call/$id': { + id: '/ssr-call/$id' + path: '/ssr-call/$id' + fullPath: '/ssr-call/$id' + preLoaderRoute: typeof SsrCallIdRouteImport + parentRoute: typeof rootRouteImport + } } } diff --git a/benchmarks/ssr/scenarios/server-fns/vue/speed.bench.ts b/benchmarks/ssr/scenarios/server-fns/vue/speed.bench.ts index c4d94659d9..3f67c1a500 100644 --- a/benchmarks/ssr/scenarios/server-fns/vue/speed.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnGetRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn GET (vue)', - () => runServerFnGetRequestLoop(handler, context), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn GET (vue)', async () => + runServerFnGetRequestLoop(handler, context), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-during-document-ssr.bench.ts b/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-during-document-ssr.bench.ts index c6155bcead..56c9addca5 100644 --- a/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-during-document-ssr.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-during-document-ssr.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnDocumentSsrRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn during document ssr (vue)', - () => runServerFnDocumentSsrRequestLoop(handler), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn during document ssr (vue)', async () => + runServerFnDocumentSsrRequestLoop(handler), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-not-found.bench.ts b/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-not-found.bench.ts index dca17511b8..e9a6e31617 100644 --- a/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-not-found.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-not-found.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnNotFoundRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn not-found (vue)', - () => runServerFnNotFoundRequestLoop(handler, context), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn not-found (vue)', async () => + runServerFnNotFoundRequestLoop(handler, context), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-post.bench.ts b/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-post.bench.ts index 4c2166056a..df9312ccd1 100644 --- a/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-post.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-post.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnPostRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn POST (vue)', - () => runServerFnPostRequestLoop(handler, context), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn POST (vue)', async () => + runServerFnPostRequestLoop(handler, context), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-redirect.bench.ts b/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-redirect.bench.ts index 25741baa62..67c4611644 100644 --- a/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-redirect.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-redirect.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnRedirectRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn redirect (vue)', - () => runServerFnRedirectRequestLoop(handler, context), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn redirect (vue)', async () => + runServerFnRedirectRequestLoop(handler, context), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-send-context.bench.ts b/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-send-context.bench.ts index c1c2d581ba..6f51ef4bab 100644 --- a/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-send-context.bench.ts +++ b/benchmarks/ssr/scenarios/server-fns/vue/speed.server-fn-send-context.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerFnScenario, runServerFnSendContextRequestLoop, @@ -16,10 +16,8 @@ const context = await setupServerFnBench(handler) await assertServerFnScenario(handler, context) -describe('ssr', () => { - bench( - 'ssr server-fn send-context (vue)', - () => runServerFnSendContextRequestLoop(handler, context), - serverFnBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-fn send-context (vue)', async () => + runServerFnSendContextRequestLoop(handler, context), + ).run(serverFnBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-routes-middleware/react/speed.bench.ts b/benchmarks/ssr/scenarios/server-routes-middleware/react/speed.bench.ts index 8e96bc8e04..6331216522 100644 --- a/benchmarks/ssr/scenarios/server-routes-middleware/react/speed.bench.ts +++ b/benchmarks/ssr/scenarios/server-routes-middleware/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerRouteMiddlewareResponse, runServerRouteMiddlewareLoop, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertServerRouteMiddlewareResponse(handler) -describe('ssr', () => { - bench( - 'ssr server-route middleware (react)', - () => runServerRouteMiddlewareLoop(handler), - serverRouteMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-route middleware (react)', async () => + runServerRouteMiddlewareLoop(handler), + ).run(serverRouteMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-routes-middleware/solid/speed.bench.ts b/benchmarks/ssr/scenarios/server-routes-middleware/solid/speed.bench.ts index 7e6fac4bbe..77d58e7b19 100644 --- a/benchmarks/ssr/scenarios/server-routes-middleware/solid/speed.bench.ts +++ b/benchmarks/ssr/scenarios/server-routes-middleware/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerRouteMiddlewareResponse, runServerRouteMiddlewareLoop, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertServerRouteMiddlewareResponse(handler) -describe('ssr', () => { - bench( - 'ssr server-route middleware (solid)', - () => runServerRouteMiddlewareLoop(handler), - serverRouteMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-route middleware (solid)', async () => + runServerRouteMiddlewareLoop(handler), + ).run(serverRouteMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-routes-middleware/vue/speed.bench.ts b/benchmarks/ssr/scenarios/server-routes-middleware/vue/speed.bench.ts index e67ca0a420..3d03b9c1fa 100644 --- a/benchmarks/ssr/scenarios/server-routes-middleware/vue/speed.bench.ts +++ b/benchmarks/ssr/scenarios/server-routes-middleware/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerRouteMiddlewareResponse, runServerRouteMiddlewareLoop, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertServerRouteMiddlewareResponse(handler) -describe('ssr', () => { - bench( - 'ssr server-route middleware (vue)', - () => runServerRouteMiddlewareLoop(handler), - serverRouteMiddlewareBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-route middleware (vue)', async () => + runServerRouteMiddlewareLoop(handler), + ).run(serverRouteMiddlewareBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-routes/react/speed.bench.ts b/benchmarks/ssr/scenarios/server-routes/react/speed.bench.ts index 1bdb7946b2..631314148a 100644 --- a/benchmarks/ssr/scenarios/server-routes/react/speed.bench.ts +++ b/benchmarks/ssr/scenarios/server-routes/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerRouteResponse, runServerRouteLoop, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertServerRouteResponse(handler) -describe('ssr', () => { - bench( - 'ssr server-route (react)', - () => runServerRouteLoop(handler), - serverRouteBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-route (react)', async () => + runServerRouteLoop(handler), + ).run(serverRouteBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-routes/solid/speed.bench.ts b/benchmarks/ssr/scenarios/server-routes/solid/speed.bench.ts index ce3e1f8a21..4788d31854 100644 --- a/benchmarks/ssr/scenarios/server-routes/solid/speed.bench.ts +++ b/benchmarks/ssr/scenarios/server-routes/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerRouteResponse, runServerRouteLoop, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertServerRouteResponse(handler) -describe('ssr', () => { - bench( - 'ssr server-route (solid)', - () => runServerRouteLoop(handler), - serverRouteBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-route (solid)', async () => + runServerRouteLoop(handler), + ).run(serverRouteBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/server-routes/vue/speed.bench.ts b/benchmarks/ssr/scenarios/server-routes/vue/speed.bench.ts index f2b9e27acb..09c0bbe90b 100644 --- a/benchmarks/ssr/scenarios/server-routes/vue/speed.bench.ts +++ b/benchmarks/ssr/scenarios/server-routes/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertServerRouteResponse, runServerRouteLoop, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertServerRouteResponse(handler) -describe('ssr', () => { - bench( - 'ssr server-route (vue)', - () => runServerRouteLoop(handler), - serverRouteBenchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr server-route (vue)', async () => + runServerRouteLoop(handler), + ).run(serverRouteBenchOptions) }) diff --git a/benchmarks/ssr/scenarios/streaming/react/speed.bench.ts b/benchmarks/ssr/scenarios/streaming/react/speed.bench.ts index c1dbf38ae5..eb4c9dc1d6 100644 --- a/benchmarks/ssr/scenarios/streaming/react/speed.bench.ts +++ b/benchmarks/ssr/scenarios/streaming/react/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertStreamingSanity, benchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertStreamingSanity(handler) -describe('ssr', () => { - bench( - 'ssr streaming deferred (react)', - () => runStreamingLoop(handler), - benchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr streaming deferred (react)', async () => + runStreamingLoop(handler), + ).run(benchOptions) }) diff --git a/benchmarks/ssr/scenarios/streaming/solid/speed.bench.ts b/benchmarks/ssr/scenarios/streaming/solid/speed.bench.ts index 0828715220..19d5817d32 100644 --- a/benchmarks/ssr/scenarios/streaming/solid/speed.bench.ts +++ b/benchmarks/ssr/scenarios/streaming/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertStreamingSanity, benchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertStreamingSanity(handler) -describe('ssr', () => { - bench( - 'ssr streaming deferred (solid)', - () => runStreamingLoop(handler), - benchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr streaming deferred (solid)', async () => + runStreamingLoop(handler), + ).run(benchOptions) }) diff --git a/benchmarks/ssr/scenarios/streaming/vue/speed.bench.ts b/benchmarks/ssr/scenarios/streaming/vue/speed.bench.ts index a484f95d6a..42473fc694 100644 --- a/benchmarks/ssr/scenarios/streaming/vue/speed.bench.ts +++ b/benchmarks/ssr/scenarios/streaming/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { assertStreamingSanity, benchOptions, @@ -16,10 +16,8 @@ const { default: handler } = (await import( await assertStreamingSanity(handler) -describe('ssr', () => { - bench( - 'ssr streaming deferred (vue)', - () => runStreamingLoop(handler), - benchOptions, - ) +test('ssr', async ({ bench }) => { + await bench('ssr streaming deferred (vue)', async () => + runStreamingLoop(handler), + ).run(benchOptions) }) diff --git a/benchmarks/ssr/solid/speed.bench.ts b/benchmarks/ssr/solid/speed.bench.ts index 0c4317415d..2f72977612 100644 --- a/benchmarks/ssr/solid/speed.bench.ts +++ b/benchmarks/ssr/solid/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { runSsrRequestLoop } from '../bench-utils' import type { StartRequestHandler } from '../bench-utils' @@ -11,14 +11,12 @@ const { default: handler } = (await import( default: StartRequestHandler } -describe('ssr', () => { - bench( - 'ssr request loop (solid)', - () => runSsrRequestLoop(handler, { seed: benchmarkSeed }), - { - warmupIterations: 100, - time: 10_000, - throws: true, - }, - ) +test('ssr', async ({ bench }) => { + await bench('ssr request loop (solid)', async () => + runSsrRequestLoop(handler, { seed: benchmarkSeed }), + ).run({ + warmupIterations: 100, + time: 10_000, + throws: true, + }) }) diff --git a/benchmarks/ssr/vue/speed.bench.ts b/benchmarks/ssr/vue/speed.bench.ts index 849f042e3c..57b59e0504 100644 --- a/benchmarks/ssr/vue/speed.bench.ts +++ b/benchmarks/ssr/vue/speed.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { test } from 'vitest' import { runSsrRequestLoop } from '../bench-utils' import type { StartRequestHandler } from '../bench-utils' @@ -11,14 +11,12 @@ const { default: handler } = (await import( default: StartRequestHandler } -describe('ssr', () => { - bench( - 'ssr request loop (vue)', - () => runSsrRequestLoop(handler, { seed: benchmarkSeed }), - { - warmupIterations: 100, - time: 10_000, - throws: true, - }, - ) +test('ssr', async ({ bench }) => { + await bench('ssr request loop (vue)', async () => + runSsrRequestLoop(handler, { seed: benchmarkSeed }), + ).run({ + warmupIterations: 100, + time: 10_000, + throws: true, + }) }) diff --git a/docs/router/api/file-based-routing.md b/docs/router/api/file-based-routing.md index ad3e07fad7..7c94d484d1 100644 --- a/docs/router/api/file-based-routing.md +++ b/docs/router/api/file-based-routing.md @@ -188,7 +188,7 @@ By default, this value is set to `false`. ### `autoCodeSplitting` -This feature is only available if you are using the TanStack Router Bundler Plugin. +This feature is only available if you are using the TanStack Router Bundler Plugin with Vite, Rspack/Rsbuild or Webpack. With Esbuild, setting it to `true` is an error. This option is used to enable automatic code-splitting for non-critical route configuration items. See the "Automatic Code-Splitting" guide for more information. diff --git a/docs/router/guide/automatic-code-splitting.md b/docs/router/guide/automatic-code-splitting.md index be599845bc..859a19ff09 100644 --- a/docs/router/guide/automatic-code-splitting.md +++ b/docs/router/guide/automatic-code-splitting.md @@ -4,7 +4,7 @@ title: Automatic Code Splitting The automatic code splitting feature in TanStack Router allows you to optimize your application's bundle size by lazily loading route components and their associated data. This is particularly useful for large applications where you want to minimize the initial load time by only loading the necessary code for the current route. -To turn this feature on, simply set the `autoCodeSplitting` option to `true` in your bundler plugin configuration. This enables the router to automatically handle code splitting for your routes without requiring any additional setup. +To turn this feature on, simply set the `autoCodeSplitting` option to `true` in your bundler plugin configuration. This enables the router to automatically handle code splitting for your routes without requiring any additional setup. It is available with Vite, Rspack/Rsbuild and Webpack, not with Esbuild. ```ts // vite.config.ts diff --git a/docs/router/guide/external-data-loading.md b/docs/router/guide/external-data-loading.md index 664468752d..4ffb318686 100644 --- a/docs/router/guide/external-data-loading.md +++ b/docs/router/guide/external-data-loading.md @@ -6,7 +6,7 @@ title: External Data Loading > [!IMPORTANT] > This guide is geared towards external state management libraries and their integration with TanStack Router for data fetching, ssr, hydration/dehydration and streaming. If you haven't read the standard [Data Loading](./data-loading.md) guide, please do so first. -For a full-stack React application, follow [TanStack Query with Start](/start/latest/docs/framework/react/guide/tanstack-query) for request-scoped SSR, hydration, and mutation invalidation with a tested example. +Router can coordinate loaders and an existing API without Start. If you also want an integrated server runtime and typed server functions for your React application, follow [TanStack Query with Start](/start/latest/docs/framework/react/guide/tanstack-query) for request-scoped SSR, hydration, and mutation invalidation with a tested example. ## To **Store** or to **Coordinate**? diff --git a/docs/router/installation/with-esbuild.md b/docs/router/installation/with-esbuild.md index b5cad0622c..8ecd9b8d0a 100644 --- a/docs/router/installation/with-esbuild.md +++ b/docs/router/installation/with-esbuild.md @@ -25,7 +25,6 @@ export default { plugins: [ tanstackRouter({ target: 'react', - autoCodeSplitting: true, }), ], } @@ -50,10 +49,7 @@ const ctx = await esbuild.context({ format: 'esm', target: ['esnext'], sourcemap: true, - plugins: [ - solidPlugin(), - tanstackRouter({ target: 'solid', autoCodeSplitting: true }), - ], + plugins: [solidPlugin(), tanstackRouter({ target: 'solid' })], }) if (isDev) { @@ -72,6 +68,9 @@ Or, you can clone our [Quickstart Esbuild example](https://github.com/TanStack/r Now that you've added the plugin to your Esbuild configuration, you're all set to start using file-based routing with TanStack Router. +> [!NOTE] +> Automatic code splitting is not available with Esbuild: the plugin throws an error when `autoCodeSplitting` is `true`. Route generation works as usual. To split routes, use [manual code splitting](../guide/code-splitting.md) or another bundler. + ## Ignoring the generated route tree file If your project is configured to use a linter and/or formatter, you may want to ignore the generated route tree file. This file is managed by TanStack Router and therefore shouldn't be changed by your linter or formatter. diff --git a/docs/start/config.json b/docs/start/config.json index 8fa644fc1c..36af0e6e0d 100644 --- a/docs/start/config.json +++ b/docs/start/config.json @@ -36,6 +36,10 @@ { "label": "Migrate from Next.js", "to": "framework/react/migrate-from-next-js" + }, + { + "label": "Migrate from the Release Candidate", + "to": "framework/react/migrate-from-release-candidate" } ] }, @@ -53,6 +57,10 @@ { "label": "Build from Scratch", "to": "framework/solid/build-from-scratch" + }, + { + "label": "Migrate from the Release Candidate", + "to": "framework/solid/migrate-from-release-candidate" } ] } diff --git a/docs/start/framework/react/guide/authentication-overview.md b/docs/start/framework/react/guide/authentication-overview.md index a8ccd4bbb4..e80ba97f8c 100644 --- a/docs/start/framework/react/guide/authentication-overview.md +++ b/docs/start/framework/react/guide/authentication-overview.md @@ -116,7 +116,7 @@ Build your own authentication system using TanStack Start's server functions and - **Full Control**: Complete customization over authentication flow - **Server Primitives**: Sessions, OAuth, CSRF, rate limiting — see [Authentication Server Primitives](./authentication-server-primitives.md) -- **Session Management**: HTTP-only cookies via `setResponseHeader`, read with `getRequestHeader` +- **Session Management**: HTTP-only cookies written with `setCookie`, read with `getCookie` - **Type Safety**: End-to-end type safety for authentication state ### 🌐 Other Excellent Options diff --git a/docs/start/framework/react/guide/authentication-server-primitives.md b/docs/start/framework/react/guide/authentication-server-primitives.md index 4fbd7e9e22..103e9c4455 100644 --- a/docs/start/framework/react/guide/authentication-server-primitives.md +++ b/docs/start/framework/react/guide/authentication-server-primitives.md @@ -28,47 +28,39 @@ Whichever you choose, the cookie flags matter: ```ts // src/server/session.ts import { - getRequestHeader, - setResponseHeader, + deleteCookie, + getCookie, + setCookie, } from '@tanstack/react-start/server' const SESSION_COOKIE = '__Host-session' const ONE_DAY = 60 * 60 * 24 +const sessionCookieOptions = { + httpOnly: true, + secure: true, + sameSite: 'lax', + path: '/', +} as const + export function setSessionCookie(token: string) { - setResponseHeader( - 'Set-Cookie', - [ - `${SESSION_COOKIE}=${token}`, - `HttpOnly`, - `Secure`, - `SameSite=Lax`, - `Path=/`, - `Max-Age=${ONE_DAY}`, - ].join('; '), - ) + setCookie(SESSION_COOKIE, token, { + ...sessionCookieOptions, + maxAge: ONE_DAY, + }) } export function clearSessionCookie() { - setResponseHeader( - 'Set-Cookie', - `${SESSION_COOKIE}=; HttpOnly; Secure; SameSite=Lax; Path=/; Max-Age=0`, - ) + deleteCookie(SESSION_COOKIE, sessionCookieOptions) } export function readSessionToken(): string | null { - const header = getRequestHeader('cookie') - if (!header) return null - for (const part of header.split(/;\s*/)) { - // Split only on the FIRST '=' — signed/base64 values often contain '='. - const eq = part.indexOf('=') - if (eq === -1) continue - if (part.slice(0, eq) === SESSION_COOKIE) return part.slice(eq + 1) - } - return null + return getCookie(SESSION_COOKIE) ?? null } ``` +Write cookies with `setCookie` (or `appendResponseHeader('set-cookie', serialized)` for a cookie that a library already serialized). Do not use `setResponseHeader('Set-Cookie', ...)` for this: it replaces every cookie on the outgoing response, including cookies set by other middleware or returned by a handler. + | Flag | Why | | ---------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------ | | `HttpOnly` | JavaScript can't read the cookie. An XSS bug can't exfiltrate the session. | @@ -169,7 +161,7 @@ For OAuth authorization-code flow: // src/server/oauth.functions.ts import { createServerFn } from '@tanstack/react-start' import { redirect } from '@tanstack/react-router' -import { setResponseHeader } from '@tanstack/react-start/server' +import { setCookie } from '@tanstack/react-start/server' import crypto from 'node:crypto' const OAUTH_STATE_COOKIE = '__Host-oauth' @@ -190,10 +182,13 @@ export const startOAuth = createServerFn({ method: 'GET' }).handler( crypto.createHash('sha256').update(verifier).digest(), ) - setResponseHeader( - 'Set-Cookie', - `${OAUTH_STATE_COOKIE}=${signed({ state, verifier })}; HttpOnly; Secure; SameSite=Lax; Path=/; Max-Age=600`, - ) + setCookie(OAUTH_STATE_COOKIE, signed({ state, verifier }), { + httpOnly: true, + secure: true, + sameSite: 'lax', + path: '/', + maxAge: 600, + }) throw redirect({ href: diff --git a/docs/start/framework/react/guide/authentication.md b/docs/start/framework/react/guide/authentication.md index dd8adcebee..c77c681ee0 100644 --- a/docs/start/framework/react/guide/authentication.md +++ b/docs/start/framework/react/guide/authentication.md @@ -35,7 +35,7 @@ Authentication involves many considerations including password security, session - **Authentication**: Who is this user? (Login/logout) - **Authorization**: What can this user do? (Permissions/roles) -TanStack Start provides the tools for both through server functions, sessions, and route protection. +TanStack Start provides server functions, request and cookie utilities, and route protection. Session storage and authentication come from your application or a library you choose. > Protect the data/API boundary first. Any server function, server route, or other API endpoint that returns or mutates private data must authorize the request itself. `beforeLoad` is useful for route UX: it keeps users out of screens they cannot use and avoids triggering work that would fail anyway. It is not the security boundary for the data. See [Authentication Server Primitives](./authentication-server-primitives.md) for the server-side pattern. @@ -48,6 +48,7 @@ Server functions handle sensitive authentication logic securely on the server: ```tsx import { createServerFn } from '@tanstack/react-start' import { redirect } from '@tanstack/react-router' +import { getAppSession } from '~/utils/session' // Login server function export const loginFn = createServerFn({ method: 'POST' }) @@ -61,11 +62,9 @@ export const loginFn = createServerFn({ method: 'POST' }) } // Create session - const session = await useAppSession() - await session.update({ - userId: user.id, - email: user.email, - }) + const session = await getAppSession() + session.userId = user.id + await session.save() // Redirect to protected area throw redirect({ to: '/dashboard' }) @@ -73,16 +72,16 @@ export const loginFn = createServerFn({ method: 'POST' }) // Logout server function export const logoutFn = createServerFn({ method: 'POST' }).handler(async () => { - const session = await useAppSession() - await session.clear() + const session = await getAppSession() + session.destroy() throw redirect({ to: '/' }) }) // Get current user export const getCurrentUserFn = createServerFn({ method: 'GET' }).handler( async () => { - const session = await useAppSession() - const userId = session.data.userId + const session = await getAppSession() + const userId = session.userId if (!userId) { return null @@ -96,33 +95,53 @@ export const getCurrentUserFn = createServerFn({ method: 'GET' }).handler( ### 2. Session Management -TanStack Start provides secure HTTP-only cookie sessions: +Start does not provide a session API. This guide uses iron-session for encrypted cookie sessions. Start's cookie helpers connect it to server functions, server routes, and request middleware. + +For encrypted cookie sessions, install [iron-session](https://github.com/vvo/iron-session): + +```sh +pnpm add iron-session +``` + +This example uses iron-session 9's cookie adapter. Its Node runtime requires Node 22.13 or newer; check the library's runtime requirements for other deployment targets. ```tsx -// utils/session.ts -import { useSession } from '@tanstack/react-start/server' +// utils/session.ts — import only from server code +import { getIronSession } from 'iron-session' +import { getCookie, setCookie } from '@tanstack/react-start/server' type SessionData = { - userId?: string - email?: string - role?: string + userId: string + oauthState: string } -export function useAppSession() { - return useSession({ - // Session configuration - name: 'app-session', - password: process.env.SESSION_SECRET!, // At least 32 characters - // Optional: customize cookie settings - cookie: { - secure: process.env.NODE_ENV === 'production', - sameSite: 'lax', - httpOnly: true, +export function getAppSession(ttl = 7 * 24 * 60 * 60) { + const password = process.env.SESSION_SECRET + if (!password || password.length < 32) { + throw new Error('SESSION_SECRET must be at least 32 characters') + } + + return getIronSession( + { read: getCookie, write: setCookie }, + { + cookieName: 'app-session', + password, + ttl, + cookieOptions: { + secure: process.env.NODE_ENV === 'production', + sameSite: 'lax', + httpOnly: true, + path: '/', + }, }, - }) + ) } ``` +Read fields directly from the returned session, change them, then `await session.save()` before returning or redirecting. Missing or expired sessions have no user ID. `session.destroy()` removes the browser cookie. Keep one session object for the operation; another call to `getAppSession()` reads the incoming request again. For middleware, pass that object through request context when downstream code needs the same mutations. + +The `getAppSession` helper belongs to your application. Start does not cache sessions, choose expiration rules, or synchronize concurrent writes. Keep secrets and session objects in server code, and read request-specific configuration inside the active request. + ### 3. Authentication Context Load the current user in your root route's `beforeLoad` so the initial server render and child routes receive the same authentication state. `useServerFn` returns a callable function, not an object with `data`, `isLoading`, or `refetch`. You can call a server function directly from `beforeLoad`. @@ -254,8 +273,9 @@ export const registerFn = createServerFn({ method: 'POST' }) }) // Create session - const session = await useAppSession() - await session.update({ userId: user.id }) + const session = await getAppSession() + session.userId = user.id + await session.save() return { success: true, user: { id: user.id, email: user.email } } }) @@ -323,8 +343,9 @@ export const initiateOAuthFn = createServerFn({ method: 'POST' }) const state = generateRandomState() // Store state in session for CSRF protection - const session = await useAppSession() - await session.update({ oauthState: state }) + const session = await getAppSession() + session.oauthState = state + await session.save() // Generate OAuth URL const authUrl = generateOAuthUrl(provider, state) @@ -387,21 +408,9 @@ const hashedPassword = await bcrypt.hash(password, saltRounds) ### 2. Session Security -```tsx -// Use secure session configuration -export function useAppSession() { - return useSession({ - name: 'app-session', - password: process.env.SESSION_SECRET!, // 32+ characters - cookie: { - secure: process.env.NODE_ENV === 'production', // HTTPS only in production - sameSite: 'lax', // CSRF protection - httpOnly: true, // XSS protection - maxAge: 7 * 24 * 60 * 60, // 7 days - }, - }) -} -``` +Set the library's server-validated expiration as well as appropriate cookie attributes. In the iron-session example, `ttl` limits a sealed credential's lifetime from its latest save; saving again renews it. A numeric `cookieOptions.maxAge` controls browser retention. In iron-session 9, explicitly setting `maxAge: undefined` also disables seal expiry; omit the property to use the configured `ttl`. Use an application-validated timestamp or a server-side record if you also need an absolute lifetime that writes cannot extend. + +Use `httpOnly`, `sameSite`, and `path` deliberately, and require `secure: true` on HTTPS deployments. These cookie attributes complement server-side authorization and CSRF protections. Keep only the minimum session data and load current account permissions from their authoritative store. Logout removes a stateless cookie from the current browser; it cannot revoke a copy without server-side state. ### 3. Rate Limiting @@ -580,16 +589,14 @@ export const loginFn = createServerFn({ method: 'POST' }) ) .handler(async ({ data }) => { const user = await authenticateUser(data.email, data.password) - if (!user) return { error: 'Invalid credentials' } + if (!user) { + return { error: 'Invalid credentials' } + } - const session = await useAppSession() - await session.update( - { userId: user.id }, - { - // Extend session if remember me is checked - maxAge: data.rememberMe ? 30 * 24 * 60 * 60 : undefined, // 30 days vs session - }, - ) + const ttl = data.rememberMe ? 30 * 24 * 60 * 60 : 8 * 60 * 60 + const session = await getAppSession(ttl) + session.userId = user.id + await session.save() return { success: true } }) @@ -617,7 +624,6 @@ If you're migrating from client-side authentication (localStorage, context only) ### From Other Frameworks - **Next.js**: Replace API routes with server functions, migrate NextAuth sessions -- **Remix**: Convert loaders/actions to server functions, adapt session patterns - **SvelteKit**: Move form actions to server functions, update route protection ## Production Considerations diff --git a/docs/start/framework/react/guide/early-hints.md b/docs/start/framework/react/guide/early-hints.md index a5913952e6..2341215022 100644 --- a/docs/start/framework/react/guide/early-hints.md +++ b/docs/start/framework/react/guide/early-hints.md @@ -164,6 +164,7 @@ Static Early Hints are collected from the final Start manifest resolved for the - CDN URL rewrites are reflected in Early Hints. - `crossOrigin` returned from `transformAssets` is reflected in Early Hints. - JavaScript hints follow the client output format: `modulepreload` for module output, or `preload; as=script` for IIFE output. +- JavaScript hints carry `fetchpriority=low`, matching the generated HTML preload links, so they don't compete with render-blocking stylesheets. - Per-request transforms with `cache: false` are reflected in Early Hints for that request. - Inlined CSS assets are skipped when Start's [CSS inlining](./css-styling#inline-route-css-in-production) build option inlines them into the HTML. diff --git a/docs/start/framework/react/guide/environment-functions.md b/docs/start/framework/react/guide/environment-functions.md index f472a3a26a..94fbb52501 100644 --- a/docs/start/framework/react/guide/environment-functions.md +++ b/docs/start/framework/react/guide/environment-functions.md @@ -121,3 +121,37 @@ Environment functions are tree-shaken based on the environment for each bundle p Functions created using `createIsomorphicFn()` are tree-shaken. All codes inside `.client()` are not included in server bundle, and vice-versa. On the server, functions created using `createClientOnlyFn()` are replaced with a function that throws an `Error` on the server. The reverse is true for `createServerOnlyFn` functions on the client. + +## Troubleshooting + +### A loader works on refresh but throws during navigation + +If a loader throws `createServerOnlyFn() functions can only be called on the server!` after clicking a link, check whether it calls a server-only helper directly. Route loaders also run in the browser during client navigation. `createServerOnlyFn` guards a local function, it does not send a request to the server. + +Wrap the server work in `createServerFn` and call that function from the loader: + +```tsx +import { createFileRoute } from '@tanstack/react-router' +import { createServerFn, createServerOnlyFn } from '@tanstack/react-start' + +const readOnlyOnServer = createServerOnlyFn(() => 'Read on the server') +const readThroughRpc = createServerFn().handler(() => readOnlyOnServer()) + +export const Route = createFileRoute('/example')({ + loader: () => readThroughRpc(), +}) +``` + +The server function runs directly during SSR and makes a request to the server when called in the browser. Test both a direct page request and navigation from another route. A successful refresh alone does not exercise the browser loader. + +The [execution-boundary tests](https://github.com/TanStack/router/blob/main/e2e/react-start/basic/tests/environment-functions.spec.ts) include the failing direct call and the working server-function version. See [Server Functions](./server-functions.md) for validation and middleware when the function accepts user input. + +### Browser code throws `window is not defined` on the server + +This means browser-only code ran during server execution. Use the stack trace to find the first application or dependency module that reads `window`, `document`, or another browser API. + +For a browser-only component, render it inside `ClientOnly` from `@tanstack/react-router` with a useful fallback. The Start compiler removes its children from the server bundle, which lets the bundler remove imports used only by those children. The [ClientOnly example](https://github.com/TanStack/router/blob/main/e2e/react-start/basic/src/routes/client-only.tsx) covers a component that reads `window` at module scope, and its [tests](https://github.com/TanStack/router/blob/main/e2e/react-start/basic/tests/client-only.spec.ts) check the server fallback and hydrated content. + +A browser API used elsewhere, such as a route loader or server function, still needs the correct execution boundary. Move component side effects into an effect or event handler. For logic that needs different server and browser implementations, use `createIsomorphicFn` with both implementations. Wrapping a function in `createClientOnlyFn` does not defer its call until the browser, calling that wrapper on the server throws the client-only guard error instead. + +If the stack points into build tooling or the error persists in a minimal app with the correct boundary, include that app and the installed Start and bundler versions in a [bug report](https://github.com/TanStack/router/issues/new/choose). A compiler or dependency bug needs a reproducible fix, not a blanket change to rendering mode. diff --git a/docs/start/framework/react/guide/hosting.md b/docs/start/framework/react/guide/hosting.md index 5b4a8c2661..2d02f881b3 100644 --- a/docs/start/framework/react/guide/hosting.md +++ b/docs/start/framework/react/guide/hosting.md @@ -116,6 +116,32 @@ Deploy your application to Cloudflare Workers using their one-click deployment p A full TanStack Start example for Cloudflare Workers is available [here](https://github.com/TanStack/router/tree/main/examples/react/start-basic-cloudflare). +#### Deployment fails even though the Vite build succeeds + +If Wrangler reports a missing server entry or unresolved Start virtual modules, check whether your deployment command passes `--config wrangler.jsonc`. With the Cloudflare Vite plugin, that file is the build input. The plugin generates a deployment config with the built server entry and client assets, then writes `.wrangler/deploy/config.json` so Wrangler can find it. Forcing Wrangler to read the source config bypasses that redirect. + +Run these commands from the application directory to validate the generated deployment without publishing: + +```sh +pnpm run build +pnpm exec wrangler deploy --dry-run +``` + +Check that Wrangler reports the generated config under `dist`, rather than just the source `wrangler.jsonc`. Keep the source `main` set to `@tanstack/react-start/server-entry` or your custom server entry, and let the Vite plugin generate the deployment entry. Marking unresolved Start modules as external does not fix the missing build transformation. + +If your build and deployment run in separate jobs, preserve the build output and `.wrangler/deploy/config.json` with their relative paths, or explicitly pass the generated deployment config. Do not edit generated files to repair the source configuration. See Cloudflare's [generated configuration documentation](https://developers.cloudflare.com/workers/wrangler/configuration/#generated-configuration) for how Wrangler finds that output. + +For a named Cloudflare environment, select it when building. For example, if `env.staging` is defined in your source config: + +```sh +CLOUDFLARE_ENV=staging pnpm run build +pnpm exec wrangler deploy --dry-run +``` + +The plugin resolves the environment into the generated config. A later `wrangler deploy --env staging` does not select a different built environment. See [Cloudflare environments](https://developers.cloudflare.com/workers/vite-plugin/reference/cloudflare-environments/). + +The [Cloudflare fixture tests](https://github.com/TanStack/router/blob/main/e2e/react-start/basic-cloudflare/tests/app.spec.ts) exercise a generated-config dry run and preview the built app locally. A dry run validates packaging, it does not verify account permissions, a live domain, or deployed bindings. + ### Netlify ⭐ _Official Partner_ @@ -475,7 +501,7 @@ In your Appwrite project, navigate to the **Sites** page from the sidebar. Click 3. Confirm the build settings: - **Install command:** `npm install` - **Build command:** `npm run build` - - **Output directory:** `./dist` (if you're using Nitro v2 or v3, this should be `./.output`) + - **Output directory:** `./dist` (if you're using Nitro, this should be `./.output`) 4. Add any required **environment variables** 5. Click **Deploy** diff --git a/docs/start/framework/react/guide/import-protection.md b/docs/start/framework/react/guide/import-protection.md index 8bf47c729a..451d405f81 100644 --- a/docs/start/framework/react/guide/import-protection.md +++ b/docs/start/framework/react/guide/import-protection.md @@ -3,8 +3,6 @@ id: import-protection title: Import Protection --- -> **Experimental:** Import protection is experimental and subject to change. - Import protection prevents server-only code from leaking into client bundles and client-only code from leaking into server bundles. It runs inside TanStack Start and is enabled by default. ## How It Works diff --git a/docs/start/framework/react/guide/path-aliases.md b/docs/start/framework/react/guide/path-aliases.md index ff9735df83..bd75dc01ed 100644 --- a/docs/start/framework/react/guide/path-aliases.md +++ b/docs/start/framework/react/guide/path-aliases.md @@ -26,9 +26,7 @@ After updating your `tsconfig.json` file, configure your build tool so it resolv # Vite -## Vite 8 - -Vite 8+ has [built-in support for path aliases](https://vite.dev/config/shared-options#resolve-tsconfigpaths), which is disabled by default. To enable it, simply add the following configuration to your `vite.config.ts` file: +Vite has [built-in support for path aliases](https://vite.dev/config/shared-options#resolve-tsconfigpaths), which is disabled by default. To enable it, add the following configuration to your `vite.config.ts` file: ```ts // vite.config.ts @@ -42,31 +40,6 @@ export default defineConfig({ }) ``` -## Vite 7 and earlier - -For Vite 7 and earlier, install the `vite-tsconfig-paths` plugin to enable path aliases in your TanStack Start project. You can do this by running the following command: - -```sh -npm install -D vite-tsconfig-paths -``` - -Now, you'll need to update your `vite.config.ts` file to include the following: - -```ts -// vite.config.ts -import { defineConfig } from 'vite' -import viteTsConfigPaths from 'vite-tsconfig-paths' - -export default defineConfig({ - plugins: [ - // this is the plugin that enables path aliases - viteTsConfigPaths({ - projects: ['./tsconfig.json'], - }), - ], -}) -``` - # Rsbuild Rsbuild reads the `paths` field from `tsconfig.json` by default. No extra config is needed when your aliases live in the root `tsconfig.json`. diff --git a/docs/start/framework/react/guide/rendering-markdown.md b/docs/start/framework/react/guide/rendering-markdown.md index 4258d6f4f1..bf644124d9 100644 --- a/docs/start/framework/react/guide/rendering-markdown.md +++ b/docs/start/framework/react/guide/rendering-markdown.md @@ -3,191 +3,85 @@ id: rendering-markdown title: Rendering Markdown --- -This guide covers two methods for importing and rendering markdown content in your TanStack Start application: +Use [TanStack Markdown](https://tanstack.com/markdown/latest/docs/overview) to render Markdown in your TanStack Start application. Its React renderer works synchronously during server rendering and client navigation, so content does not need to wait for a client effect. -1. **Static markdown** with `content-collections` for build-time loading (e.g., blog posts) -2. **Dynamic markdown** fetched at runtime from GitHub or any remote source +This guide covers static posts loaded with Content Collections and remote content fetched through a server function. Both use the same Markdown component. -Both methods share a common rendering pipeline using the `unified` ecosystem. +## Rendering Markdown -## Setting Up the Markdown Processor - -Both approaches use the same markdown-to-HTML processing pipeline. First, install the required dependencies: +Install TanStack Markdown: ```bash -npm install unified remark-parse remark-gfm remark-rehype rehype-raw rehype-slug rehype-autolink-headings rehype-stringify shiki html-react-parser gray-matter +npm install @tanstack/markdown ``` -Create a markdown processor utility: - -```tsx -// src/utils/markdown.ts -import { unified } from 'unified' -import remarkParse from 'remark-parse' -import remarkGfm from 'remark-gfm' -import remarkRehype from 'remark-rehype' -import rehypeRaw from 'rehype-raw' -import rehypeSlug from 'rehype-slug' -import rehypeAutolinkHeadings from 'rehype-autolink-headings' -import rehypeStringify from 'rehype-stringify' - -export type MarkdownHeading = { - id: string - text: string - level: number -} - -export type MarkdownResult = { - markup: string - headings: Array -} - -export async function renderMarkdown(content: string): Promise { - const headings: Array = [] - - const result = await unified() - .use(remarkParse) // Parse markdown - .use(remarkGfm) // Support GitHub Flavored Markdown - .use(remarkRehype, { allowDangerousHtml: true }) // Convert to HTML AST - .use(rehypeRaw) // Process raw HTML in markdown - .use(rehypeSlug) // Add IDs to headings - .use(rehypeAutolinkHeadings, { - behavior: 'wrap', - properties: { className: ['anchor'] }, - }) - .use(() => (tree) => { - // Extract headings for table of contents - const { visit } = require('unist-util-visit') - const { toString } = require('hast-util-to-string') - - visit(tree, 'element', (node: any) => { - if (['h1', 'h2', 'h3', 'h4', 'h5', 'h6'].includes(node.tagName)) { - headings.push({ - id: node.properties?.id || '', - text: toString(node), - level: parseInt(node.tagName.charAt(1), 10), - }) - } - }) - }) - .use(rehypeStringify) // Serialize to HTML string - .process(content) - - return { - markup: String(result), - headings, - } -} -``` - -## Creating a Markdown Component - -Create a React component that renders the processed HTML with custom element handling: +Create a shared component that accepts either Markdown source or a parsed document: ```tsx // src/components/Markdown.tsx -import parse, { type HTMLReactParserOptions, Element } from 'html-react-parser' -import { renderMarkdown, type MarkdownResult } from '~/utils/markdown' +import { Markdown as ReactMarkdown } from '@tanstack/markdown/react' +import type { MarkdownDocument } from '@tanstack/markdown' type MarkdownProps = { - content: string + content: string | MarkdownDocument className?: string } export function Markdown({ content, className }: MarkdownProps) { - const [result, setResult] = useState(null) - - useEffect(() => { - renderMarkdown(content).then(setResult) - }, [content]) - - if (!result) { - return
Loading...
- } - - const options: HTMLReactParserOptions = { - replace: (domNode) => { - if (domNode instanceof Element) { - // Customize rendering of specific elements - if (domNode.name === 'a') { - // Handle links - const href = domNode.attribs.href - if (href?.startsWith('/')) { - // Internal link - use your router's Link component - return ( - {domToReact(domNode.children, options)} - ) - } - } - - if (domNode.name === 'img') { - // Add lazy loading to images - return ( - - ) - } - } - }, - } - - return
{parse(result.markup, options)}
+ return ( +
+ {content} +
+ ) } ``` -## Method 1: Static Markdown with content-collections +Headings receive stable IDs, and `headingAnchors` adds links to them. Raw HTML is escaped and unsafe URL protocols are removed by default. Keep these defaults for remote or user-written content. TanStack Markdown does not execute MDX or implement every CommonMark or GFM feature, so check the [supported syntax](https://tanstack.com/markdown/latest/docs/core-concepts/syntax-profile) when migrating existing content. -The `content-collections` package is ideal for static content like blog posts that are included in your repository. It processes markdown files at build time and provides type-safe access to the content. - -### Installation - -```bash -npm install @content-collections/core @content-collections/vite -``` - -### Configuration - -Create a `content-collections.ts` file in your project root: +Use the `components` prop to customize elements, for example to lazy-load images: ```tsx + , + }} +> + {content} + +``` + +The examples below use `~/*` for the `src/*` import alias. The `prose` class is optional and requires your own typography styles, such as Tailwind Typography. + +## Static Markdown with Content Collections + +[Content Collections](https://www.content-collections.dev/docs/quickstart/tanstack-start) loads local Markdown files and validates their frontmatter. Pass the Markdown body from the generated collection to the shared renderer. + +### Installation and Configuration + +```bash +npm install -D @content-collections/core @content-collections/vite zod +``` + +```ts // content-collections.ts import { defineCollection, defineConfig } from '@content-collections/core' -import matter from 'gray-matter' - -function extractFrontMatter(content: string) { - const { data, content: body, excerpt } = matter(content, { excerpt: true }) - return { data, body, excerpt: excerpt || '' } -} +import { z } from 'zod' const posts = defineCollection({ name: 'posts', - directory: './src/blog', // Directory containing your .md files + directory: './src/blog', include: '*.md', - schema: (z) => ({ + schema: z.object({ title: z.string(), - published: z.string().date(), - description: z.string().optional(), - authors: z.string().array(), + published: z.string().regex(/^\d{4}-\d{2}-\d{2}$/), + description: z.string(), + authors: z.array(z.string()), + content: z.string(), + }), + transform: (post) => ({ + ...post, + slug: post._meta.path, }), - transform: ({ content, ...post }) => { - const frontMatter = extractFrontMatter(content) - - // Extract header image (first image in the document) - const headerImageMatch = content.match(/!\[([^\]]*)\]\(([^)]+)\)/) - const headerImage = headerImageMatch ? headerImageMatch[2] : undefined - - return { - ...post, - slug: post._meta.path, - excerpt: frontMatter.excerpt, - description: frontMatter.data.description, - headerImage, - content: frontMatter.body, - } - }, }) export default defineConfig({ @@ -195,39 +89,55 @@ export default defineConfig({ }) ``` -### Vite Integration +Content Collections already separates frontmatter from `content`, so this transform does not need a second frontmatter parser. -Add the content-collections plugin to your Vite config: +Add the plugin to your existing Vite configuration, keeping any deployment plugins your app needs: -```tsx -// app.config.ts -import { defineConfig } from '@tanstack/react-start/config' +```ts +// vite.config.ts import contentCollections from '@content-collections/vite' +import { tanstackStart } from '@tanstack/react-start/plugin/vite' +import viteReact from '@vitejs/plugin-react' +import { defineConfig } from 'vite' +import tsConfigPaths from 'vite-tsconfig-paths' export default defineConfig({ - vite: { - plugins: [contentCollections()], - }, + plugins: [ + contentCollections(), + tsConfigPaths({ projects: ['./tsconfig.json'] }), + tanstackStart(), + viteReact(), + ], }) ``` -### Creating Blog Posts +Add the generated collection alias to your existing `tsconfig.json`: -Create markdown files in your designated directory: +```json +{ + "compilerOptions": { + "paths": { + "~/*": ["./src/*"], + "content-collections": ["./.content-collections/generated"] + } + } +} +``` + +Add `.content-collections` to `.gitignore`. Starting the Vite dev server or running a build generates the collection. + +### Creating a Post + +Create `src/blog/hello-world.md`: ````markdown -## - -title: Hello World -published: 2024-01-15 -authors: - -- Jane Doe - description: My first blog post - --- - -![Hero Image](/images/hero.jpg) +title: Hello World +published: '2026-01-15' +description: My first blog post +authors: + - Jane Doe +--- Welcome to my blog! This is my first post. @@ -240,13 +150,11 @@ console.log('Hello, world!') ``` ```` -### Using the Collection - -Access your posts through the generated collection: +### Listing Posts ```tsx // src/routes/blog.index.tsx -import { createFileRoute } from '@tanstack/react-router' +import { createFileRoute, Link } from '@tanstack/react-router' import { allPosts } from 'content-collections' export const Route = createFileRoute('/blog/')({ @@ -254,31 +162,30 @@ export const Route = createFileRoute('/blog/')({ }) function BlogIndex() { - // Posts are sorted by published date - const sortedPosts = allPosts.sort( - (a, b) => new Date(b.published).getTime() - new Date(a.published).getTime(), + const sortedPosts = [...allPosts].sort((a, b) => + b.published.localeCompare(a.published), ) return ( -
+

Blog

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

    {post.title}

    -

    {post.excerpt}

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

    {post.description}

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

{post.title}

-

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

-
+

{post.title}

+

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

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

{frontmatter.title}

- +

{title}

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

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

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

{Route.useLoaderData()}

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

{Route.useLoaderData()}

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

{formatTitle(title)}

+ +
+ ) +} diff --git a/e2e/react-start/css-modules/src/routeTree.gen.ts b/e2e/react-start/css-modules/src/routeTree.gen.ts index 822118990d..2789a3490a 100644 --- a/e2e/react-start/css-modules/src/routeTree.gen.ts +++ b/e2e/react-start/css-modules/src/routeTree.gen.ts @@ -10,6 +10,9 @@ import { Route as rootRouteImport } from './routes/__root' import { Route as IndexRouteImport } from './routes/index' +import { Route as AlphaRouteImport } from './routes/alpha' +import { Route as BetaRouteImport } from './routes/beta' +import { Route as GammaRouteImport } from './routes/gamma' import { Route as ModulesRouteImport } from './routes/modules' import { Route as QuotesRouteImport } from './routes/quotes' import { Route as SassMixinRouteImport } from './routes/sass-mixin' @@ -19,6 +22,21 @@ const IndexRoute = IndexRouteImport.update({ path: '/', getParentRoute: () => rootRouteImport, } as any) +const AlphaRoute = AlphaRouteImport.update({ + id: '/alpha', + path: '/alpha', + getParentRoute: () => rootRouteImport, +} as any) +const BetaRoute = BetaRouteImport.update({ + id: '/beta', + path: '/beta', + getParentRoute: () => rootRouteImport, +} as any) +const GammaRoute = GammaRouteImport.update({ + id: '/gamma', + path: '/gamma', + getParentRoute: () => rootRouteImport, +} as any) const ModulesRoute = ModulesRouteImport.update({ id: '/modules', path: '/modules', @@ -37,12 +55,18 @@ const SassMixinRoute = SassMixinRouteImport.update({ export interface FileRoutesByFullPath { '/': typeof IndexRoute + '/alpha': typeof AlphaRoute + '/beta': typeof BetaRoute + '/gamma': typeof GammaRoute '/modules': typeof ModulesRoute '/quotes': typeof QuotesRoute '/sass-mixin': typeof SassMixinRoute } export interface FileRoutesByTo { '/': typeof IndexRoute + '/alpha': typeof AlphaRoute + '/beta': typeof BetaRoute + '/gamma': typeof GammaRoute '/modules': typeof ModulesRoute '/quotes': typeof QuotesRoute '/sass-mixin': typeof SassMixinRoute @@ -50,20 +74,36 @@ export interface FileRoutesByTo { export interface FileRoutesById { __root__: typeof rootRouteImport '/': typeof IndexRoute + '/alpha': typeof AlphaRoute + '/beta': typeof BetaRoute + '/gamma': typeof GammaRoute '/modules': typeof ModulesRoute '/quotes': typeof QuotesRoute '/sass-mixin': typeof SassMixinRoute } export interface FileRouteTypes { fileRoutesByFullPath: FileRoutesByFullPath - fullPaths: '/' | '/modules' | '/quotes' | '/sass-mixin' + fullPaths: + '/' | '/alpha' | '/beta' | '/gamma' | '/modules' | '/quotes' | '/sass-mixin' fileRoutesByTo: FileRoutesByTo - to: '/' | '/modules' | '/quotes' | '/sass-mixin' - id: '__root__' | '/' | '/modules' | '/quotes' | '/sass-mixin' + to: + '/' | '/alpha' | '/beta' | '/gamma' | '/modules' | '/quotes' | '/sass-mixin' + id: + | '__root__' + | '/' + | '/alpha' + | '/beta' + | '/gamma' + | '/modules' + | '/quotes' + | '/sass-mixin' fileRoutesById: FileRoutesById } export interface RootRouteChildren { IndexRoute: typeof IndexRoute + AlphaRoute: typeof AlphaRoute + BetaRoute: typeof BetaRoute + GammaRoute: typeof GammaRoute ModulesRoute: typeof ModulesRoute QuotesRoute: typeof QuotesRoute SassMixinRoute: typeof SassMixinRoute @@ -78,6 +118,27 @@ declare module '@tanstack/react-router' { preLoaderRoute: typeof IndexRouteImport parentRoute: typeof rootRouteImport } + '/alpha': { + id: '/alpha' + path: '/alpha' + fullPath: '/alpha' + preLoaderRoute: typeof AlphaRouteImport + parentRoute: typeof rootRouteImport + } + '/beta': { + id: '/beta' + path: '/beta' + fullPath: '/beta' + preLoaderRoute: typeof BetaRouteImport + parentRoute: typeof rootRouteImport + } + '/gamma': { + id: '/gamma' + path: '/gamma' + fullPath: '/gamma' + preLoaderRoute: typeof GammaRouteImport + parentRoute: typeof rootRouteImport + } '/modules': { id: '/modules' path: '/modules' @@ -104,6 +165,9 @@ declare module '@tanstack/react-router' { const rootRouteChildren: RootRouteChildren = { IndexRoute: IndexRoute, + AlphaRoute: AlphaRoute, + BetaRoute: BetaRoute, + GammaRoute: GammaRoute, ModulesRoute: ModulesRoute, QuotesRoute: QuotesRoute, SassMixinRoute: SassMixinRoute, diff --git a/e2e/react-start/css-modules/src/routes/alpha.tsx b/e2e/react-start/css-modules/src/routes/alpha.tsx new file mode 100644 index 0000000000..e894cd758f --- /dev/null +++ b/e2e/react-start/css-modules/src/routes/alpha.tsx @@ -0,0 +1,13 @@ +import { createFileRoute } from '@tanstack/react-router' +import { Header } from '../components/Header' +import styles from '../styles/alpha.module.css' + +export const Route = createFileRoute('/alpha')({ component: Alpha }) + +function Alpha() { + return ( +
+
+
+ ) +} diff --git a/e2e/react-start/css-modules/src/routes/beta.tsx b/e2e/react-start/css-modules/src/routes/beta.tsx new file mode 100644 index 0000000000..4f139ac41a --- /dev/null +++ b/e2e/react-start/css-modules/src/routes/beta.tsx @@ -0,0 +1,13 @@ +import { createFileRoute } from '@tanstack/react-router' +import { Header } from '../components/Header' +import styles from '../styles/beta.module.css' + +export const Route = createFileRoute('/beta')({ component: Beta }) + +function Beta() { + return ( +
+
+
+ ) +} diff --git a/e2e/react-start/css-modules/src/routes/gamma.tsx b/e2e/react-start/css-modules/src/routes/gamma.tsx new file mode 100644 index 0000000000..a8e036b85f --- /dev/null +++ b/e2e/react-start/css-modules/src/routes/gamma.tsx @@ -0,0 +1,8 @@ +import { createFileRoute } from '@tanstack/react-router' +import { formatTitle } from '../utils/formatTitle' + +export const Route = createFileRoute('/gamma')({ component: Gamma }) + +function Gamma() { + return
{formatTitle('Gamma')}
+} diff --git a/e2e/react-start/css-modules/src/styles/alpha.module.css b/e2e/react-start/css-modules/src/styles/alpha.module.css new file mode 100644 index 0000000000..12a606a8d3 --- /dev/null +++ b/e2e/react-start/css-modules/src/styles/alpha.module.css @@ -0,0 +1,4 @@ +.page { + --repro-alpha: 1; + border: 4px solid #226844; +} diff --git a/e2e/react-start/css-modules/src/styles/beta.module.css b/e2e/react-start/css-modules/src/styles/beta.module.css new file mode 100644 index 0000000000..719686a76b --- /dev/null +++ b/e2e/react-start/css-modules/src/styles/beta.module.css @@ -0,0 +1,4 @@ +.page { + --repro-beta: 1; + border: 4px solid #ac344c; +} diff --git a/e2e/react-start/css-modules/src/utils/formatTitle.ts b/e2e/react-start/css-modules/src/utils/formatTitle.ts new file mode 100644 index 0000000000..d0325ac63e --- /dev/null +++ b/e2e/react-start/css-modules/src/utils/formatTitle.ts @@ -0,0 +1,3 @@ +export function formatTitle(title: string) { + return `${title} (repro-format-title)` +} diff --git a/e2e/react-start/css-modules/tests/shared-css.prod.spec.ts b/e2e/react-start/css-modules/tests/shared-css.prod.spec.ts new file mode 100644 index 0000000000..9a9595f819 --- /dev/null +++ b/e2e/react-start/css-modules/tests/shared-css.prod.spec.ts @@ -0,0 +1,94 @@ +import { expect } from '@playwright/test' +import { test } from '@tanstack/router-e2e-utils' +import type { Page } from '@playwright/test' + +test.skip( + process.env.VITE_CSS_CODE_SPLIT === 'false', + 'Route stylesheet isolation requires CSS code splitting', +) +test.use({ javaScriptEnabled: false }) + +async function getStylesheetContent(page: Page) { + const hrefs = await page + .locator('link[rel="stylesheet"]') + .evaluateAll((links: Array) => + links.map((link) => link.href), + ) + expect(hrefs.length).toBeGreaterThan(0) + const stylesheets = await Promise.all( + hrefs.map(async (href) => { + const response = await page.request.get(href) + expect(response.ok()).toBe(true) + return response.text() + }), + ) + return stylesheets.join('\n') +} + +for (const route of ['alpha', 'beta']) { + test(`${route} has complete and isolated CSS without JavaScript`, async ({ + page, + }) => { + await page.goto(`/${route}`) + + const header = page.getByTestId('shared-header') + await expect(header).toHaveCSS('display', 'grid') + await expect(header).toHaveCSS('height', '64px') + await expect(page.getByTestId('route-page')).toHaveCSS( + `--repro-${route}`, + '1', + ) + + const css = await getStylesheetContent(page) + expect(css).toContain('--repro-shared-header') + expect(css).toContain(`--repro-${route}`) + expect(css).not.toContain(`--repro-${route === 'alpha' ? 'beta' : 'alpha'}`) + }) +} + +function getScriptPreloadHrefs(html: string) { + return Array.from(html.matchAll(/]*>/g), (match) => match[0]) + .filter( + (tag) => + /\brel="modulepreload"/.test(tag) || + (/\brel="preload"/.test(tag) && /\bas="script"/.test(tag)), + ) + .map((tag) => tag.match(/\bhref="([^"]+)"/)?.[1]) + .filter((href): href is string => !!href) +} + +test('alpha preloads the shared header chunk and the chunk it depends on', async ({ + page, +}) => { + const response = await page.request.get('/alpha') + expect(response.ok()).toBe(true) + + const hrefs = getScriptPreloadHrefs(await response.text()) + expect(hrefs.length).toBeGreaterThan(0) + + const scripts = await Promise.all( + hrefs.map(async (href) => { + const script = await page.request.get(href) + expect(script.ok()).toBe(true) + return script.text() + }), + ) + + expect(scripts.some((code) => code.includes('shared-header'))).toBe(true) + expect(scripts.some((code) => code.includes('repro-format-title'))).toBe(true) +}) + +test('home does not load the shared header or route styles', async ({ + page, +}) => { + await page.goto('/') + await expect(page.getByTestId('global-styled')).toHaveCSS( + 'background-color', + 'rgb(59, 130, 246)', + ) + + const css = await getStylesheetContent(page) + expect(css).not.toContain('--repro-shared-header') + expect(css).not.toContain('--repro-alpha') + expect(css).not.toContain('--repro-beta') +}) diff --git a/e2e/react-start/css-modules/vite.config.ts b/e2e/react-start/css-modules/vite.config.ts index 9923ab3384..c9c27f7f9a 100644 --- a/e2e/react-start/css-modules/vite.config.ts +++ b/e2e/react-start/css-modules/vite.config.ts @@ -21,6 +21,7 @@ export default defineConfig(async () => { port: 3000, }, build: { + outDir: process.env.E2E_DIST_DIR ?? 'dist', cssCodeSplit, }, plugins: [ diff --git a/e2e/react-start/custom-basepath/package.json b/e2e/react-start/custom-basepath/package.json index 45d39c3bbf..e93949eea2 100644 --- a/e2e/react-start/custom-basepath/package.json +++ b/e2e/react-start/custom-basepath/package.json @@ -29,7 +29,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", "cross-env": "^10.0.0", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "tsx": "^4.20.3", "@typescript/native": "npm:typescript@^7.0.2", diff --git a/e2e/react-start/custom-server-rsbuild/package.json b/e2e/react-start/custom-server-rsbuild/package.json index de1a118d60..1c5b3af393 100644 --- a/e2e/react-start/custom-server-rsbuild/package.json +++ b/e2e/react-start/custom-server-rsbuild/package.json @@ -21,7 +21,7 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-react": "^2.0.0", "@tailwindcss/postcss": "^4.2.2", "@tanstack/router-e2e-utils": "workspace:^", @@ -30,7 +30,7 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "cross-env": "^10.0.0", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "tsx": "^4.20.3", "@typescript/native": "npm:typescript@^7.0.2", diff --git a/e2e/react-start/deferred-hydration/package.json b/e2e/react-start/deferred-hydration/package.json index b5a8a85a09..5a33407435 100644 --- a/e2e/react-start/deferred-hydration/package.json +++ b/e2e/react-start/deferred-hydration/package.json @@ -26,14 +26,14 @@ "react-dom": "^19.0.0" }, "devDependencies": { - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-react": "^2.0.0", "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" diff --git a/e2e/react-start/dev-ssr-styles/package.json b/e2e/react-start/dev-ssr-styles/package.json index f4dbafe633..a5300e836e 100644 --- a/e2e/react-start/dev-ssr-styles/package.json +++ b/e2e/react-start/dev-ssr-styles/package.json @@ -41,7 +41,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", "nitro": "^3.0.260903-beta", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/e2e/react-start/early-hints/package.json b/e2e/react-start/early-hints/package.json index f8a72a7aa7..1615b99430 100644 --- a/e2e/react-start/early-hints/package.json +++ b/e2e/react-start/early-hints/package.json @@ -27,7 +27,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", "node-forge": "^1.3.1", - "srvx": "0.11.15", + "srvx": "^1.0.0", "tsx": "4.20.3", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/react-start/early-hints/tests/early-hints-protocol.spec.ts b/e2e/react-start/early-hints/tests/early-hints-protocol.spec.ts index 661b988281..6d2d31d836 100644 --- a/e2e/react-start/early-hints/tests/early-hints-protocol.spec.ts +++ b/e2e/react-start/early-hints/tests/early-hints-protocol.spec.ts @@ -103,7 +103,9 @@ test.describe('Early Hints - HTTP/2 Protocol', () => { const response = await makeRequest(baseURL, '/') const link = earlyHintsLinkHeader(response) - expect(link).toMatch(/<[^>]+>;\s*rel=modulepreload;\s*as=script/) + expect(link).toMatch( + /<[^>]+>;\s*rel=modulepreload;\s*as=script;\s*fetchpriority=low/, + ) }) test('CSS module assets are included in early hints', async () => { @@ -145,7 +147,7 @@ test.describe('Early Hints - HTTP/2 Protocol', () => { const response = await makeRequest(baseURL, '/') const link = linkHeader(response.finalHeaders) - expect(link).toContain('rel=modulepreload; as=script') + expect(link).toContain('rel=modulepreload; as=script; fetchpriority=low') expect(link).toContain('; rel=preconnect') }) diff --git a/e2e/react-start/flamegraph-bench/package.json b/e2e/react-start/flamegraph-bench/package.json index 0b8aa4fa89..72410b13e1 100644 --- a/e2e/react-start/flamegraph-bench/package.json +++ b/e2e/react-start/flamegraph-bench/package.json @@ -14,7 +14,7 @@ "@tanstack/react-start": "workspace:*", "react": "^19.0.0", "react-dom": "^19.0.0", - "srvx": "^0.11.9" + "srvx": "^1.0.0" }, "devDependencies": { "@platformatic/flame": "latest", diff --git a/e2e/react-start/hmr/package.json b/e2e/react-start/hmr/package.json index 7a6dc23f76..76a5d86b1f 100644 --- a/e2e/react-start/hmr/package.json +++ b/e2e/react-start/hmr/package.json @@ -21,7 +21,7 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-react": "^2.0.0", "@tailwindcss/postcss": "^4.2.2", "@tailwindcss/vite": "^4.2.2", diff --git a/e2e/react-start/hmr/tests/app.spec.ts b/e2e/react-start/hmr/tests/app.spec.ts index eedb4eed98..645c9b06f3 100644 --- a/e2e/react-start/hmr/tests/app.spec.ts +++ b/e2e/react-start/hmr/tests/app.spec.ts @@ -932,6 +932,7 @@ test.describe('react-start hmr', () => { await waitForRouteModuleUpdate(page, '/child', 'Child Updated') }, ) + await waitForHydrationSafeReload(page, '/child', 'Child Updated') // Second edit: change child loader again while still on / await replaceRouteTextAndWait( diff --git a/e2e/react-start/import-protection-custom-config/package.json b/e2e/react-start/import-protection-custom-config/package.json index 59ac648651..c088eff106 100644 --- a/e2e/react-start/import-protection-custom-config/package.json +++ b/e2e/react-start/import-protection-custom-config/package.json @@ -25,7 +25,7 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" diff --git a/e2e/react-start/import-protection/package.json b/e2e/react-start/import-protection/package.json index 5459b84437..ad06ba41ea 100644 --- a/e2e/react-start/import-protection/package.json +++ b/e2e/react-start/import-protection/package.json @@ -22,14 +22,14 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-react": "^2.0.0", "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" diff --git a/e2e/react-start/import-protection/src/violations/cross-boundary-safe/session-util.ts b/e2e/react-start/import-protection/src/violations/cross-boundary-safe/session-util.ts index ab44237539..d74bc6430b 100644 --- a/e2e/react-start/import-protection/src/violations/cross-boundary-safe/session-util.ts +++ b/e2e/react-start/import-protection/src/violations/cross-boundary-safe/session-util.ts @@ -6,7 +6,7 @@ import { getRequest } from '@tanstack/react-start/server' // so the compiler should prune this import from the client bundle. // // This mirrors the real-world pattern of a session utility that wraps -// `useSession` from `@tanstack/react-start/server`. +// `getCookie` from `@tanstack/react-start/server`. export function getSessionData() { const req = getRequest() return { method: req.method } diff --git a/e2e/react-start/response-reconciliation/.gitignore b/e2e/react-start/response-reconciliation/.gitignore new file mode 100644 index 0000000000..16187ac1de --- /dev/null +++ b/e2e/react-start/response-reconciliation/.gitignore @@ -0,0 +1,24 @@ +node_modules +package-lock.json +yarn.lock + +.DS_Store +.cache +.tanstack +.env +.vercel +.output +/build/ +/api/ +/server/build +/public/build + +# Sentry Config File +.env.sentry-build-plugin +/test-results/ +/playwright-report/ +/blob-report/ +/playwright/.cache/ +/dist/ +/dist-*/ +/port-*.txt diff --git a/e2e/react-start/response-reconciliation/.prettierignore b/e2e/react-start/response-reconciliation/.prettierignore new file mode 100644 index 0000000000..40a96e8819 --- /dev/null +++ b/e2e/react-start/response-reconciliation/.prettierignore @@ -0,0 +1,4 @@ +**/build +**/public +pnpm-lock.yaml +routeTree.gen.ts diff --git a/e2e/react-start/response-reconciliation/package.json b/e2e/react-start/response-reconciliation/package.json new file mode 100644 index 0000000000..7ba0224962 --- /dev/null +++ b/e2e/react-start/response-reconciliation/package.json @@ -0,0 +1,84 @@ +{ + "name": "tanstack-react-start-e2e-response-reconciliation", + "private": true, + "sideEffects": false, + "type": "module", + "scripts": { + "dev": "pnpm dev:vite --port 3000", + "dev:e2e": "pnpm dev:vite", + "dev:vite": "vite dev", + "dev:rsbuild": "rsbuild dev", + "build": "pnpm build:vite", + "build:vite": "vite build && tsc --noEmit", + "build:rsbuild": "rsbuild build && tsc --noEmit", + "preview": "vite preview", + "start": "node server.js", + "test:e2e:local": "pnpm build && playwright test --project=chromium" + }, + "dependencies": { + "@tanstack/react-router": "workspace:*", + "@tanstack/react-start": "workspace:*", + "react": "^19.2.3", + "react-dom": "^19.2.3" + }, + "devDependencies": { + "@playwright/test": "^1.57.0", + "@rsbuild/core": "^2.3.1", + "@rsbuild/plugin-react": "^2.0.0", + "@tanstack/router-e2e-utils": "workspace:^", + "@types/node": "25.0.9", + "@types/react": "^19.2.8", + "@types/react-dom": "^19.2.3", + "@vitejs/plugin-react": "^6.0.1", + "srvx": "^1.0.0", + "typescript": "^6.0.2", + "vite": "^8.0.14" + }, + "nx": { + "targets": { + "test:e2e": { + "parallelism": false + }, + "test:e2e--vite-ssr": { + "parallelism": false + }, + "test:e2e--vite-ssr--custom-entry": { + "parallelism": false + }, + "test:e2e--rsbuild-ssr": { + "parallelism": false + }, + "test:e2e--rsbuild-ssr--custom-entry": { + "parallelism": false + } + }, + "metadata": { + "playwrightModes": [ + { + "toolchain": "vite", + "mode": "ssr" + }, + { + "toolchain": "vite", + "mode": "ssr", + "name": "custom-entry", + "env": { + "TSS_E2E_SERVER_ENTRY": "server-entry" + } + }, + { + "toolchain": "rsbuild", + "mode": "ssr" + }, + { + "toolchain": "rsbuild", + "mode": "ssr", + "name": "custom-entry", + "env": { + "TSS_E2E_SERVER_ENTRY": "server-entry" + } + } + ] + } + } +} diff --git a/e2e/react-start/response-reconciliation/playwright.config.ts b/e2e/react-start/response-reconciliation/playwright.config.ts new file mode 100644 index 0000000000..d4c9c58f43 --- /dev/null +++ b/e2e/react-start/response-reconciliation/playwright.config.ts @@ -0,0 +1,37 @@ +import { defineConfig, devices } from '@playwright/test' +import { appServerReady } from '@tanstack/router-e2e-utils' + +const toolchain = process.env.E2E_TOOLCHAIN ?? 'vite' +const distDir = process.env.E2E_DIST_DIR ?? 'dist' +const serverEntry = process.env.TSS_E2E_SERVER_ENTRY ?? '' + +export const PORT = Number(process.env.E2E_APP_PORT ?? 0) +const baseURL = `http://localhost:${PORT}` + +export default defineConfig({ + testDir: './tests', + workers: 1, + reporter: [['line']], + use: { + baseURL, + }, + webServer: { + command: `pnpm start`, + wait: appServerReady, + reuseExistingServer: false, + stdout: 'pipe', + env: { + PORT: String(PORT), + VITE_SERVER_PORT: String(PORT), + E2E_DIST_DIR: distDir, + E2E_TOOLCHAIN: toolchain, + TSS_E2E_SERVER_ENTRY: serverEntry, + }, + }, + projects: [ + { + name: 'chromium', + use: { ...devices['Desktop Chrome'] }, + }, + ], +}) diff --git a/e2e/react-start/response-reconciliation/rsbuild.config.ts b/e2e/react-start/response-reconciliation/rsbuild.config.ts new file mode 100644 index 0000000000..38f44ef9fb --- /dev/null +++ b/e2e/react-start/response-reconciliation/rsbuild.config.ts @@ -0,0 +1,20 @@ +import { defineConfig } from '@rsbuild/core' +import { pluginReact } from '@rsbuild/plugin-react' +import { tanstackStart } from '@tanstack/react-start/plugin/rsbuild' + +const serverEntry = process.env.TSS_E2E_SERVER_ENTRY +const outDir = process.env.E2E_DIST_DIR ?? 'dist' + +export default defineConfig({ + plugins: [ + pluginReact(), + tanstackStart({ + server: serverEntry ? { entry: serverEntry } : undefined, + }), + ], + output: { + distPath: { + root: outDir, + }, + }, +}) diff --git a/e2e/react-start/response-reconciliation/server.js b/e2e/react-start/response-reconciliation/server.js new file mode 100644 index 0000000000..324a462bec --- /dev/null +++ b/e2e/react-start/response-reconciliation/server.js @@ -0,0 +1,62 @@ +import fs from 'node:fs' +import path from 'node:path' +import { spawn } from 'node:child_process' +import { pathToFileURL } from 'node:url' + +const distDir = process.env.E2E_DIST_DIR || 'dist' + +function resolveDistClientDir() { + return path.resolve(distDir, 'client') +} + +function resolveDistServerEntryPath() { + if (process.env.TSS_E2E_SERVER_ENTRY) { + const customEntryPath = path.resolve( + distDir, + 'server', + `${process.env.TSS_E2E_SERVER_ENTRY}.js`, + ) + if (fs.existsSync(customEntryPath)) { + return customEntryPath + } + } + + const serverJsPath = path.resolve(distDir, 'server', 'server.js') + if (fs.existsSync(serverJsPath)) { + return serverJsPath + } + + const indexJsPath = path.resolve(distDir, 'server', 'index.js') + if (fs.existsSync(indexJsPath)) { + return indexJsPath + } + + return serverJsPath +} + +export function start() { + const child = spawn( + 'srvx', + ['--prod', '-s', resolveDistClientDir(), resolveDistServerEntryPath()], + { + stdio: 'inherit', + shell: process.platform === 'win32', + }, + ) + + child.on('exit', (code, signal) => { + if (signal) { + process.kill(process.pid, signal) + return + } + + process.exit(code ?? 0) + }) +} + +if ( + process.argv[1] && + import.meta.url === pathToFileURL(process.argv[1]).href +) { + start() +} diff --git a/e2e/react-start/response-reconciliation/src/components/DefaultCatchBoundary.tsx b/e2e/react-start/response-reconciliation/src/components/DefaultCatchBoundary.tsx new file mode 100644 index 0000000000..f3d691814f --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/components/DefaultCatchBoundary.tsx @@ -0,0 +1,20 @@ +import { ErrorComponent, Link, useRouter } from '@tanstack/react-router' +import type { ErrorComponentProps } from '@tanstack/react-router' + +export function DefaultCatchBoundary({ error }: ErrorComponentProps) { + const router = useRouter() + + return ( +
+ + + Home +
+ ) +} diff --git a/e2e/react-start/response-reconciliation/src/components/NotFound.tsx b/e2e/react-start/response-reconciliation/src/components/NotFound.tsx new file mode 100644 index 0000000000..0b720f0e37 --- /dev/null +++ b/e2e/react-start/response-reconciliation/src/components/NotFound.tsx @@ -0,0 +1,10 @@ +import { Link } from '@tanstack/react-router' + +export function NotFound({ children }: { children?: React.ReactNode }) { + return ( +
+ {children ||

The page you are looking for does not exist.

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

upstream

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

Response Reconciliation E2E

+

This app contains HTTP-level regression tests.

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

Server Functions

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

{data.message}

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

Streamed document

+ loading

}> + + {(value) =>

{value}

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

The page you are looking for does not exist.

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

Session Handling E2E

+

This app contains HTTP-level session tests.

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

External Session Server Functions

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

External Session SSR

+

{String(data.count)}

+
+ ) +} diff --git a/e2e/react-start/session-handling/src/session.ts b/e2e/react-start/session-handling/src/session.ts new file mode 100644 index 0000000000..f223c42cbd --- /dev/null +++ b/e2e/react-start/session-handling/src/session.ts @@ -0,0 +1,47 @@ +import { getIronSession } from 'iron-session' +import { getCookie, setCookie } from '@tanstack/react-start/server' + +// Fixed secrets and insecure cookies are only for this local HTTP test fixture. +export const sessionPassword = 'start-external-session-test-only-'.repeat(2) +export type SessionData = { + user?: string + token?: string + serverFn?: string + middleware?: string + notice?: string + ssrCount?: number +} + +export async function updateSessionData(data: SessionData, name?: string) { + const session = await readSession(name) + Object.assign(session, data) + await session.save() + return { data: { ...session } } +} + +export async function destroySession() { + const session = await readSession() + session.destroy() +} + +export function readSession(cookieName = 'app-session') { + return getIronSession( + { read: getCookie, write: setCookie }, + { + cookieName, + password: sessionPassword, + ttl: 3600, + chunk: true, + cookieOptions: { + secure: false, + httpOnly: true, + sameSite: 'lax', + path: '/', + }, + }, + ) +} + +export async function readJson(request: Request): Promise { + return request.json() +} diff --git a/e2e/react-start/session-handling/src/start.ts b/e2e/react-start/session-handling/src/start.ts new file mode 100644 index 0000000000..a9571afabb --- /dev/null +++ b/e2e/react-start/session-handling/src/start.ts @@ -0,0 +1,22 @@ +import { createMiddleware, createStart } from '@tanstack/react-start' +import { readSession } from './session' + +export const sessionMiddleware = createMiddleware().server( + async ({ next, request }) => { + const session = await readSession() + const scenario = request.headers.get('x-session-middleware') + if (scenario === 'before') { + session.middleware = 'before' + } + const result = await next({ context: { session } }) + if (scenario === 'after') { + session.middleware = 'after' + } + if (scenario) { + await session.save() + } + return result + }, +) + +export const startInstance = createStart(() => ({})) diff --git a/e2e/react-start/session-handling/src/styles/app.css b/e2e/react-start/session-handling/src/styles/app.css new file mode 100644 index 0000000000..a38fb439a6 --- /dev/null +++ b/e2e/react-start/session-handling/src/styles/app.css @@ -0,0 +1,12 @@ +html { + color-scheme: light dark; + font-family: system-ui, sans-serif; +} + +body { + margin: 0; +} + +main { + padding: 16px; +} diff --git a/e2e/react-start/session-handling/tests/session-handling.spec.ts b/e2e/react-start/session-handling/tests/session-handling.spec.ts new file mode 100644 index 0000000000..aaa975ccef --- /dev/null +++ b/e2e/react-start/session-handling/tests/session-handling.spec.ts @@ -0,0 +1,334 @@ +import { expect } from '@playwright/test' +import { test } from '@tanstack/router-e2e-utils' +import type { APIResponse, Page, Response } from '@playwright/test' + +async function setCookieValues(response: APIResponse | Response) { + return (await Promise.resolve(response.headersArray())) + .filter((item) => item.name.toLowerCase() === 'set-cookie') + .map((item) => item.value) +} + +function expectCookie(cookies: Array, name: string) { + expect(cookies.some((cookie) => cookie.startsWith(`${name}=`))).toBe(true) +} + +async function expectResult(page: Page, name: string, value: string) { + await expect( + page.getByTestId(`server-function-${name}-result`), + ).toContainText(value) +} + +async function visitFunctions(page: Page) { + await page.goto('/server-functions') + await expect(page.getByTestId('server-functions-hydrated')).toBeAttached() +} + +test.describe('iron-session in Start', () => { + test('does not write cookies on a read and persists committed mutations', async ({ + request, + }) => { + const initial = await request.get('/api/session') + expect(await initial.json()).toEqual({ data: {} }) + expect(await setCookieValues(initial)).toEqual([]) + + const update = await request.post('/api/session', { + data: { user: 'tanner' }, + }) + const cookies = await setCookieValues(update) + expectCookie(cookies, 'app-session') + expect(cookies[0]).toContain('HttpOnly') + expect(cookies[0]).toContain('SameSite=Lax') + expect(cookies[0]).toContain('Path=/') + + const read = await request.get('/api/session') + expect(await read.json()).toEqual({ data: { user: 'tanner' } }) + expect(await setCookieValues(read)).toEqual([]) + }) + + test('destroy logs out the cookie jar', async ({ request }) => { + await request.post('/api/session', { data: { user: 'clear-me' } }) + const clear = await request.post('/api/session-clear') + const cookies = await setCookieValues(clear) + expectCookie(cookies, 'app-session') + expect(cookies[0]).toContain('Max-Age=0') + expect(await (await request.get('/api/session')).json()).toEqual({ + data: {}, + }) + }) + + test('independent named sessions coexist', async ({ request }) => { + await request.post('/api/session', { data: { user: 'default-user' } }) + await request.post('/api/session-named?name=app-account', { + data: { user: 'account-user' }, + }) + expect(await (await request.get('/api/session')).json()).toEqual({ + data: { user: 'default-user' }, + }) + expect( + await (await request.get('/api/session-named?name=app-account')).json(), + ).toEqual({ data: { user: 'account-user' } }) + }) + + test('invalid input does not become authenticated session data', async ({ + request, + }) => { + const response = await request.get('/api/session', { + headers: { cookie: 'app-session=invalid' }, + }) + expect(await response.json()).toEqual({ data: {} }) + expect(await setCookieValues(response)).toEqual([]) + }) + + test('preserves library, helper, and returned cookies including Expires commas', async ({ + request, + }) => { + const response = await request.post('/api/session-helper-cookie', { + data: { user: 'coexists' }, + }) + const cookies = await setCookieValues(response) + expect(cookies).toHaveLength(4) + for (const name of [ + 'app-session', + 'helper-session', + 'returned-session', + 'returned-extra', + ]) { + expectCookie(cookies, name) + } + expect( + cookies.find((cookie) => cookie.startsWith('returned-session=')), + ).toContain('Expires=Tue, 01 Jan 2030 00:00:00 GMT') + expect(await (await request.get('/api/session')).json()).toEqual({ + data: { user: 'coexists' }, + }) + }) + + test('a notification is consumed once after its deletion is saved', async ({ + request, + }) => { + await request.post('/api/session-flash') + expect(await (await request.get('/api/session-flash')).json()).toEqual({ + notice: 'Saved successfully', + }) + expect(await (await request.get('/api/session-flash')).json()).toEqual({ + notice: null, + }) + }) + + test('session mutations survive a thrown Start redirect', async ({ + request, + }) => { + const response = await request.post('/api/session-redirect', { + maxRedirects: 0, + }) + expect(response.status()).toBe(303) + expect(response.headers().location).toBe('/api/session') + expectCookie(await setCookieValues(response), 'app-session') + expect(await (await request.get('/api/session')).json()).toEqual({ + data: { user: 'redirected' }, + }) + }) + + test('middleware shares the session object and commits changes after next', async ({ + request, + }) => { + const before = await request.get('/api/session-middleware', { + headers: { 'x-session-middleware': 'before' }, + }) + expect(await before.json()).toEqual({ data: { middleware: 'before' } }) + expectCookie(await setCookieValues(before), 'app-session') + const after = await request.get('/api/session-middleware', { + headers: { 'x-session-middleware': 'after' }, + }) + expect(await after.json()).toEqual({ data: { middleware: 'before' } }) + expect(await (await request.get('/api/session')).json()).toEqual({ + data: { middleware: 'after' }, + }) + }) +}) + +test.describe('iron-session cookie jar adapter', () => { + test('saves, reads, and destroys encrypted sessions using Start cookie helpers', async ({ + request, + }) => { + const saved = await request.post('/api/session-iron', { + data: { user: 'iron-user' }, + }) + expectCookie(await setCookieValues(saved), 'iron-session') + expect(await (await request.get('/api/session-iron')).json()).toEqual({ + data: { user: 'iron-user' }, + }) + await request.delete('/api/session-iron') + expect(await (await request.get('/api/session-iron')).json()).toEqual({ + data: {}, + }) + }) + + test('roundtrips chunked cookies and deletes obsolete chunks after shrinking', async ({ + request, + }) => { + const large = await request.post('/api/session-iron', { + data: { token: 'x'.repeat(5000) }, + }) + const cookies = await setCookieValues(large) + expectCookie(cookies, 'iron-session.0') + expectCookie(cookies, 'iron-session.1') + expect( + (await (await request.get('/api/session-iron')).json()).data.token, + ).toHaveLength(5000) + const small = await request.post('/api/session-iron', { + data: { token: 'tiny' }, + }) + const smallCookies = await setCookieValues(small) + expectCookie(smallCookies, 'iron-session') + expect( + smallCookies.some( + (cookie) => + cookie.startsWith('iron-session.1=') && /Max-Age=0/i.test(cookie), + ), + ).toBe(true) + expect( + (await (await request.get('/api/session-iron')).json()).data.token, + ).toBe('tiny') + }) +}) + +test.describe('Hono applications mounted in Start server routes', () => { + for (const [path, cookieName] of [ + ['session-hono', 'sid'], + ['session-hono-community', 'hono-community'], + ]) { + test(`${path} persists and clears sessions after Hono middleware completes`, async ({ + request, + }) => { + const saved = await request.post(`/api/${path}`, { + data: { user: 'hono-user' }, + }) + expect(saved.status()).toBe(200) + const cookies = await setCookieValues(saved) + expectCookie(cookies, cookieName!) + expectCookie(cookies, 'start-side') + if (path === 'session-hono') { + expectCookie(cookies, 'hono-extra') + } + expect((await (await request.get(`/api/${path}`)).json()).data.user).toBe( + 'hono-user', + ) + await request.delete(`/api/${path}`) + expect( + (await (await request.get(`/api/${path}`)).json()).data.user ?? null, + ).toBeNull() + }) + } + + test('Hono context-free signed cookie helpers work directly in Start', async ({ + request, + }) => { + const saved = await request.post('/api/session-hono-cookie', { + data: { user: 'signed-user' }, + }) + expectCookie(await setCookieValues(saved), 'hono-signed') + expectCookie(await setCookieValues(saved), 'start-side') + expect( + await (await request.get('/api/session-hono-cookie')).json(), + ).toEqual({ user: 'signed-user' }) + await request.delete('/api/session-hono-cookie') + expect( + await (await request.get('/api/session-hono-cookie')).json(), + ).toEqual({ user: null }) + }) +}) + +test.describe('document and server function sessions', () => { + test('SSR loader commits persist across browser reloads', async ({ + page, + }) => { + await page.goto('/ssr') + await expect(page.getByTestId('ssr-session-count')).toHaveText('1') + await page.reload() + await expect(page.getByTestId('ssr-session-count')).toHaveText('2') + }) + + test('server functions update, read, and clear the browser session', async ({ + page, + }) => { + await visitFunctions(page) + const responsePromise = page.waitForResponse((response) => + response.url().includes('/_serverFn/'), + ) + await page.getByTestId('server-function-update').click() + expectCookie(await setCookieValues(await responsePromise), 'app-session') + await expectResult(page, 'update', '"serverFn":"updated"') + await page.getByTestId('server-function-read').click() + await expectResult(page, 'read', '"serverFn":"updated"') + await page.getByTestId('server-function-clear').click() + await expectResult(page, 'clear', '"cleared":true') + await page.getByTestId('server-function-read').click() + await expectResult(page, 'read', '"data":{}') + }) + + test('server function redirects retain committed session data', async ({ + page, + }) => { + await visitFunctions(page) + await page.getByTestId('server-function-redirect').click() + await expect(page).toHaveURL(/\/ssr$/) + await expect(page.getByTestId('ssr-session-count')).toHaveText('1') + expect( + (await (await page.request.get('/api/session')).json()).data.serverFn, + ).toBe('redirected') + }) + + test.describe('expected server function error', () => { + test.use({ + whitelistErrors: [ + /Failed to load resource: the server responded with a status of 500/, + ], + }) + test('server function errors retain committed session data', async ({ + page, + }) => { + await visitFunctions(page) + await page.getByTestId('server-function-error').click() + await expectResult(page, 'error', 'Expected external session error') + expect( + (await (await page.request.get('/api/session')).json()).data.serverFn, + ).toBe('error-persisted') + }) + }) + + test('iron-session cookie jar works in browser-invoked server functions', async ({ + page, + }) => { + await visitFunctions(page) + await page.getByTestId('server-function-iron').click() + await expectResult(page, 'iron', 'iron-server-function') + expect( + (await (await page.request.get('/api/session-iron')).json()).data.user, + ).toBe('iron-server-function') + }) + + test('separate browser contexts retain independent sessions', async ({ + browser, + baseURL, + }) => { + const first = await browser.newContext({ baseURL }) + const second = await browser.newContext({ baseURL }) + try { + const firstPage = await first.newPage() + const secondPage = await second.newPage() + const [firstResponse, secondResponse] = await Promise.all([ + firstPage.goto('/ssr'), + secondPage.goto('/ssr'), + ]) + expect(firstResponse?.ok()).toBe(true) + expect(secondResponse?.ok()).toBe(true) + await firstPage.reload() + await expect(firstPage.getByTestId('ssr-session-count')).toHaveText('2') + await expect(secondPage.getByTestId('ssr-session-count')).toHaveText('1') + } finally { + await first.close() + await second.close() + } + }) +}) diff --git a/e2e/react-start/session-handling/tsconfig.json b/e2e/react-start/session-handling/tsconfig.json new file mode 100644 index 0000000000..c7a0597e4b --- /dev/null +++ b/e2e/react-start/session-handling/tsconfig.json @@ -0,0 +1,22 @@ +{ + "include": ["**/*.ts", "**/*.tsx"], + "compilerOptions": { + "strict": true, + "esModuleInterop": true, + "jsx": "react-jsx", + "module": "ESNext", + "moduleResolution": "Bundler", + "lib": ["DOM", "DOM.Iterable", "ES2022"], + "isolatedModules": true, + "resolveJsonModule": true, + "skipLibCheck": true, + "target": "ES2022", + "allowJs": true, + "forceConsistentCasingInFileNames": true, + "paths": { + "~/*": ["./src/*"] + }, + "noEmit": true, + "types": ["vite/client"] + } +} diff --git a/e2e/react-start/session-handling/vite.config.ts b/e2e/react-start/session-handling/vite.config.ts new file mode 100644 index 0000000000..ef9695579b --- /dev/null +++ b/e2e/react-start/session-handling/vite.config.ts @@ -0,0 +1,13 @@ +import { defineConfig } from 'vite' +import { tanstackStart } from '@tanstack/react-start/plugin/vite' +import viteReact from '@vitejs/plugin-react' + +const outDir = process.env.E2E_DIST_DIR ?? 'dist' + +export default defineConfig({ + resolve: { tsconfigPaths: true }, + build: { + outDir, + }, + plugins: [tanstackStart(), viteReact()], +}) diff --git a/e2e/react-start/split-base-and-basepath/package.json b/e2e/react-start/split-base-and-basepath/package.json index 5a973cb1c4..7f0e62766c 100644 --- a/e2e/react-start/split-base-and-basepath/package.json +++ b/e2e/react-start/split-base-and-basepath/package.json @@ -26,7 +26,7 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" diff --git a/e2e/react-start/streaming-ssr/package.json b/e2e/react-start/streaming-ssr/package.json index d0e3757175..1d08a07622 100644 --- a/e2e/react-start/streaming-ssr/package.json +++ b/e2e/react-start/streaming-ssr/package.json @@ -28,7 +28,7 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" diff --git a/e2e/react-start/transform-asset-urls/package.json b/e2e/react-start/transform-asset-urls/package.json index 3bb8550995..e0a5ffec59 100644 --- a/e2e/react-start/transform-asset-urls/package.json +++ b/e2e/react-start/transform-asset-urls/package.json @@ -46,7 +46,7 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" diff --git a/e2e/react-start/virtual-routes/package.json b/e2e/react-start/virtual-routes/package.json index 0c44d745f8..c415d1845e 100644 --- a/e2e/react-start/virtual-routes/package.json +++ b/e2e/react-start/virtual-routes/package.json @@ -31,7 +31,7 @@ "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", "combinate": "^1.1.11", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/react-start/website/package.json b/e2e/react-start/website/package.json index 97f3e5bd11..1a5c3e1f4e 100644 --- a/e2e/react-start/website/package.json +++ b/e2e/react-start/website/package.json @@ -29,7 +29,7 @@ "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/solid-router/basic-esbuild-file-based/src/esbuild.config.js b/e2e/solid-router/basic-esbuild-file-based/src/esbuild.config.js index 2d6ea80c1b..68d31fe754 100644 --- a/e2e/solid-router/basic-esbuild-file-based/src/esbuild.config.js +++ b/e2e/solid-router/basic-esbuild-file-based/src/esbuild.config.js @@ -6,7 +6,6 @@ export default { plugins: [ tanstackRouter({ target: 'solid', - autoCodeSplitting: true, }), solidPlugin(), ], diff --git a/e2e/solid-router/basic-file-based/src/routeTree.gen.ts b/e2e/solid-router/basic-file-based/src/routeTree.gen.ts index c7cbb94b56..7601b581cc 100644 --- a/e2e/solid-router/basic-file-based/src/routeTree.gen.ts +++ b/e2e/solid-router/basic-file-based/src/routeTree.gen.ts @@ -1451,7 +1451,7 @@ declare module '@tanstack/solid-router' { '/(group)/_layout': { id: '/(group)/_layout' path: '' - fullPath: '' + fullPath: '/' preLoaderRoute: typeof groupLayoutRouteImport parentRoute: typeof rootRouteImport } diff --git a/e2e/solid-router/rspack-basic-file-based/package.json b/e2e/solid-router/rspack-basic-file-based/package.json index 020bcb9ff6..4015f0f606 100644 --- a/e2e/solid-router/rspack-basic-file-based/package.json +++ b/e2e/solid-router/rspack-basic-file-based/package.json @@ -17,7 +17,7 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-babel": "^1.1.2", "@rsbuild/plugin-solid": "^1.1.1", "@tailwindcss/postcss": "^4.2.2", diff --git a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/package.json b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/package.json index a89a44deb7..3772d7beb1 100644 --- a/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/package.json +++ b/e2e/solid-router/rspack-basic-virtual-named-export-config-file-based/package.json @@ -17,7 +17,7 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-babel": "^1.1.2", "@rsbuild/plugin-solid": "^1.1.1", "@tailwindcss/postcss": "^4.2.2", diff --git a/e2e/solid-start/basic-auth/package.json b/e2e/solid-start/basic-auth/package.json index b6853ca410..a95d6f73d1 100644 --- a/e2e/solid-start/basic-auth/package.json +++ b/e2e/solid-start/basic-auth/package.json @@ -19,6 +19,7 @@ "@tanstack/solid-router": "workspace:^", "@tanstack/solid-router-devtools": "workspace:^", "@tanstack/solid-start": "workspace:^", + "iron-session": "^9.0.1", "redaxios": "catalog:", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" @@ -30,7 +31,7 @@ "@types/node": "^22.10.2", "dotenv": "^17.2.3", "prisma": "^7.0.0", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/solid-start/basic-auth/src/routes/__root.tsx b/e2e/solid-start/basic-auth/src/routes/__root.tsx index 3a3392e922..8068b7a331 100644 --- a/e2e/solid-start/basic-auth/src/routes/__root.tsx +++ b/e2e/solid-start/basic-auth/src/routes/__root.tsx @@ -15,18 +15,18 @@ import { DefaultCatchBoundary } from '~/components/DefaultCatchBoundary.js' import { NotFound } from '~/components/NotFound.js' import appCss from '~/styles/app.css?url' import { seo } from '~/utils/seo.js' -import { useAppSession } from '~/utils/session.js' +import { getAppSession } from '~/utils/session.js' const fetchUser = createServerFn({ method: 'GET' }).handler(async () => { // We need to auth on the server so we have access to secure cookies - const session = await useAppSession() + const session = await getAppSession() - if (!session.data.userEmail) { + if (!session.userEmail) { return null } return { - email: session.data.userEmail, + email: session.userEmail, } }) diff --git a/e2e/solid-start/basic-auth/src/routes/_authed.tsx b/e2e/solid-start/basic-auth/src/routes/_authed.tsx index a42aac212a..e204d2e3a0 100644 --- a/e2e/solid-start/basic-auth/src/routes/_authed.tsx +++ b/e2e/solid-start/basic-auth/src/routes/_authed.tsx @@ -3,7 +3,7 @@ import { createServerFn } from '@tanstack/solid-start' import { hashPassword, prismaClient } from '~/utils/prisma' import { Login } from '~/components/Login' -import { useAppSession } from '~/utils/session' +import { getAppSession } from '~/utils/session' export const loginFn = createServerFn({ method: 'POST', @@ -37,12 +37,11 @@ export const loginFn = createServerFn({ } // Create a session - const session = await useAppSession() + const session = await getAppSession() // Store the user's email in the session - await session.update({ - userEmail: user.email, - }) + session.userEmail = user.email + await session.save() }) export const Route = createFileRoute('/_authed')({ diff --git a/e2e/solid-start/basic-auth/src/routes/logout.tsx b/e2e/solid-start/basic-auth/src/routes/logout.tsx index 85b1670a5f..5c69eb516d 100644 --- a/e2e/solid-start/basic-auth/src/routes/logout.tsx +++ b/e2e/solid-start/basic-auth/src/routes/logout.tsx @@ -1,12 +1,12 @@ import { redirect, createFileRoute } from '@tanstack/solid-router' import { createServerFn } from '@tanstack/solid-start' -import { useAppSession } from '~/utils/session' +import { getAppSession } from '~/utils/session' const logoutFn = createServerFn({ method: 'POST' }).handler(async () => { - const session = await useAppSession() + const session = await getAppSession() - session.clear() + session.destroy() throw redirect({ href: '/', diff --git a/e2e/solid-start/basic-auth/src/routes/signup.tsx b/e2e/solid-start/basic-auth/src/routes/signup.tsx index 2142574faa..155f816883 100644 --- a/e2e/solid-start/basic-auth/src/routes/signup.tsx +++ b/e2e/solid-start/basic-auth/src/routes/signup.tsx @@ -4,7 +4,7 @@ import { createServerFn, useServerFn } from '@tanstack/solid-start' import { hashPassword, prismaClient } from '~/utils/prisma' import { useMutation } from '~/hooks/useMutation' import { Auth } from '~/components/Auth' -import { useAppSession } from '~/utils/session' +import { getAppSession } from '~/utils/session' export const signupFn = createServerFn({ method: 'POST', @@ -24,7 +24,7 @@ export const signupFn = createServerFn({ const password = await hashPassword(payload.password) // Create a session - const session = await useAppSession() + const session = await getAppSession() if (found) { if (found.password !== password) { @@ -36,9 +36,8 @@ export const signupFn = createServerFn({ } // Store the user's email in the session - await session.update({ - userEmail: found.email, - }) + session.userEmail = found.email + await session.save() // Redirect to the prev page stored in the "redirect" search param throw redirect({ @@ -55,9 +54,8 @@ export const signupFn = createServerFn({ }) // Store the user's email in the session - await session.update({ - userEmail: user.email, - }) + session.userEmail = user.email + await session.save() // Redirect to the prev page stored in the "redirect" search param throw redirect({ diff --git a/e2e/solid-start/basic-auth/src/utils/session.ts b/e2e/solid-start/basic-auth/src/utils/session.ts index 6aac388545..728332d28f 100644 --- a/e2e/solid-start/basic-auth/src/utils/session.ts +++ b/e2e/solid-start/basic-auth/src/utils/session.ts @@ -1,13 +1,25 @@ -// src/services/session.server.ts -import { useSession } from '@tanstack/solid-start/server' +import { getIronSession } from 'iron-session' +import { getCookie, setCookie } from '@tanstack/solid-start/server' import type { User } from '~/prisma-generated/client' type SessionUser = { userEmail: User['email'] } -export function useAppSession() { - return useSession({ - password: 'ChangeThisBeforeShippingToProdOrYouWillBeFired', - }) +export function getAppSession() { + return getIronSession( + { read: getCookie, write: setCookie }, + { + cookieName: 'test-auth-session', + // This fixture only runs locally with test credentials. + password: 'local-e2e-only-session-password-at-least-32-characters', + ttl: 60 * 60, + cookieOptions: { + httpOnly: true, + secure: false, + sameSite: 'lax', + path: '/', + }, + }, + ) } diff --git a/e2e/solid-start/basic-solid-query/package.json b/e2e/solid-start/basic-solid-query/package.json index 167bc4a314..468a67877b 100644 --- a/e2e/solid-start/basic-solid-query/package.json +++ b/e2e/solid-start/basic-solid-query/package.json @@ -28,7 +28,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/solid-start/basic-tsr-config/package.json b/e2e/solid-start/basic-tsr-config/package.json index bb8ed5f7bc..8d720d5ce4 100644 --- a/e2e/solid-start/basic-tsr-config/package.json +++ b/e2e/solid-start/basic-tsr-config/package.json @@ -19,7 +19,7 @@ "devDependencies": { "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/e2e/solid-start/basic/package.json b/e2e/solid-start/basic/package.json index f6a814705d..e83ed11775 100644 --- a/e2e/solid-start/basic/package.json +++ b/e2e/solid-start/basic/package.json @@ -27,7 +27,7 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-babel": "^1.1.2", "@rsbuild/plugin-solid": "^1.1.1", "@tailwindcss/postcss": "^4.2.2", @@ -36,7 +36,7 @@ "@types/js-cookie": "^3.0.6", "@types/node": "^22.10.2", "combinate": "^1.1.11", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/solid-start/csp/package.json b/e2e/solid-start/csp/package.json index 46263c78ee..f233a87d67 100644 --- a/e2e/solid-start/csp/package.json +++ b/e2e/solid-start/csp/package.json @@ -19,7 +19,7 @@ "@playwright/test": "^1.61.0", "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/e2e/solid-start/css-modules/package.json b/e2e/solid-start/css-modules/package.json index 98bcb0a108..107659f43c 100644 --- a/e2e/solid-start/css-modules/package.json +++ b/e2e/solid-start/css-modules/package.json @@ -23,7 +23,7 @@ "@tanstack/router-e2e-utils": "workspace:*", "@types/node": "^22.10.2", "sass": "^1.97.2", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/e2e/solid-start/custom-basepath/package.json b/e2e/solid-start/custom-basepath/package.json index ccd5861e04..9113db133b 100644 --- a/e2e/solid-start/custom-basepath/package.json +++ b/e2e/solid-start/custom-basepath/package.json @@ -25,7 +25,7 @@ "@types/express": "^5.0.6", "@types/node": "^22.10.2", "cross-env": "^10.0.0", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "tsx": "^4.20.3", "@typescript/native": "npm:typescript@^7.0.2", diff --git a/e2e/solid-start/deferred-hydration/package.json b/e2e/solid-start/deferred-hydration/package.json index b1cb6cce3b..4e2a3a1665 100644 --- a/e2e/solid-start/deferred-hydration/package.json +++ b/e2e/solid-start/deferred-hydration/package.json @@ -23,12 +23,12 @@ "solid-js": "^1.9.10" }, "devDependencies": { - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-babel": "^1.1.2", "@rsbuild/plugin-solid": "^1.1.1", "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/e2e/solid-start/dev-ssr-styles/package.json b/e2e/solid-start/dev-ssr-styles/package.json index c1f8ee8a8f..6ca79c15c6 100644 --- a/e2e/solid-start/dev-ssr-styles/package.json +++ b/e2e/solid-start/dev-ssr-styles/package.json @@ -22,7 +22,7 @@ "@tanstack/router-core": "workspace:*", "@tanstack/router-e2e-utils": "workspace:*", "@types/node": "^22.10.2", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", "vite-plugin-solid": "^2.11.11", diff --git a/e2e/solid-start/scroll-restoration/package.json b/e2e/solid-start/scroll-restoration/package.json index 461a26f77c..8cb355490d 100644 --- a/e2e/solid-start/scroll-restoration/package.json +++ b/e2e/solid-start/scroll-restoration/package.json @@ -26,7 +26,7 @@ "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", "combinate": "^1.1.11", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/solid-start/selective-ssr/package.json b/e2e/solid-start/selective-ssr/package.json index 695f516172..8cb10e1780 100644 --- a/e2e/solid-start/selective-ssr/package.json +++ b/e2e/solid-start/selective-ssr/package.json @@ -20,7 +20,7 @@ "devDependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/router-e2e-utils": "workspace:^", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/solid-start/serialization-adapters/package.json b/e2e/solid-start/serialization-adapters/package.json index 8d950fb451..659944ac5f 100644 --- a/e2e/solid-start/serialization-adapters/package.json +++ b/e2e/solid-start/serialization-adapters/package.json @@ -22,7 +22,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/solid-start/server-functions/package.json b/e2e/solid-start/server-functions/package.json index 3667ccaf4b..ef8e6a4c5a 100644 --- a/e2e/solid-start/server-functions/package.json +++ b/e2e/solid-start/server-functions/package.json @@ -30,7 +30,7 @@ "@types/js-cookie": "^3.0.6", "@types/node": "^22.10.2", "combinate": "^1.1.11", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/solid-start/server-routes/package.json b/e2e/solid-start/server-routes/package.json index f10fc07c2b..0caf0cb795 100644 --- a/e2e/solid-start/server-routes/package.json +++ b/e2e/solid-start/server-routes/package.json @@ -30,7 +30,7 @@ "@types/js-cookie": "^3.0.6", "@types/node": "^22.10.2", "combinate": "^1.1.11", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/solid-start/start-manifest/package.json b/e2e/solid-start/start-manifest/package.json index beeb6ab258..a47d7475b5 100644 --- a/e2e/solid-start/start-manifest/package.json +++ b/e2e/solid-start/start-manifest/package.json @@ -18,7 +18,7 @@ "@playwright/test": "^1.61.0", "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/e2e/solid-start/streaming-ssr/package.json b/e2e/solid-start/streaming-ssr/package.json index 61c1fc99a4..135614e439 100644 --- a/e2e/solid-start/streaming-ssr/package.json +++ b/e2e/solid-start/streaming-ssr/package.json @@ -23,7 +23,7 @@ "@playwright/test": "^1.61.0", "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/e2e/solid-start/virtual-routes/package.json b/e2e/solid-start/virtual-routes/package.json index 1639f85394..7c7a12dbdb 100644 --- a/e2e/solid-start/virtual-routes/package.json +++ b/e2e/solid-start/virtual-routes/package.json @@ -27,7 +27,7 @@ "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", "combinate": "^1.1.11", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/solid-start/website/package.json b/e2e/solid-start/website/package.json index 22b223318b..4c4044d334 100644 --- a/e2e/solid-start/website/package.json +++ b/e2e/solid-start/website/package.json @@ -25,7 +25,7 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/vue-router/basic-esbuild-file-based/src/esbuild.config.js b/e2e/vue-router/basic-esbuild-file-based/src/esbuild.config.js index c4aba8798e..16f6fbca44 100644 --- a/e2e/vue-router/basic-esbuild-file-based/src/esbuild.config.js +++ b/e2e/vue-router/basic-esbuild-file-based/src/esbuild.config.js @@ -9,7 +9,6 @@ export default { }), tanstackRouter({ target: 'vue', - autoCodeSplitting: true, }), ], } diff --git a/e2e/vue-router/basic-file-based-jsx/src/routeTree.gen.ts b/e2e/vue-router/basic-file-based-jsx/src/routeTree.gen.ts index 3922025c82..5922c5f7b1 100644 --- a/e2e/vue-router/basic-file-based-jsx/src/routeTree.gen.ts +++ b/e2e/vue-router/basic-file-based-jsx/src/routeTree.gen.ts @@ -364,7 +364,7 @@ declare module '@tanstack/vue-router' { '/(group)/_layout': { id: '/(group)/_layout' path: '' - fullPath: '' + fullPath: '/' preLoaderRoute: typeof groupLayoutRouteImport parentRoute: typeof rootRouteImport } diff --git a/e2e/vue-router/basic-file-based-sfc/src/routeTree.gen.ts b/e2e/vue-router/basic-file-based-sfc/src/routeTree.gen.ts index 09d62b0706..0bfdddab3d 100644 --- a/e2e/vue-router/basic-file-based-sfc/src/routeTree.gen.ts +++ b/e2e/vue-router/basic-file-based-sfc/src/routeTree.gen.ts @@ -454,7 +454,7 @@ declare module '@tanstack/vue-router' { '/(group)/_layout': { id: '/(group)/_layout' path: '' - fullPath: '' + fullPath: '/' preLoaderRoute: typeof groupLayoutRouteImport parentRoute: typeof rootRouteImport } diff --git a/e2e/vue-router/rspack-basic-file-based/package.json b/e2e/vue-router/rspack-basic-file-based/package.json index b420125e51..93439f7d5b 100644 --- a/e2e/vue-router/rspack-basic-file-based/package.json +++ b/e2e/vue-router/rspack-basic-file-based/package.json @@ -17,7 +17,7 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-babel": "^1.1.2", "@rsbuild/plugin-vue": "^1.2.7", "@rsbuild/plugin-vue-jsx": "^2.0.0", diff --git a/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/package.json b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/package.json index f1259e5e7a..536435a09e 100644 --- a/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/package.json +++ b/e2e/vue-router/rspack-basic-virtual-named-export-config-file-based/package.json @@ -17,7 +17,7 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-babel": "^1.1.2", "@rsbuild/plugin-vue": "^1.2.7", "@rsbuild/plugin-vue-jsx": "^2.0.0", diff --git a/e2e/vue-start/basic-auth/package.json b/e2e/vue-start/basic-auth/package.json index a0b52a5af0..7f6fb798da 100644 --- a/e2e/vue-start/basic-auth/package.json +++ b/e2e/vue-start/basic-auth/package.json @@ -19,6 +19,7 @@ "@tanstack/vue-router": "workspace:^", "@tanstack/vue-router-devtools": "workspace:^", "@tanstack/vue-start": "workspace:^", + "iron-session": "^9.0.1", "redaxios": "catalog:", "tailwind-merge": "^3.6.0", "vue": "^3.5.25" @@ -32,7 +33,7 @@ "@vitejs/plugin-vue-jsx": "^5.1.5", "dotenv": "^17.2.3", "prisma": "^7.0.0", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/vue-start/basic-auth/src/routes/__root.tsx b/e2e/vue-start/basic-auth/src/routes/__root.tsx index f486bf4cb7..e5b6f6778f 100644 --- a/e2e/vue-start/basic-auth/src/routes/__root.tsx +++ b/e2e/vue-start/basic-auth/src/routes/__root.tsx @@ -16,18 +16,18 @@ import { DefaultCatchBoundary } from '~/components/DefaultCatchBoundary.js' import { NotFound } from '~/components/NotFound.js' import appCss from '~/styles/app.css?url' import { seo } from '~/utils/seo.js' -import { useAppSession } from '~/utils/session.js' +import { getAppSession } from '~/utils/session.js' const fetchUser = createServerFn({ method: 'GET' }).handler(async () => { // We need to auth on the server so we have access to secure cookies - const session = await useAppSession() + const session = await getAppSession() - if (!session.data.userEmail) { + if (!session.userEmail) { return null } return { - email: session.data.userEmail, + email: session.userEmail, } }) diff --git a/e2e/vue-start/basic-auth/src/routes/_authed.tsx b/e2e/vue-start/basic-auth/src/routes/_authed.tsx index ba88e3beac..606de3e487 100644 --- a/e2e/vue-start/basic-auth/src/routes/_authed.tsx +++ b/e2e/vue-start/basic-auth/src/routes/_authed.tsx @@ -3,7 +3,7 @@ import { createServerFn } from '@tanstack/vue-start' import { hashPassword, prismaClient } from '~/utils/prisma' import { Login } from '~/components/Login' -import { useAppSession } from '~/utils/session' +import { getAppSession } from '~/utils/session' export const loginFn = createServerFn({ method: 'POST', @@ -37,12 +37,11 @@ export const loginFn = createServerFn({ } // Create a session - const session = await useAppSession() + const session = await getAppSession() // Store the user's email in the session - await session.update({ - userEmail: user.email, - }) + session.userEmail = user.email + await session.save() }) export const Route = createFileRoute('/_authed')({ diff --git a/e2e/vue-start/basic-auth/src/routes/logout.tsx b/e2e/vue-start/basic-auth/src/routes/logout.tsx index f1d7b58e29..8372b33608 100644 --- a/e2e/vue-start/basic-auth/src/routes/logout.tsx +++ b/e2e/vue-start/basic-auth/src/routes/logout.tsx @@ -1,12 +1,12 @@ import { redirect, createFileRoute } from '@tanstack/vue-router' import { createServerFn } from '@tanstack/vue-start' -import { useAppSession } from '~/utils/session' +import { getAppSession } from '~/utils/session' const logoutFn = createServerFn({ method: 'POST' }).handler(async () => { - const session = await useAppSession() + const session = await getAppSession() - session.clear() + session.destroy() throw redirect({ href: '/', diff --git a/e2e/vue-start/basic-auth/src/routes/signup.tsx b/e2e/vue-start/basic-auth/src/routes/signup.tsx index eade8363e6..5f37f109c7 100644 --- a/e2e/vue-start/basic-auth/src/routes/signup.tsx +++ b/e2e/vue-start/basic-auth/src/routes/signup.tsx @@ -5,7 +5,7 @@ import { defineComponent } from 'vue' import { hashPassword, prismaClient } from '~/utils/prisma' import { useMutation } from '~/hooks/useMutation' import { Auth } from '~/components/Auth' -import { useAppSession } from '~/utils/session' +import { getAppSession } from '~/utils/session' export const signupFn = createServerFn({ method: 'POST', @@ -25,7 +25,7 @@ export const signupFn = createServerFn({ const password = await hashPassword(payload.password) // Create a session - const session = await useAppSession() + const session = await getAppSession() if (found) { if (found.password !== password) { @@ -37,9 +37,8 @@ export const signupFn = createServerFn({ } // Store the user's email in the session - await session.update({ - userEmail: found.email, - }) + session.userEmail = found.email + await session.save() // Redirect to the prev page stored in the "redirect" search param throw redirect({ @@ -56,9 +55,8 @@ export const signupFn = createServerFn({ }) // Store the user's email in the session - await session.update({ - userEmail: user.email, - }) + session.userEmail = user.email + await session.save() // Redirect to the prev page stored in the "redirect" search param throw redirect({ diff --git a/e2e/vue-start/basic-auth/src/utils/session.ts b/e2e/vue-start/basic-auth/src/utils/session.ts index 7cf2a41792..7d078225a0 100644 --- a/e2e/vue-start/basic-auth/src/utils/session.ts +++ b/e2e/vue-start/basic-auth/src/utils/session.ts @@ -1,13 +1,25 @@ -// src/services/session.server.ts -import { useSession } from '@tanstack/vue-start/server' +import { getIronSession } from 'iron-session' +import { getCookie, setCookie } from '@tanstack/vue-start/server' import type { User } from '~/prisma-generated/client' type SessionUser = { userEmail: User['email'] } -export function useAppSession() { - return useSession({ - password: 'ChangeThisBeforeShippingToProdOrYouWillBeFired', - }) +export function getAppSession() { + return getIronSession( + { read: getCookie, write: setCookie }, + { + cookieName: 'test-auth-session', + // This fixture only runs locally with test credentials. + password: 'local-e2e-only-session-password-at-least-32-characters', + ttl: 60 * 60, + cookieOptions: { + httpOnly: true, + secure: false, + sameSite: 'lax', + path: '/', + }, + }, + ) } diff --git a/e2e/vue-start/basic-tsr-config/package.json b/e2e/vue-start/basic-tsr-config/package.json index 6f50cc6314..828dce5b2a 100644 --- a/e2e/vue-start/basic-tsr-config/package.json +++ b/e2e/vue-start/basic-tsr-config/package.json @@ -19,7 +19,7 @@ "devDependencies": { "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "@vitejs/plugin-vue": "^6.0.5", diff --git a/e2e/vue-start/basic-vue-query/package.json b/e2e/vue-start/basic-vue-query/package.json index 09e60b66f7..ab9589376d 100644 --- a/e2e/vue-start/basic-vue-query/package.json +++ b/e2e/vue-start/basic-vue-query/package.json @@ -30,7 +30,7 @@ "@types/node": "^22.10.2", "@vitejs/plugin-vue": "^6.0.5", "@vitejs/plugin-vue-jsx": "^5.1.5", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/vue-start/basic/package.json b/e2e/vue-start/basic/package.json index c321586d1d..2ff8329543 100644 --- a/e2e/vue-start/basic/package.json +++ b/e2e/vue-start/basic/package.json @@ -27,7 +27,7 @@ }, "devDependencies": { "@playwright/test": "^1.61.0", - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-babel": "^1.1.2", "@rsbuild/plugin-vue": "^1.2.7", "@rsbuild/plugin-vue-jsx": "^2.0.0", @@ -39,7 +39,7 @@ "@vitejs/plugin-vue": "^6.0.5", "@vitejs/plugin-vue-jsx": "^5.1.5", "combinate": "^1.1.11", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/vue-start/css-modules/package.json b/e2e/vue-start/css-modules/package.json index 507264b72d..3671774644 100644 --- a/e2e/vue-start/css-modules/package.json +++ b/e2e/vue-start/css-modules/package.json @@ -24,7 +24,7 @@ "@types/node": "^22.10.2", "@vitejs/plugin-vue-jsx": "^5.1.5", "sass": "^1.97.2", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" diff --git a/e2e/vue-start/custom-basepath/package.json b/e2e/vue-start/custom-basepath/package.json index 5b8b98a8ce..c1032ea88b 100644 --- a/e2e/vue-start/custom-basepath/package.json +++ b/e2e/vue-start/custom-basepath/package.json @@ -25,7 +25,7 @@ "@types/express": "^5.0.6", "@types/node": "^22.10.2", "cross-env": "^10.0.0", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "tsx": "^4.20.3", "@typescript/native": "npm:typescript@^7.0.2", diff --git a/e2e/vue-start/dev-ssr-styles/package.json b/e2e/vue-start/dev-ssr-styles/package.json index 97aa695d5d..0033a0a5cc 100644 --- a/e2e/vue-start/dev-ssr-styles/package.json +++ b/e2e/vue-start/dev-ssr-styles/package.json @@ -24,7 +24,7 @@ "@types/node": "^22.10.2", "@vitejs/plugin-vue": "^6.0.5", "@vitejs/plugin-vue-jsx": "^5.1.5", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", "@typescript/native": "npm:typescript@^7.0.2" diff --git a/e2e/vue-start/scroll-restoration/package.json b/e2e/vue-start/scroll-restoration/package.json index 7024b2827e..025b0225be 100644 --- a/e2e/vue-start/scroll-restoration/package.json +++ b/e2e/vue-start/scroll-restoration/package.json @@ -28,7 +28,7 @@ "@vitejs/plugin-vue": "^6.0.5", "@vitejs/plugin-vue-jsx": "^5.1.5", "combinate": "^1.1.11", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/vue-start/selective-ssr/package.json b/e2e/vue-start/selective-ssr/package.json index 1da6f8de30..b555a01c26 100644 --- a/e2e/vue-start/selective-ssr/package.json +++ b/e2e/vue-start/selective-ssr/package.json @@ -22,7 +22,7 @@ "@tanstack/router-e2e-utils": "workspace:^", "@vitejs/plugin-vue": "^6.0.5", "@vitejs/plugin-vue-jsx": "^5.1.5", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/vue-start/serialization-adapters/package.json b/e2e/vue-start/serialization-adapters/package.json index 5434dd0e78..a056e21da3 100644 --- a/e2e/vue-start/serialization-adapters/package.json +++ b/e2e/vue-start/serialization-adapters/package.json @@ -23,7 +23,7 @@ "@tanstack/router-e2e-utils": "workspace:^", "@vitejs/plugin-vue": "^6.0.5", "@vitejs/plugin-vue-jsx": "^5.1.5", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/vue-start/server-functions/package.json b/e2e/vue-start/server-functions/package.json index deffebabd7..dd1a7a9c6b 100644 --- a/e2e/vue-start/server-functions/package.json +++ b/e2e/vue-start/server-functions/package.json @@ -32,7 +32,7 @@ "@vitejs/plugin-vue": "^6.0.5", "@vitejs/plugin-vue-jsx": "^5.1.5", "combinate": "^1.1.11", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/vue-start/server-routes/package.json b/e2e/vue-start/server-routes/package.json index 40d285d1d9..6a8e1babed 100644 --- a/e2e/vue-start/server-routes/package.json +++ b/e2e/vue-start/server-routes/package.json @@ -32,7 +32,7 @@ "@vitejs/plugin-vue": "^6.0.5", "@vitejs/plugin-vue-jsx": "^5.1.5", "combinate": "^1.1.11", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/vue-start/start-manifest/package.json b/e2e/vue-start/start-manifest/package.json index dbf889db71..ae682f7a9d 100644 --- a/e2e/vue-start/start-manifest/package.json +++ b/e2e/vue-start/start-manifest/package.json @@ -19,7 +19,7 @@ "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", "@vitejs/plugin-vue-jsx": "^5.1.5", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" diff --git a/e2e/vue-start/streaming-ssr/package.json b/e2e/vue-start/streaming-ssr/package.json index 42d311824e..382120860a 100644 --- a/e2e/vue-start/streaming-ssr/package.json +++ b/e2e/vue-start/streaming-ssr/package.json @@ -24,7 +24,7 @@ "@tanstack/router-e2e-utils": "workspace:^", "@types/node": "^22.10.2", "@vitejs/plugin-vue-jsx": "^5.1.5", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14" diff --git a/e2e/vue-start/virtual-routes/package.json b/e2e/vue-start/virtual-routes/package.json index 19cd20ff42..90f09ce911 100644 --- a/e2e/vue-start/virtual-routes/package.json +++ b/e2e/vue-start/virtual-routes/package.json @@ -29,7 +29,7 @@ "@vitejs/plugin-vue": "^6.0.5", "@vitejs/plugin-vue-jsx": "^5.1.5", "combinate": "^1.1.11", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/e2e/vue-start/website/package.json b/e2e/vue-start/website/package.json index ccb03ae8f0..6c30b1500f 100644 --- a/e2e/vue-start/website/package.json +++ b/e2e/vue-start/website/package.json @@ -27,7 +27,7 @@ "@types/node": "^22.10.2", "@vitejs/plugin-vue": "^6.0.5", "@vitejs/plugin-vue-jsx": "^5.1.5", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/examples/react/authenticated-routes-firebase/package.json b/examples/react/authenticated-routes-firebase/package.json index e83808259d..1efa172047 100644 --- a/examples/react/authenticated-routes-firebase/package.json +++ b/examples/react/authenticated-routes-firebase/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "firebase": "^11.4.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/authenticated-routes/package.json b/examples/react/authenticated-routes/package.json index b62319636c..6af48f1d34 100644 --- a/examples/react/authenticated-routes/package.json +++ b/examples/react/authenticated-routes/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-default-search-params/package.json b/examples/react/basic-default-search-params/package.json index 43e2cfbbb3..96c68fecd4 100644 --- a/examples/react/basic-default-search-params/package.json +++ b/examples/react/basic-default-search-params/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-devtools-panel/package.json b/examples/react/basic-devtools-panel/package.json index 04339fa276..ccae95d73f 100644 --- a/examples/react/basic-devtools-panel/package.json +++ b/examples/react/basic-devtools-panel/package.json @@ -12,8 +12,8 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.67.2", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-file-based/package.json b/examples/react/basic-file-based/package.json index fe1eb665a4..9c3cacada1 100644 --- a/examples/react/basic-file-based/package.json +++ b/examples/react/basic-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-non-nested-devtools/package.json b/examples/react/basic-non-nested-devtools/package.json index 5c7547a3c8..32e856ebcf 100644 --- a/examples/react/basic-non-nested-devtools/package.json +++ b/examples/react/basic-non-nested-devtools/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query-file-based/package.json b/examples/react/basic-react-query-file-based/package.json index c9fa1f0c1d..d01a02872e 100644 --- a/examples/react/basic-react-query-file-based/package.json +++ b/examples/react/basic-react-query-file-based/package.json @@ -12,9 +12,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-react-query/package.json b/examples/react/basic-react-query/package.json index 75b8a401eb..edab96afac 100644 --- a/examples/react/basic-react-query/package.json +++ b/examples/react/basic-react-query/package.json @@ -12,8 +12,8 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/basic-ssr-file-based/package.json b/examples/react/basic-ssr-file-based/package.json index 388f98c441..3222c33e19 100644 --- a/examples/react/basic-ssr-file-based/package.json +++ b/examples/react/basic-ssr-file-based/package.json @@ -11,8 +11,8 @@ "debug": "node --inspect-brk server" }, "dependencies": { - "@tanstack/react-router": "^1.170.42", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/react-router": "^1.170.46", + "@tanstack/router-plugin": "^1.169.0", "compression": "^1.8.0", "express": "^5.2.1", "get-port": "^7.1.0", @@ -21,7 +21,7 @@ "react-dom": "^19.0.0" }, "devDependencies": { - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router-devtools": "^1.167.3", "@types/express": "^5.0.6", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.1", diff --git a/examples/react/basic-ssr-streaming-file-based/package.json b/examples/react/basic-ssr-streaming-file-based/package.json index 0c23005553..c3c87c8d88 100644 --- a/examples/react/basic-ssr-streaming-file-based/package.json +++ b/examples/react/basic-ssr-streaming-file-based/package.json @@ -11,8 +11,8 @@ "debug": "node --inspect-brk server" }, "dependencies": { - "@tanstack/react-router": "^1.170.42", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/react-router": "^1.170.46", + "@tanstack/router-plugin": "^1.169.0", "compression": "^1.8.0", "express": "^5.2.1", "get-port": "^7.1.0", @@ -21,7 +21,7 @@ "react-dom": "^19.0.0" }, "devDependencies": { - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router-devtools": "^1.167.3", "@types/express": "^5.0.6", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.1", diff --git a/examples/react/basic-virtual-file-based/package.json b/examples/react/basic-virtual-file-based/package.json index 115395a864..84d326435c 100644 --- a/examples/react/basic-virtual-file-based/package.json +++ b/examples/react/basic-virtual-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "@tanstack/virtual-file-routes": "^1.162.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic-virtual-inside-file-based/package.json b/examples/react/basic-virtual-inside-file-based/package.json index 29d71c2730..c04cb6012e 100644 --- a/examples/react/basic-virtual-inside-file-based/package.json +++ b/examples/react/basic-virtual-inside-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "@tanstack/virtual-file-routes": "^1.162.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/basic/package.json b/examples/react/basic/package.json index 48b2bf641d..2c09a3dfdf 100644 --- a/examples/react/basic/package.json +++ b/examples/react/basic/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/deferred-data/package.json b/examples/react/deferred-data/package.json index fb089cc985..99afb661ee 100644 --- a/examples/react/deferred-data/package.json +++ b/examples/react/deferred-data/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/i18n-paraglide/package.json b/examples/react/i18n-paraglide/package.json index 3c35be9150..88140e8911 100644 --- a/examples/react/i18n-paraglide/package.json +++ b/examples/react/i18n-paraglide/package.json @@ -11,8 +11,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.42", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/react-router": "^1.170.46", + "@tanstack/router-plugin": "^1.169.0", "react": "^19.1.1", "react-dom": "^19.1.1", "tailwindcss": "^4.2.2" diff --git a/examples/react/kitchen-sink-file-based/package.json b/examples/react/kitchen-sink-file-based/package.json index 854875e80d..e02defb3ce 100644 --- a/examples/react/kitchen-sink-file-based/package.json +++ b/examples/react/kitchen-sink-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query-file-based/package.json b/examples/react/kitchen-sink-react-query-file-based/package.json index 1c9fff3cc4..e3dd032ac2 100644 --- a/examples/react/kitchen-sink-react-query-file-based/package.json +++ b/examples/react/kitchen-sink-react-query-file-based/package.json @@ -12,9 +12,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink-react-query/package.json b/examples/react/kitchen-sink-react-query/package.json index 048171f259..14d0dc8e86 100644 --- a/examples/react/kitchen-sink-react-query/package.json +++ b/examples/react/kitchen-sink-react-query/package.json @@ -12,8 +12,8 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/kitchen-sink/package.json b/examples/react/kitchen-sink/package.json index ea2201fe09..f738efc37e 100644 --- a/examples/react/kitchen-sink/package.json +++ b/examples/react/kitchen-sink/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "immer": "^10.1.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/large-file-based/package.json b/examples/react/large-file-based/package.json index cef2281e96..23d469d120 100644 --- a/examples/react/large-file-based/package.json +++ b/examples/react/large-file-based/package.json @@ -13,9 +13,9 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/location-masking/package.json b/examples/react/location-masking/package.json index 6c494b9249..fe005c0d2f 100644 --- a/examples/react/location-masking/package.json +++ b/examples/react/location-masking/package.json @@ -12,8 +12,8 @@ "@radix-ui/react-dialog": "^1.1.6", "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/navigation-blocking/package.json b/examples/react/navigation-blocking/package.json index e019817e16..a7677dfd51 100644 --- a/examples/react/navigation-blocking/package.json +++ b/examples/react/navigation-blocking/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-esbuild-file-based/esbuild.config.js b/examples/react/quickstart-esbuild-file-based/esbuild.config.js index fb7950d1fa..2f83a79984 100644 --- a/examples/react/quickstart-esbuild-file-based/esbuild.config.js +++ b/examples/react/quickstart-esbuild-file-based/esbuild.config.js @@ -7,5 +7,5 @@ export default { bundle: true, format: 'esm', target: ['esnext'], - plugins: [tanstackRouter({ target: 'react', autoCodeSplitting: true })], + plugins: [tanstackRouter({ target: 'react' })], } diff --git a/examples/react/quickstart-esbuild-file-based/package.json b/examples/react/quickstart-esbuild-file-based/package.json index 2c8249a762..d855694fec 100644 --- a/examples/react/quickstart-esbuild-file-based/package.json +++ b/examples/react/quickstart-esbuild-file-based/package.json @@ -9,9 +9,9 @@ "start": "dev" }, "dependencies": { - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-file-based/package.json b/examples/react/quickstart-file-based/package.json index 9429f927b7..976ec838d1 100644 --- a/examples/react/quickstart-file-based/package.json +++ b/examples/react/quickstart-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/quickstart-rspack-file-based/package.json b/examples/react/quickstart-rspack-file-based/package.json index 79f4dc8507..824998f428 100644 --- a/examples/react/quickstart-rspack-file-based/package.json +++ b/examples/react/quickstart-rspack-file-based/package.json @@ -9,17 +9,17 @@ }, "dependencies": { "@tailwindcss/postcss": "^4.2.2", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "postcss": "^8.5.1", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwindcss": "^4.2.2" }, "devDependencies": { - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-react": "^2.0.0", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/router-plugin": "^1.169.0", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@typescript/native": "npm:typescript@^7.0.2", diff --git a/examples/react/quickstart-webpack-file-based/package.json b/examples/react/quickstart-webpack-file-based/package.json index 29133b6a85..baa14b89dd 100644 --- a/examples/react/quickstart-webpack-file-based/package.json +++ b/examples/react/quickstart-webpack-file-based/package.json @@ -7,14 +7,14 @@ "build": "webpack build && tsc --noEmit" }, "dependencies": { - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "react": "^19.0.0", "react-dom": "^19.0.0" }, "devDependencies": { "@swc/core": "^1.15.33", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/router-plugin": "^1.169.0", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "html-webpack-plugin": "^5.6.3", diff --git a/examples/react/quickstart/package.json b/examples/react/quickstart/package.json index f684da773e..b6db476ea8 100644 --- a/examples/react/quickstart/package.json +++ b/examples/react/quickstart/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwindcss": "^4.2.2" diff --git a/examples/react/router-monorepo-react-query/package.json b/examples/react/router-monorepo-react-query/package.json index 404ef261b9..b158eeda56 100644 --- a/examples/react/router-monorepo-react-query/package.json +++ b/examples/react/router-monorepo-react-query/package.json @@ -12,9 +12,9 @@ "dependencies": { "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-react-query/packages/app/package.json b/examples/react/router-monorepo-react-query/packages/app/package.json index 59b68d58f0..f0994165c2 100644 --- a/examples/react/router-monorepo-react-query/packages/app/package.json +++ b/examples/react/router-monorepo-react-query/packages/app/package.json @@ -16,7 +16,7 @@ "react-dom": "^19.0.0" }, "devDependencies": { - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router-devtools": "^1.167.3", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", diff --git a/examples/react/router-monorepo-react-query/packages/router/package.json b/examples/react/router-monorepo-react-query/packages/router/package.json index 805be8ea7f..1397db14b5 100644 --- a/examples/react/router-monorepo-react-query/packages/router/package.json +++ b/examples/react/router-monorepo-react-query/packages/router/package.json @@ -11,8 +11,8 @@ "@router-mono-react-query/post-query": "workspace:*", "@tanstack/history": "^1.162.5", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.42", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/react-router": "^1.170.46", + "@tanstack/router-plugin": "^1.169.0", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/router-monorepo-simple-lazy/package.json b/examples/react/router-monorepo-simple-lazy/package.json index d64f0c246d..e044d86681 100644 --- a/examples/react/router-monorepo-simple-lazy/package.json +++ b/examples/react/router-monorepo-simple-lazy/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple-lazy/packages/app/package.json b/examples/react/router-monorepo-simple-lazy/packages/app/package.json index 48d2ae7206..cfc7a94942 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/app/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/app/package.json @@ -15,7 +15,7 @@ "react-dom": "^19.0.0" }, "devDependencies": { - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router-devtools": "^1.167.3", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", diff --git a/examples/react/router-monorepo-simple-lazy/packages/router/package.json b/examples/react/router-monorepo-simple-lazy/packages/router/package.json index 9ee1e90948..afd4702b5d 100644 --- a/examples/react/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/react/router-monorepo-simple-lazy/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.162.5", - "@tanstack/react-router": "^1.170.42", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/react-router": "^1.170.46", + "@tanstack/router-plugin": "^1.169.0", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/router-monorepo-simple/package.json b/examples/react/router-monorepo-simple/package.json index 0f42d3fe2a..800d948c81 100644 --- a/examples/react/router-monorepo-simple/package.json +++ b/examples/react/router-monorepo-simple/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/router-monorepo-simple/packages/app/package.json b/examples/react/router-monorepo-simple/packages/app/package.json index 30f39f4a52..a06431ef86 100644 --- a/examples/react/router-monorepo-simple/packages/app/package.json +++ b/examples/react/router-monorepo-simple/packages/app/package.json @@ -15,7 +15,7 @@ "react-dom": "^19.0.0" }, "devDependencies": { - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router-devtools": "^1.167.3", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", "@vitejs/plugin-react": "^6.0.1", diff --git a/examples/react/router-monorepo-simple/packages/router/package.json b/examples/react/router-monorepo-simple/packages/router/package.json index c2d224b7e4..391b72e610 100644 --- a/examples/react/router-monorepo-simple/packages/router/package.json +++ b/examples/react/router-monorepo-simple/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.162.5", - "@tanstack/react-router": "^1.170.42", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/react-router": "^1.170.46", + "@tanstack/router-plugin": "^1.169.0", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/scroll-restoration/package.json b/examples/react/scroll-restoration/package.json index ca15f551d6..704ff13838 100644 --- a/examples/react/scroll-restoration/package.json +++ b/examples/react/scroll-restoration/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "@tanstack/react-virtual": "^3.13.0", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/search-validator-adapters/package.json b/examples/react/search-validator-adapters/package.json index 6d3837ca0c..35e041e825 100644 --- a/examples/react/search-validator-adapters/package.json +++ b/examples/react/search-validator-adapters/package.json @@ -13,9 +13,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/arktype-adapter": "^1.167.0", "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "@tanstack/valibot-adapter": "^1.167.0", "@tanstack/zod-adapter": "^1.167.0", "arktype": "^2.1.7", @@ -26,7 +26,7 @@ "zod": "^3.24.2" }, "devDependencies": { - "@testing-library/jest-dom": "^6.6.3", + "@testing-library/jest-dom": "^7.0.1", "@testing-library/react": "^16.2.0", "@types/react": "^19.0.8", "@types/react-dom": "^19.0.3", @@ -35,6 +35,6 @@ "jsdom": "^27.0.0", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", - "vitest": "^4.1.4" + "vitest": "^5.0.4" } } diff --git a/examples/react/search-validator-adapters/tests/arktype.test.tsx b/examples/react/search-validator-adapters/tests/arktype.test.tsx index 1c3a1baf76..776cc8369e 100644 --- a/examples/react/search-validator-adapters/tests/arktype.test.tsx +++ b/examples/react/search-validator-adapters/tests/arktype.test.tsx @@ -8,7 +8,6 @@ import { createRouter, } from '@tanstack/react-router' -import '@testing-library/jest-dom/vitest' import { type } from 'arktype' test('can navigate to the route', async () => { diff --git a/examples/react/search-validator-adapters/tests/jest-dom.setup.ts b/examples/react/search-validator-adapters/tests/jest-dom.setup.ts new file mode 100644 index 0000000000..8f7cbf15be --- /dev/null +++ b/examples/react/search-validator-adapters/tests/jest-dom.setup.ts @@ -0,0 +1,18 @@ +import * as jestDomMatchers from '@testing-library/jest-dom/matchers' +import { expect } from 'vitest' +import type { TestingLibraryMatchers } from '@testing-library/jest-dom/matchers' + +// Workaround for Vitest 5: remove once testing-library/jest-dom#742 is merged +// and released, and go back to `import '@testing-library/jest-dom/vitest'`. +// That entry imports `vitest` from its own install location, which can resolve +// a different Vitest copy than the one running these tests, and its types +// augment Vitest 4's `Assertion` instead of Vitest 5's `Matchers`. +// Keep `jest-dom` in this file name: vite-plugin-solid only skips injecting +// `@testing-library/jest-dom/vitest` when a setup file path contains it. +expect.extend(jestDomMatchers) + +declare module 'vitest' { + // Type parameter names must match Vitest's declaration for the interfaces to merge. + // eslint-disable-next-line @typescript-eslint/naming-convention + interface Matchers extends TestingLibraryMatchers {} +} diff --git a/examples/react/search-validator-adapters/tests/valibot.test.tsx b/examples/react/search-validator-adapters/tests/valibot.test.tsx index 3680d2302c..d3e18db414 100644 --- a/examples/react/search-validator-adapters/tests/valibot.test.tsx +++ b/examples/react/search-validator-adapters/tests/valibot.test.tsx @@ -8,7 +8,6 @@ import { createRouter, } from '@tanstack/react-router' import * as v from 'valibot' -import '@testing-library/jest-dom/vitest' test('can navigate to the route', async () => { const rootRoute = createRootRoute() diff --git a/examples/react/search-validator-adapters/vite.config.ts b/examples/react/search-validator-adapters/vite.config.ts index 5b41e6e26b..e4b93f5cc3 100644 --- a/examples/react/search-validator-adapters/vite.config.ts +++ b/examples/react/search-validator-adapters/vite.config.ts @@ -11,6 +11,7 @@ export default defineConfig({ watch: false, environment: 'jsdom', typecheck: { enabled: true }, + setupFiles: ['./tests/jest-dom.setup.ts'], }, plugins: [ tailwindcss(), diff --git a/examples/react/start-bare/package.json b/examples/react/start-bare/package.json index 916bf280b6..4ab9aff272 100644 --- a/examples/react/start-bare/package.json +++ b/examples/react/start-bare/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.61", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-start": "^1.169.6", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^4.4.3" diff --git a/examples/react/start-basic-auth/README.md b/examples/react/start-basic-auth/README.md index 4e5ee29b40..7f1b093ba5 100644 --- a/examples/react/start-basic-auth/README.md +++ b/examples/react/start-basic-auth/README.md @@ -39,3 +39,13 @@ This example demonstrates: - Protected routes - Login/logout functionality - Redirect after authentication + +## Session configuration + +This example uses [iron-session](https://github.com/vvo/iron-session) through Start's `getCookie` and `setCookie` helpers. Set `SESSION_PASSWORD` to a random secret of at least 32 characters before starting the app, for example: + +```sh +export SESSION_PASSWORD="$(openssl rand -base64 32)" +``` + +Keep the same secret across instances and deployments that must read the same sessions. The cookie requires HTTPS in production. Each handler reads its own session, then awaits `session.save()` before redirecting or returning. diff --git a/examples/react/start-basic-auth/package.json b/examples/react/start-basic-auth/package.json index 2286f06c1b..9ab89bdac9 100644 --- a/examples/react/start-basic-auth/package.json +++ b/examples/react/start-basic-auth/package.json @@ -14,9 +14,10 @@ "@libsql/client": "^0.15.15", "@prisma/adapter-libsql": "^7.0.0", "@prisma/client": "^7.0.0", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.61", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-start": "^1.169.6", + "iron-session": "^9.0.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-auth/src/routes/__root.tsx b/examples/react/start-basic-auth/src/routes/__root.tsx index 5728345fcf..3367c62f27 100644 --- a/examples/react/start-basic-auth/src/routes/__root.tsx +++ b/examples/react/start-basic-auth/src/routes/__root.tsx @@ -13,18 +13,18 @@ import { DefaultCatchBoundary } from '~/components/DefaultCatchBoundary.js' import { NotFound } from '~/components/NotFound.js' import appCss from '~/styles/app.css?url' import { seo } from '~/utils/seo.js' -import { useAppSession } from '~/utils/session.js' +import { getAppSession } from '~/utils/session.js' const fetchUser = createServerFn({ method: 'GET' }).handler(async () => { // We need to auth on the server so we have access to secure cookies - const session = await useAppSession() + const session = await getAppSession() - if (!session.data.userEmail) { + if (!session.userEmail) { return null } return { - email: session.data.userEmail, + email: session.userEmail, } }) diff --git a/examples/react/start-basic-auth/src/routes/_authed.tsx b/examples/react/start-basic-auth/src/routes/_authed.tsx index 3af371e844..0b5c6f9047 100644 --- a/examples/react/start-basic-auth/src/routes/_authed.tsx +++ b/examples/react/start-basic-auth/src/routes/_authed.tsx @@ -2,7 +2,7 @@ import { createFileRoute } from '@tanstack/react-router' import { createServerFn } from '@tanstack/react-start' import { hashPassword, prismaClient } from '~/utils/prisma' import { Login } from '~/components/Login' -import { useAppSession } from '~/utils/session' +import { getAppSession } from '~/utils/session' export const loginFn = createServerFn({ method: 'POST' }) .validator((d: { email: string; password: string }) => d) @@ -33,13 +33,10 @@ export const loginFn = createServerFn({ method: 'POST' }) } } - // Create a session - const session = await useAppSession() - // Store the user's email in the session - await session.update({ - userEmail: user.email, - }) + const session = await getAppSession() + session.userEmail = user.email + await session.save() }) export const Route = createFileRoute('/_authed')({ diff --git a/examples/react/start-basic-auth/src/routes/logout.tsx b/examples/react/start-basic-auth/src/routes/logout.tsx index 28f3c9f8fe..73cdaf1600 100644 --- a/examples/react/start-basic-auth/src/routes/logout.tsx +++ b/examples/react/start-basic-auth/src/routes/logout.tsx @@ -1,11 +1,10 @@ import { redirect, createFileRoute } from '@tanstack/react-router' import { createServerFn } from '@tanstack/react-start' -import { useAppSession } from '~/utils/session' +import { getAppSession } from '~/utils/session' const logoutFn = createServerFn().handler(async () => { - const session = await useAppSession() - - session.clear() + const session = await getAppSession() + session.destroy() throw redirect({ href: '/', diff --git a/examples/react/start-basic-auth/src/routes/signup.tsx b/examples/react/start-basic-auth/src/routes/signup.tsx index 247a94c03c..4dc8e350ac 100644 --- a/examples/react/start-basic-auth/src/routes/signup.tsx +++ b/examples/react/start-basic-auth/src/routes/signup.tsx @@ -3,7 +3,7 @@ import { createServerFn, useServerFn } from '@tanstack/react-start' import { hashPassword, prismaClient } from '~/utils/prisma' import { useMutation } from '~/hooks/useMutation' import { Auth } from '~/components/Auth' -import { useAppSession } from '~/utils/session' +import { getAppSession } from '~/utils/session' export const signupFn = createServerFn({ method: 'POST' }) .validator( @@ -20,9 +20,6 @@ export const signupFn = createServerFn({ method: 'POST' }) // Encrypt the password using Sha256 into plaintext const password = await hashPassword(data.password) - // Create a session - const session = await useAppSession() - if (found) { if (found.password !== password) { return { @@ -33,9 +30,9 @@ export const signupFn = createServerFn({ method: 'POST' }) } // Store the user's email in the session - await session.update({ - userEmail: found.email, - }) + const session = await getAppSession() + session.userEmail = found.email + await session.save() // Redirect to the prev page stored in the "redirect" search param throw redirect({ @@ -52,9 +49,9 @@ export const signupFn = createServerFn({ method: 'POST' }) }) // Store the user's email in the session - await session.update({ - userEmail: user.email, - }) + const session = await getAppSession() + session.userEmail = user.email + await session.save() // Redirect to the prev page stored in the "redirect" search param throw redirect({ diff --git a/examples/react/start-basic-auth/src/utils/session.ts b/examples/react/start-basic-auth/src/utils/session.ts index c38bac1e48..7df7bc4da2 100644 --- a/examples/react/start-basic-auth/src/utils/session.ts +++ b/examples/react/start-basic-auth/src/utils/session.ts @@ -1,13 +1,29 @@ -// src/services/session.server.ts -import { useSession } from '@tanstack/react-start/server' +import { getIronSession } from 'iron-session' +import { getCookie, setCookie } from '@tanstack/react-start/server' import type { User } from '@prisma/client' type SessionUser = { userEmail: User['email'] } -export function useAppSession() { - return useSession({ - password: 'ChangeThisBeforeShippingToProdOrYouWillBeFired', - }) +export function getAppSession() { + const password = process.env.SESSION_PASSWORD + if (!password || password.length < 32) { + throw new Error('Set SESSION_PASSWORD to at least 32 characters') + } + + return getIronSession( + { read: getCookie, write: setCookie }, + { + cookieName: 'app-session', + password, + ttl: 7 * 24 * 60 * 60, + cookieOptions: { + httpOnly: true, + sameSite: 'lax', + secure: process.env.NODE_ENV === 'production', + path: '/', + }, + }, + ) } diff --git a/examples/react/start-basic-authjs/package.json b/examples/react/start-basic-authjs/package.json index 5a5327b9a9..e9fa789ea6 100644 --- a/examples/react/start-basic-authjs/package.json +++ b/examples/react/start-basic-authjs/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@auth/core": "^0.41.1", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.61", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-start": "^1.169.6", "react": "^19.0.0", "react-dom": "^19.0.0", "start-authjs": "^1.0.0", diff --git a/examples/react/start-basic-cloudflare/package.json b/examples/react/start-basic-cloudflare/package.json index b7d119c273..2108922446 100644 --- a/examples/react/start-basic-cloudflare/package.json +++ b/examples/react/start-basic-cloudflare/package.json @@ -12,9 +12,9 @@ "postinstall": "WRANGLER_LOG=warn npm run --silent cf-typegen" }, "dependencies": { - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.61", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-start": "^1.169.6", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-basic-react-query/package.json b/examples/react/start-basic-react-query/package.json index 909f1c63d3..9d819d4390 100644 --- a/examples/react/start-basic-react-query/package.json +++ b/examples/react/start-basic-react-query/package.json @@ -13,10 +13,10 @@ "dependencies": { "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "@tanstack/react-router-ssr-query": "^1.167.3", - "@tanstack/react-start": "^1.168.61", + "@tanstack/react-start": "^1.169.6", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-basic-rsbuild/package.json b/examples/react/start-basic-rsbuild/package.json index 220dfcfa7b..bea4ba26ef 100644 --- a/examples/react/start-basic-rsbuild/package.json +++ b/examples/react/start-basic-rsbuild/package.json @@ -10,22 +10,22 @@ "start": "srvx --prod -s ../client dist/server/index.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.61", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-start": "^1.169.6", "react": "^19.2.3", "react-dom": "^19.2.3", "tailwind-merge": "^3.6.0", "zod": "^4.4.3" }, "devDependencies": { - "@rsbuild/core": "^2.0.11", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-react": "^2.0.0", "@rsbuild/plugin-tailwindcss": "^2.0.3", "@types/node": "25.0.9", "@types/react": "^19.2.8", "@types/react-dom": "^19.2.3", - "srvx": "^0.11.18", + "srvx": "^1.0.0", "tailwindcss": "^4.2.2", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2" diff --git a/examples/react/start-basic-static/package.json b/examples/react/start-basic-static/package.json index e85469f3fd..58d573ca36 100644 --- a/examples/react/start-basic-static/package.json +++ b/examples/react/start-basic-static/package.json @@ -10,10 +10,10 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.61", - "@tanstack/start-static-server-functions": "^1.167.40", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-start": "^1.169.6", + "@tanstack/start-static-server-functions": "^1.167.44", "@vitejs/plugin-react": "^6.0.1", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/start-basic/package.json b/examples/react/start-basic/package.json index 8e074e46a0..46df8e4650 100644 --- a/examples/react/start-basic/package.json +++ b/examples/react/start-basic/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.61", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-start": "^1.169.6", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^3.6.0", diff --git a/examples/react/start-bun/package.json b/examples/react/start-bun/package.json index 465a79f661..24f7113912 100644 --- a/examples/react/start-bun/package.json +++ b/examples/react/start-bun/package.json @@ -15,11 +15,11 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/react-devtools": "^0.7.0", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "@tanstack/react-router-ssr-query": "^1.167.3", - "@tanstack/react-start": "^1.168.61", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/react-start": "^1.169.6", + "@tanstack/router-plugin": "^1.169.0", "react": "^19.1.1", "react-dom": "^19.1.1", "tailwindcss": "^4.2.2" @@ -38,7 +38,7 @@ "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", - "vitest": "^4.1.4", + "vitest": "^5.0.4", "web-vitals": "^5.1.0" } } diff --git a/examples/react/start-clerk-basic/package.json b/examples/react/start-clerk-basic/package.json index 8b84230124..022300e159 100644 --- a/examples/react/start-clerk-basic/package.json +++ b/examples/react/start-clerk-basic/package.json @@ -11,14 +11,14 @@ }, "dependencies": { "@clerk/tanstack-react-start": "^0.27.14", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.61", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-start": "^1.169.6", "@vitejs/plugin-react": "^6.0.1", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", - "srvx": "^0.11.9", + "srvx": "^1.0.0", "tailwind-merge": "^3.6.0" }, "devDependencies": { diff --git a/examples/react/start-convex-trellaux/package.json b/examples/react/start-convex-trellaux/package.json index 6496f419ad..3452f910d0 100644 --- a/examples/react/start-convex-trellaux/package.json +++ b/examples/react/start-convex-trellaux/package.json @@ -15,10 +15,10 @@ "@convex-dev/react-query": "0.0.0-alpha.8", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "@tanstack/react-router-ssr-query": "^1.167.3", - "@tanstack/react-start": "^1.168.61", + "@tanstack/react-start": "^1.169.6", "concurrently": "^8.2.2", "convex": "^1.19.0", "ky": "^1.7.4", diff --git a/examples/react/start-counter/package.json b/examples/react/start-counter/package.json index 498867d361..8f4673143e 100644 --- a/examples/react/start-counter/package.json +++ b/examples/react/start-counter/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.61", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-start": "^1.169.6", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/examples/react/start-i18n-paraglide/package.json b/examples/react/start-i18n-paraglide/package.json index 8db6f591cc..074f714d5c 100644 --- a/examples/react/start-i18n-paraglide/package.json +++ b/examples/react/start-i18n-paraglide/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tanstack/react-devtools": "^0.7.0", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.61", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-start": "^1.169.6", "react": "^19.1.1", "react-dom": "^19.1.1" }, diff --git a/examples/react/start-large/package.json b/examples/react/start-large/package.json index 8a8922f18f..f9f86b81d1 100644 --- a/examples/react/start-large/package.json +++ b/examples/react/start-large/package.json @@ -13,9 +13,9 @@ }, "dependencies": { "@tanstack/react-query": "^5.102.0", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.61", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-start": "^1.169.6", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/start-material-ui/package.json b/examples/react/start-material-ui/package.json index dab36527b9..1647e95f20 100644 --- a/examples/react/start-material-ui/package.json +++ b/examples/react/start-material-ui/package.json @@ -15,9 +15,9 @@ "@emotion/styled": "11.14.0", "@fontsource-variable/roboto": "5.2.5", "@mui/material": "6.4.7", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.61", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-start": "^1.169.6", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^4.4.3" diff --git a/examples/react/start-next-migration/README.md b/examples/react/start-next-migration/README.md index 50bb58380a..03bb53244e 100644 --- a/examples/react/start-next-migration/README.md +++ b/examples/react/start-next-migration/README.md @@ -6,7 +6,7 @@ The private page saves one article in an encrypted session cookie. This keeps th ## Run -Use Node 24 or newer and pnpm 11. From the repository root: +Use Node 24 or newer and pnpm 12. From the repository root: ```sh pnpm install @@ -23,7 +23,7 @@ export DEMO_PASSWORD='choose-a-local-demo-password' Run `pnpm dev:next` for Next.js at and `pnpm dev` in another terminal for Start at . Sign in as `reader@example.com` using the password you set. -The apps use different cookie names and session formats. Signing in to one does not sign you in to the other. Changing `SESSION_PASSWORD` invalidates that app's session. Saved state is tied to that session, not durable account storage. +Both apps use iron-session, with different cookie names. Signing in to one does not sign you in to the other. Changing `SESSION_PASSWORD` invalidates that app's session. Saved state is tied to that session, not durable account storage. ## Check the migration @@ -50,7 +50,7 @@ For a production-mode smoke check, keep the environment variables set and run `p | `generateMetadata` | Route `head` using `loaderData` | | `next-app/app/actions.ts` | `src/server/account.ts` | | Server Action form and `revalidatePath` | `useServerFn`, local pending state, `router.invalidate` | -| `cookies()` with `iron-session` | `useSession` | +| `cookies()` with `iron-session` | `iron-session` with `getCookie` / `setCookie` | | `next-app/next.config.ts` redirect | `src/routes/old-notes.tsx` redirect | | `next-app/app/sitemap.ts` | `src/routes/sitemap[.]xml.ts` server route | diff --git a/examples/react/start-next-migration/package.json b/examples/react/start-next-migration/package.json index ecad32ce6c..0c2a2a9563 100644 --- a/examples/react/start-next-migration/package.json +++ b/examples/react/start-next-migration/package.json @@ -12,9 +12,9 @@ "test:e2e": "playwright test" }, "dependencies": { - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-start": "^1.168.61", - "iron-session": "^9.0.0", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-start": "^1.169.6", + "iron-session": "^9.0.1", "next": "16.3.4", "react": "^19.2.3", "react-dom": "^19.2.3" diff --git a/examples/react/start-next-migration/src/server/account.ts b/examples/react/start-next-migration/src/server/account.ts index e8fc5833a9..85e921c74b 100644 --- a/examples/react/start-next-migration/src/server/account.ts +++ b/examples/react/start-next-migration/src/server/account.ts @@ -1,6 +1,8 @@ +import { getIronSession } from 'iron-session' import { createServerFn } from '@tanstack/react-start' import { - useSession, + getCookie, + setCookie, setResponseStatus, setResponseHeader, } from '@tanstack/react-start/server' @@ -11,16 +13,26 @@ async function session() { if (!password || password.length < 32) { throw new Error('Set SESSION_PASSWORD to at least 32 characters') } - return useSession<{ email: string; saved: boolean }>({ - name: 'start-migration-session', - password, - }) + return getIronSession<{ email: string; saved: boolean }>( + { read: getCookie, write: setCookie }, + { + cookieName: 'start-migration-session', + password, + ttl: 7 * 24 * 60 * 60, + cookieOptions: { + httpOnly: true, + secure: process.env.NODE_ENV === 'production', + sameSite: 'lax', + path: '/', + }, + }, + ) } export const getAccount = createServerFn({ method: 'GET' }).handler( async () => { const current = await session() - return current.data.email - ? { email: current.data.email, saved: current.data.saved ?? false } + return current.email + ? { email: current.email, saved: current.saved ?? false } : null }, ) @@ -42,21 +54,24 @@ export const signIn = createServerFn({ method: 'POST' }) return { error: 'Invalid credentials' } } const current = await session() - await current.update({ email: data.email, saved: false }) + current.email = data.email + current.saved = false + await current.save() return { error: '' } }) export const toggleSaved = createServerFn({ method: 'POST' }).handler( async () => { const current = await session() - if (!current.data.email) { + if (!current.email) { setResponseStatus(401) throw new Error('Unauthorized') } - await current.update({ saved: !current.data.saved }) + current.saved = !current.saved + await current.save() }, ) export const signOut = createServerFn({ method: 'POST' }).handler(async () => { const current = await session() - await current.clear() + current.destroy() throw redirect({ to: '/login' }) }) diff --git a/examples/react/start-rscs/package.json b/examples/react/start-rscs/package.json index 6202aa2457..00c88681d7 100644 --- a/examples/react/start-rscs/package.json +++ b/examples/react/start-rscs/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.61", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-start": "^1.169.6", "dexie": "^4.0.10", "react": "^19.2.0", "react-dom": "^19.2.0", @@ -26,7 +26,7 @@ "@types/react": "^19.2.2", "@types/react-dom": "^19.2.2", "@vitejs/plugin-react": "^6.0.1", - "@vitejs/plugin-rsc": "^0.5.30", + "@vitejs/plugin-rsc": "^0.5.39", "nitro": "^3.0.260903-beta", "tailwindcss": "^4.1.18", "typescript": "^5.7.2", 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 90cdf22448..762bbff733 100644 --- a/examples/react/start-streaming-data-from-server-functions/package.json +++ b/examples/react/start-streaming-data-from-server-functions/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.61", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-start": "^1.169.6", "react": "^19.0.0", "react-dom": "^19.0.0", "zod": "^4.4.3" diff --git a/examples/react/start-supabase-basic/package.json b/examples/react/start-supabase-basic/package.json index 3e20bdbe53..0bf4b2c246 100644 --- a/examples/react/start-supabase-basic/package.json +++ b/examples/react/start-supabase-basic/package.json @@ -15,9 +15,9 @@ "dependencies": { "@supabase/ssr": "^0.5.2", "@supabase/supabase-js": "^2.48.1", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.61", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-start": "^1.169.6", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1" diff --git a/examples/react/start-tailwind-v4/package.json b/examples/react/start-tailwind-v4/package.json index 3fe0751385..b58fbe4ff0 100644 --- a/examples/react/start-tailwind-v4/package.json +++ b/examples/react/start-tailwind-v4/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.61", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-start": "^1.169.6", "react": "^19.0.0", "react-dom": "^19.0.0", "tailwind-merge": "^3.6.0", diff --git a/examples/react/start-trellaux/package.json b/examples/react/start-trellaux/package.json index 7d9f31e1f2..7755d227fc 100644 --- a/examples/react/start-trellaux/package.json +++ b/examples/react/start-trellaux/package.json @@ -12,10 +12,10 @@ "dependencies": { "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "@tanstack/react-router-ssr-query": "^1.167.3", - "@tanstack/react-start": "^1.168.61", + "@tanstack/react-start": "^1.169.6", "ky": "^1.7.4", "msw": "^2.7.0", "react": "^19.0.0", diff --git a/examples/react/start-workos/package.json b/examples/react/start-workos/package.json index 25631bbd0b..0ab7e89c2d 100644 --- a/examples/react/start-workos/package.json +++ b/examples/react/start-workos/package.json @@ -14,9 +14,9 @@ "license": "MIT", "dependencies": { "@radix-ui/themes": "^3.3.0", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/react-start": "^1.168.61", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/react-start": "^1.169.6", "@workos/authkit-tanstack-react-start": "^0.5.0", "react": "^19.0.0", "react-dom": "^19.0.0" diff --git a/examples/react/view-transitions/package.json b/examples/react/view-transitions/package.json index a68bfb1d76..0be3c60e8f 100644 --- a/examples/react/view-transitions/package.json +++ b/examples/react/view-transitions/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "react": "^19.0.0", "react-dom": "^19.0.0", "redaxios": "^0.5.1", diff --git a/examples/react/with-framer-motion/package.json b/examples/react/with-framer-motion/package.json index 57941619a3..c606070dfb 100644 --- a/examples/react/with-framer-motion/package.json +++ b/examples/react/with-framer-motion/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", "framer-motion": "^11.18.2", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json index 9b0714b67a..11df7bf03b 100644 --- a/examples/react/with-trpc-react-query/package.json +++ b/examples/react/with-trpc-react-query/package.json @@ -13,9 +13,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/react-query": "^5.102.0", "@tanstack/react-query-devtools": "^5.90.0", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "@trpc/client": "^11.4.3", "@trpc/server": "^11.4.3", "@trpc/tanstack-react-query": "^11.4.3", diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json index 1d9c7d2841..5612419cae 100644 --- a/examples/react/with-trpc/package.json +++ b/examples/react/with-trpc/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/react-router": "^1.170.42", - "@tanstack/react-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/react-router": "^1.170.46", + "@tanstack/react-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "@trpc/client": "^11.4.3", "@trpc/server": "^11.4.3", "express": "^5.2.1", diff --git a/examples/solid/authenticated-routes-firebase/package.json b/examples/solid/authenticated-routes-firebase/package.json index 741028bab0..110b4d2621 100644 --- a/examples/solid/authenticated-routes-firebase/package.json +++ b/examples/solid/authenticated-routes-firebase/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.43", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.169.0", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "firebase": "^11.4.0", "redaxios": "^0.5.1", "simple-icons": "^14.9.0", diff --git a/examples/solid/authenticated-routes/package.json b/examples/solid/authenticated-routes/package.json index 12a1f94d93..ea7d05c902 100644 --- a/examples/solid/authenticated-routes/package.json +++ b/examples/solid/authenticated-routes/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.43", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.169.0", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2", diff --git a/examples/solid/basic-default-search-params/package.json b/examples/solid/basic-default-search-params/package.json index d30af995f0..830df7b9cf 100644 --- a/examples/solid/basic-default-search-params/package.json +++ b/examples/solid/basic-default-search-params/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2", diff --git a/examples/solid/basic-devtools-panel/package.json b/examples/solid/basic-devtools-panel/package.json index 4a21323cce..e7d608f5fe 100644 --- a/examples/solid/basic-devtools-panel/package.json +++ b/examples/solid/basic-devtools-panel/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" diff --git a/examples/solid/basic-file-based/package.json b/examples/solid/basic-file-based/package.json index d7aa324fa9..867118382e 100644 --- a/examples/solid/basic-file-based/package.json +++ b/examples/solid/basic-file-based/package.json @@ -10,15 +10,15 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2", "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/router-plugin": "^1.169.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/basic-non-nested-devtools/package.json b/examples/solid/basic-non-nested-devtools/package.json index 3e8d94ce0c..c8e00ee43e 100644 --- a/examples/solid/basic-non-nested-devtools/package.json +++ b/examples/solid/basic-non-nested-devtools/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" diff --git a/examples/solid/basic-solid-query-file-based/package.json b/examples/solid/basic-solid-query-file-based/package.json index 2251a71b4e..fdb5f05f52 100644 --- a/examples/solid/basic-solid-query-file-based/package.json +++ b/examples/solid/basic-solid-query-file-based/package.json @@ -13,15 +13,15 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2", "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/router-plugin": "^1.169.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/basic-solid-query/package.json b/examples/solid/basic-solid-query/package.json index 8e1e17a0f6..7b132b11a1 100644 --- a/examples/solid/basic-solid-query/package.json +++ b/examples/solid/basic-solid-query/package.json @@ -12,14 +12,14 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/router-plugin": "^1.169.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/basic-ssr-file-based/package.json b/examples/solid/basic-ssr-file-based/package.json index 3feefcfae1..e3699970a9 100644 --- a/examples/solid/basic-ssr-file-based/package.json +++ b/examples/solid/basic-ssr-file-based/package.json @@ -11,8 +11,8 @@ "debug": "node --inspect-brk server" }, "dependencies": { - "@tanstack/solid-router": "^1.170.39", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/router-plugin": "^1.169.0", "compression": "^1.8.0", "express": "^5.2.1", "get-port": "^7.1.0", @@ -20,7 +20,7 @@ "solid-js": "^1.9.10" }, "devDependencies": { - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router-devtools": "^1.167.3", "@types/express": "^5.0.6", "vite-plugin-solid": "^2.11.11", "@typescript/native": "npm:typescript@^7.0.2", diff --git a/examples/solid/basic-ssr-streaming-file-based/package.json b/examples/solid/basic-ssr-streaming-file-based/package.json index b1c9711894..92367442fc 100644 --- a/examples/solid/basic-ssr-streaming-file-based/package.json +++ b/examples/solid/basic-ssr-streaming-file-based/package.json @@ -12,8 +12,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "compression": "^1.8.0", "express": "^5.2.1", "get-port": "^7.1.0", @@ -24,7 +24,7 @@ "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/router-plugin": "^1.169.0", "@types/express": "^5.0.6", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/examples/solid/basic-virtual-file-based/package.json b/examples/solid/basic-virtual-file-based/package.json index 4002486492..801b452192 100644 --- a/examples/solid/basic-virtual-file-based/package.json +++ b/examples/solid/basic-virtual-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.43", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.169.0", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "@tanstack/virtual-file-routes": "^1.162.0", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/basic-virtual-inside-file-based/package.json b/examples/solid/basic-virtual-inside-file-based/package.json index 0afc4dc6b6..a9cc6360a5 100644 --- a/examples/solid/basic-virtual-inside-file-based/package.json +++ b/examples/solid/basic-virtual-inside-file-based/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.43", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.169.0", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "@tanstack/virtual-file-routes": "^1.162.0", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/basic/package.json b/examples/solid/basic/package.json index 4fe458cd5d..95ec804011 100644 --- a/examples/solid/basic/package.json +++ b/examples/solid/basic/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" diff --git a/examples/solid/deferred-data/package.json b/examples/solid/deferred-data/package.json index 7848331338..56114afd04 100644 --- a/examples/solid/deferred-data/package.json +++ b/examples/solid/deferred-data/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2", diff --git a/examples/solid/i18n-paraglide/package.json b/examples/solid/i18n-paraglide/package.json index 66c93a9bc7..6493a3c7c8 100644 --- a/examples/solid/i18n-paraglide/package.json +++ b/examples/solid/i18n-paraglide/package.json @@ -11,8 +11,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/router-plugin": "^1.169.0", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" }, diff --git a/examples/solid/kitchen-sink-file-based/package.json b/examples/solid/kitchen-sink-file-based/package.json index 8a95f34113..8cd73e38ff 100644 --- a/examples/solid/kitchen-sink-file-based/package.json +++ b/examples/solid/kitchen-sink-file-based/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "immer": "^10.1.1", "redaxios": "^0.5.1", "solid-js": "^1.9.10", @@ -19,7 +19,7 @@ "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/router-plugin": "^1.169.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/kitchen-sink-solid-query-file-based/package.json b/examples/solid/kitchen-sink-solid-query-file-based/package.json index 32cbb958e3..25a1c29953 100644 --- a/examples/solid/kitchen-sink-solid-query-file-based/package.json +++ b/examples/solid/kitchen-sink-solid-query-file-based/package.json @@ -10,11 +10,11 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/router-plugin": "^1.169.0", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "immer": "^10.1.1", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/kitchen-sink-solid-query/package.json b/examples/solid/kitchen-sink-solid-query/package.json index be51044166..7a7dc81025 100644 --- a/examples/solid/kitchen-sink-solid-query/package.json +++ b/examples/solid/kitchen-sink-solid-query/package.json @@ -12,8 +12,8 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "immer": "^10.1.1", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/kitchen-sink/package.json b/examples/solid/kitchen-sink/package.json index ebb328ce0b..08ad918a60 100644 --- a/examples/solid/kitchen-sink/package.json +++ b/examples/solid/kitchen-sink/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "immer": "^10.1.1", "redaxios": "^0.5.1", "solid-js": "^1.9.10", diff --git a/examples/solid/large-file-based/package.json b/examples/solid/large-file-based/package.json index 8a50a6ad90..cd758ab704 100644 --- a/examples/solid/large-file-based/package.json +++ b/examples/solid/large-file-based/package.json @@ -12,10 +12,10 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/router-plugin": "^1.169.0", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2", diff --git a/examples/solid/location-masking/package.json b/examples/solid/location-masking/package.json index 863e823e16..7d2fbb6756 100644 --- a/examples/solid/location-masking/package.json +++ b/examples/solid/location-masking/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "solid-js": "^1.9.10", "redaxios": "^0.5.1", "tailwindcss": "^4.2.2" diff --git a/examples/solid/navigation-blocking/package.json b/examples/solid/navigation-blocking/package.json index b3c0f5fdfb..2338d32305 100644 --- a/examples/solid/navigation-blocking/package.json +++ b/examples/solid/navigation-blocking/package.json @@ -11,8 +11,8 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "solid-js": "^1.9.10", "redaxios": "^0.5.1", "tailwindcss": "^4.2.2" diff --git a/examples/solid/quickstart-esbuild-file-based/build.js b/examples/solid/quickstart-esbuild-file-based/build.js index f8d31fbbd9..af5e01b4cd 100644 --- a/examples/solid/quickstart-esbuild-file-based/build.js +++ b/examples/solid/quickstart-esbuild-file-based/build.js @@ -14,10 +14,7 @@ const ctx = await esbuild.context({ target: ['esnext'], sourcemap: true, conditions: ['style'], - plugins: [ - solidPlugin(), - tanstackRouter({ target: 'solid', autoCodeSplitting: true }), - ], + plugins: [solidPlugin(), tanstackRouter({ target: 'solid' })], }) if (isDev) { diff --git a/examples/solid/quickstart-esbuild-file-based/package.json b/examples/solid/quickstart-esbuild-file-based/package.json index 9266ab58ec..9bcc9a08d0 100644 --- a/examples/solid/quickstart-esbuild-file-based/package.json +++ b/examples/solid/quickstart-esbuild-file-based/package.json @@ -9,9 +9,9 @@ "start": "dev" }, "dependencies": { - "@tanstack/router-plugin": "^1.168.43", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.169.0", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2", diff --git a/examples/solid/quickstart-file-based/package.json b/examples/solid/quickstart-file-based/package.json index cb8f13a504..920154566d 100644 --- a/examples/solid/quickstart-file-based/package.json +++ b/examples/solid/quickstart-file-based/package.json @@ -10,15 +10,15 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2", "zod": "^4.4.3" }, "devDependencies": { - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/router-plugin": "^1.169.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", diff --git a/examples/solid/quickstart-rspack-file-based/package.json b/examples/solid/quickstart-rspack-file-based/package.json index daf73f7e4f..2d9c886ac3 100644 --- a/examples/solid/quickstart-rspack-file-based/package.json +++ b/examples/solid/quickstart-rspack-file-based/package.json @@ -9,17 +9,17 @@ }, "dependencies": { "@tailwindcss/postcss": "^4.2.2", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "postcss": "^8.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" }, "devDependencies": { - "@rsbuild/core": "^2.1.0", + "@rsbuild/core": "^2.3.1", "@rsbuild/plugin-babel": "^1.1.2", "@rsbuild/plugin-solid": "^1.1.1", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/router-plugin": "^1.169.0", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2" } diff --git a/examples/solid/quickstart-webpack-file-based/package.json b/examples/solid/quickstart-webpack-file-based/package.json index 3f1c6fc568..16167be207 100644 --- a/examples/solid/quickstart-webpack-file-based/package.json +++ b/examples/solid/quickstart-webpack-file-based/package.json @@ -7,15 +7,15 @@ "build": "webpack build && tsc --noEmit" }, "dependencies": { - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" }, "devDependencies": { "@babel/core": "^7.28.5", "@babel/preset-typescript": "^7.27.1", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/router-plugin": "^1.169.0", "babel-loader": "^10.0.0", "babel-preset-solid": "^1.9.10", "css-loader": "^7.1.2", diff --git a/examples/solid/quickstart/package.json b/examples/solid/quickstart/package.json index 8dd43e583e..454382e8cc 100644 --- a/examples/solid/quickstart/package.json +++ b/examples/solid/quickstart/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" }, diff --git a/examples/solid/router-monorepo-simple-lazy/package.json b/examples/solid/router-monorepo-simple-lazy/package.json index 081c17871c..1d60ab2765 100644 --- a/examples/solid/router-monorepo-simple-lazy/package.json +++ b/examples/solid/router-monorepo-simple-lazy/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "solid-js": "^1.9.10", "redaxios": "^0.5.1" }, diff --git a/examples/solid/router-monorepo-simple-lazy/packages/app/package.json b/examples/solid/router-monorepo-simple-lazy/packages/app/package.json index 976a2ad861..a2e018fa96 100644 --- a/examples/solid/router-monorepo-simple-lazy/packages/app/package.json +++ b/examples/solid/router-monorepo-simple-lazy/packages/app/package.json @@ -20,7 +20,7 @@ "@vitejs/plugin-react": "^6.0.1", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router-devtools": "^1.167.3", "tailwindcss": "^4.2.2", "vite": "^8.0.14", "vite-plugin-dts": "^4.5.4", diff --git a/examples/solid/router-monorepo-simple-lazy/packages/router/package.json b/examples/solid/router-monorepo-simple-lazy/packages/router/package.json index a837ea03d5..0672c42931 100644 --- a/examples/solid/router-monorepo-simple-lazy/packages/router/package.json +++ b/examples/solid/router-monorepo-simple-lazy/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.162.5", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/router-plugin": "^1.169.0", "redaxios": "^0.5.1", "zod": "^4.4.3", "solid-js": "^1.9.10" diff --git a/examples/solid/router-monorepo-simple/package.json b/examples/solid/router-monorepo-simple/package.json index 6b699785dc..3770256692 100644 --- a/examples/solid/router-monorepo-simple/package.json +++ b/examples/solid/router-monorepo-simple/package.json @@ -8,9 +8,9 @@ "dev": "pnpm router build && pnpm post-feature build && pnpm app dev" }, "dependencies": { - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "solid-js": "^1.9.10", "redaxios": "^0.5.1" }, diff --git a/examples/solid/router-monorepo-simple/packages/app/package.json b/examples/solid/router-monorepo-simple/packages/app/package.json index b10a4109b5..61234ac455 100644 --- a/examples/solid/router-monorepo-simple/packages/app/package.json +++ b/examples/solid/router-monorepo-simple/packages/app/package.json @@ -17,7 +17,7 @@ "vite-plugin-solid": "^2.11.11", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router-devtools": "^1.167.3", "vite": "^8.0.14", "tailwindcss": "^4.2.2", "vite-plugin-dts": "^4.5.4", diff --git a/examples/solid/router-monorepo-simple/packages/router/package.json b/examples/solid/router-monorepo-simple/packages/router/package.json index ea0e23fc57..ca08511d3e 100644 --- a/examples/solid/router-monorepo-simple/packages/router/package.json +++ b/examples/solid/router-monorepo-simple/packages/router/package.json @@ -9,8 +9,8 @@ "types": "./dist/index.d.ts", "dependencies": { "@tanstack/history": "^1.162.5", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/router-plugin": "^1.169.0", "redaxios": "^0.5.1", "zod": "^4.4.3", "solid-js": "^1.9.10" diff --git a/examples/solid/router-monorepo-solid-query/package.json b/examples/solid/router-monorepo-solid-query/package.json index a95915667e..3d9fd2e2d0 100644 --- a/examples/solid/router-monorepo-solid-query/package.json +++ b/examples/solid/router-monorepo-solid-query/package.json @@ -12,9 +12,9 @@ "dependencies": { "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "solid-js": "^1.9.10", "redaxios": "^0.5.1" }, diff --git a/examples/solid/router-monorepo-solid-query/packages/app/package.json b/examples/solid/router-monorepo-solid-query/packages/app/package.json index 80f711e201..76bb059de5 100644 --- a/examples/solid/router-monorepo-solid-query/packages/app/package.json +++ b/examples/solid/router-monorepo-solid-query/packages/app/package.json @@ -18,7 +18,7 @@ "vite-plugin-solid": "^2.11.11", "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router-devtools": "^1.167.3", "tailwindcss": "^4.2.2", "vite": "^8.0.14", "vite-plugin-dts": "^4.5.4", diff --git a/examples/solid/router-monorepo-solid-query/packages/router/package.json b/examples/solid/router-monorepo-solid-query/packages/router/package.json index b324f6300f..93943a1df8 100644 --- a/examples/solid/router-monorepo-solid-query/packages/router/package.json +++ b/examples/solid/router-monorepo-solid-query/packages/router/package.json @@ -10,8 +10,8 @@ "dependencies": { "@tanstack/history": "^1.162.5", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/router-plugin": "^1.169.0", "@router-solid-mono-solid-query/post-query": "workspace:*", "redaxios": "^0.5.1", "zod": "^4.4.3", diff --git a/examples/solid/scroll-restoration/package.json b/examples/solid/scroll-restoration/package.json index 88e83522bf..eaa5a5aaea 100644 --- a/examples/solid/scroll-restoration/package.json +++ b/examples/solid/scroll-restoration/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "@tanstack/solid-virtual": "^3.13.0", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" diff --git a/examples/solid/search-validator-adapters/package.json b/examples/solid/search-validator-adapters/package.json index d364db425e..59991edb36 100644 --- a/examples/solid/search-validator-adapters/package.json +++ b/examples/solid/search-validator-adapters/package.json @@ -13,9 +13,9 @@ "@tailwindcss/vite": "^4.2.2", "@tanstack/arktype-adapter": "^1.167.0", "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/router-plugin": "^1.169.0", "@tanstack/valibot-adapter": "^1.167.0", "@tanstack/zod-adapter": "^1.167.0", "arktype": "^2.1.7", @@ -25,13 +25,13 @@ "zod": "^3.24.2" }, "devDependencies": { - "@testing-library/jest-dom": "^6.6.3", + "@testing-library/jest-dom": "^7.0.1", "@solidjs/testing-library": "^0.8.10", "vite-plugin-solid": "^2.11.11", "@typescript/native": "npm:typescript@^7.0.2", "jsdom": "^27.0.0", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", - "vitest": "^4.1.4" + "vitest": "^5.0.4" } } diff --git a/examples/solid/search-validator-adapters/tests/arktype.test.tsx b/examples/solid/search-validator-adapters/tests/arktype.test.tsx index 4ec555fc7b..f22a359995 100644 --- a/examples/solid/search-validator-adapters/tests/arktype.test.tsx +++ b/examples/solid/search-validator-adapters/tests/arktype.test.tsx @@ -8,7 +8,6 @@ import { createRouter, } from '@tanstack/solid-router' -import '@testing-library/jest-dom/vitest' import { type } from 'arktype' test('can navigate to the route', async () => { diff --git a/examples/solid/search-validator-adapters/tests/jest-dom.setup.ts b/examples/solid/search-validator-adapters/tests/jest-dom.setup.ts new file mode 100644 index 0000000000..8f7cbf15be --- /dev/null +++ b/examples/solid/search-validator-adapters/tests/jest-dom.setup.ts @@ -0,0 +1,18 @@ +import * as jestDomMatchers from '@testing-library/jest-dom/matchers' +import { expect } from 'vitest' +import type { TestingLibraryMatchers } from '@testing-library/jest-dom/matchers' + +// Workaround for Vitest 5: remove once testing-library/jest-dom#742 is merged +// and released, and go back to `import '@testing-library/jest-dom/vitest'`. +// That entry imports `vitest` from its own install location, which can resolve +// a different Vitest copy than the one running these tests, and its types +// augment Vitest 4's `Assertion` instead of Vitest 5's `Matchers`. +// Keep `jest-dom` in this file name: vite-plugin-solid only skips injecting +// `@testing-library/jest-dom/vitest` when a setup file path contains it. +expect.extend(jestDomMatchers) + +declare module 'vitest' { + // Type parameter names must match Vitest's declaration for the interfaces to merge. + // eslint-disable-next-line @typescript-eslint/naming-convention + interface Matchers extends TestingLibraryMatchers {} +} diff --git a/examples/solid/search-validator-adapters/tests/valibot.test.tsx b/examples/solid/search-validator-adapters/tests/valibot.test.tsx index cd4545397c..8594c1cb29 100644 --- a/examples/solid/search-validator-adapters/tests/valibot.test.tsx +++ b/examples/solid/search-validator-adapters/tests/valibot.test.tsx @@ -8,7 +8,6 @@ import { createRouter, } from '@tanstack/solid-router' import * as v from 'valibot' -import '@testing-library/jest-dom/vitest' test('can navigate to the route', async () => { const rootRoute = createRootRoute() diff --git a/examples/solid/search-validator-adapters/vite.config.ts b/examples/solid/search-validator-adapters/vite.config.ts index 5b9dbebfef..4e05d81e75 100644 --- a/examples/solid/search-validator-adapters/vite.config.ts +++ b/examples/solid/search-validator-adapters/vite.config.ts @@ -11,6 +11,7 @@ export default defineConfig({ watch: false, environment: 'jsdom', typecheck: { enabled: true }, + setupFiles: ['./tests/jest-dom.setup.ts'], server: { deps: { inline: [/@solidjs/, /@tanstack\/solid-store/], diff --git a/examples/solid/start-basic-auth/README.md b/examples/solid/start-basic-auth/README.md index 90cba4aac1..313c930051 100644 --- a/examples/solid/start-basic-auth/README.md +++ b/examples/solid/start-basic-auth/README.md @@ -70,3 +70,13 @@ pnpm dev > [!WARNING] > You will need to update the `docs/config.json` file (in the project's repo) if you add a new doc page! + +## Session configuration + +This example uses [iron-session](https://github.com/vvo/iron-session) through Start's `getCookie` and `setCookie` helpers. Set `SESSION_PASSWORD` to a random secret of at least 32 characters before starting the app, for example: + +```sh +export SESSION_PASSWORD="$(openssl rand -base64 32)" +``` + +Keep the same secret across instances and deployments that must read the same sessions. The cookie requires HTTPS in production. Each handler reads its own session, then awaits `session.save()` before redirecting or returning. diff --git a/examples/solid/start-basic-auth/package.json b/examples/solid/start-basic-auth/package.json index 54eed098ae..d686fdf616 100644 --- a/examples/solid/start-basic-auth/package.json +++ b/examples/solid/start-basic-auth/package.json @@ -14,9 +14,10 @@ "@libsql/client": "^0.15.15", "@prisma/adapter-libsql": "^7.0.0", "@prisma/client": "^7.0.0", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.58", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-start": "^1.169.6", + "iron-session": "^9.0.1", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic-auth/src/routes/__root.tsx b/examples/solid/start-basic-auth/src/routes/__root.tsx index 3aa0bfa18b..05ad0d298a 100644 --- a/examples/solid/start-basic-auth/src/routes/__root.tsx +++ b/examples/solid/start-basic-auth/src/routes/__root.tsx @@ -14,18 +14,18 @@ import { DefaultCatchBoundary } from '~/components/DefaultCatchBoundary.js' import { NotFound } from '~/components/NotFound.js' import appCss from '~/styles/app.css?url' import { seo } from '~/utils/seo.js' -import { useAppSession } from '~/utils/session.js' +import { getAppSession } from '~/utils/session.js' const fetchUser = createServerFn({ method: 'GET' }).handler(async () => { // We need to auth on the server so we have access to secure cookies - const session = await useAppSession() + const session = await getAppSession() - if (!session.data.userEmail) { + if (!session.userEmail) { return null } return { - email: session.data.userEmail, + email: session.userEmail, } }) diff --git a/examples/solid/start-basic-auth/src/routes/_authed.tsx b/examples/solid/start-basic-auth/src/routes/_authed.tsx index 60ad613e56..cded7ca880 100644 --- a/examples/solid/start-basic-auth/src/routes/_authed.tsx +++ b/examples/solid/start-basic-auth/src/routes/_authed.tsx @@ -2,7 +2,7 @@ import { createFileRoute } from '@tanstack/solid-router' import { createServerFn } from '@tanstack/solid-start' import { hashPassword, prismaClient } from '~/utils/prisma' import { Login } from '~/components/Login' -import { useAppSession } from '~/utils/session' +import { getAppSession } from '~/utils/session' export const loginFn = createServerFn({ method: 'POST' }) .validator((d: { email: string; password: string }) => d) @@ -33,13 +33,10 @@ export const loginFn = createServerFn({ method: 'POST' }) } } - // Create a session - const session = await useAppSession() - // Store the user's email in the session - await session.update({ - userEmail: user.email, - }) + const session = await getAppSession() + session.userEmail = user.email + await session.save() }) export const Route = createFileRoute('/_authed')({ diff --git a/examples/solid/start-basic-auth/src/routes/logout.tsx b/examples/solid/start-basic-auth/src/routes/logout.tsx index f7d624ff15..56cd70cbc2 100644 --- a/examples/solid/start-basic-auth/src/routes/logout.tsx +++ b/examples/solid/start-basic-auth/src/routes/logout.tsx @@ -1,11 +1,10 @@ import { createFileRoute, redirect } from '@tanstack/solid-router' import { createServerFn } from '@tanstack/solid-start' -import { useAppSession } from '~/utils/session' +import { getAppSession } from '~/utils/session' const logoutFn = createServerFn().handler(async () => { - const session = await useAppSession() - - session.clear() + const session = await getAppSession() + session.destroy() throw redirect({ href: '/', diff --git a/examples/solid/start-basic-auth/src/routes/signup.tsx b/examples/solid/start-basic-auth/src/routes/signup.tsx index 7cb9ae7161..b8d6bf89fa 100644 --- a/examples/solid/start-basic-auth/src/routes/signup.tsx +++ b/examples/solid/start-basic-auth/src/routes/signup.tsx @@ -3,7 +3,7 @@ import { createServerFn, useServerFn } from '@tanstack/solid-start' import { hashPassword, prismaClient } from '~/utils/prisma' import { useMutation } from '~/hooks/useMutation' import { Auth } from '~/components/Auth' -import { useAppSession } from '~/utils/session' +import { getAppSession } from '~/utils/session' export const signupFn = createServerFn({ method: 'POST' }) .validator( @@ -20,9 +20,6 @@ export const signupFn = createServerFn({ method: 'POST' }) // Encrypt the password using Sha256 into plaintext const password = await hashPassword(data.password) - // Create a session - const session = await useAppSession() - if (found) { if (found.password !== password) { return { @@ -33,9 +30,9 @@ export const signupFn = createServerFn({ method: 'POST' }) } // Store the user's email in the session - await session.update({ - userEmail: found.email, - }) + const session = await getAppSession() + session.userEmail = found.email + await session.save() // Redirect to the prev page stored in the "redirect" search param throw redirect({ @@ -52,9 +49,9 @@ export const signupFn = createServerFn({ method: 'POST' }) }) // Store the user's email in the session - await session.update({ - userEmail: user.email, - }) + const session = await getAppSession() + session.userEmail = user.email + await session.save() // Redirect to the prev page stored in the "redirect" search param throw redirect({ diff --git a/examples/solid/start-basic-auth/src/utils/session.ts b/examples/solid/start-basic-auth/src/utils/session.ts index 120a410b60..4577764d28 100644 --- a/examples/solid/start-basic-auth/src/utils/session.ts +++ b/examples/solid/start-basic-auth/src/utils/session.ts @@ -1,13 +1,29 @@ -// src/services/session.server.ts -import { useSession } from '@tanstack/solid-start/server' +import { getIronSession } from 'iron-session' +import { getCookie, setCookie } from '@tanstack/solid-start/server' import type { User } from '@prisma/client' type SessionUser = { userEmail: User['email'] } -export function useAppSession() { - return useSession({ - password: 'ChangeThisBeforeShippingToProdOrYouWillBeFired', - }) +export function getAppSession() { + const password = process.env.SESSION_PASSWORD + if (!password || password.length < 32) { + throw new Error('Set SESSION_PASSWORD to at least 32 characters') + } + + return getIronSession( + { read: getCookie, write: setCookie }, + { + cookieName: 'app-session', + password, + ttl: 7 * 24 * 60 * 60, + cookieOptions: { + httpOnly: true, + sameSite: 'lax', + secure: process.env.NODE_ENV === 'production', + path: '/', + }, + }, + ) } diff --git a/examples/solid/start-basic-authjs/package.json b/examples/solid/start-basic-authjs/package.json index 8704cfa3fb..2c910663bd 100644 --- a/examples/solid/start-basic-authjs/package.json +++ b/examples/solid/start-basic-authjs/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@auth/core": "^0.41.1", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.58", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-start": "^1.169.6", "solid-js": "^1.9.10", "start-authjs": "^1.0.0", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic-cloudflare/package.json b/examples/solid/start-basic-cloudflare/package.json index 1509d37fcc..7ece143f61 100644 --- a/examples/solid/start-basic-cloudflare/package.json +++ b/examples/solid/start-basic-cloudflare/package.json @@ -12,9 +12,9 @@ "postinstall": "WRANGLER_LOG=warn npm run --silent cf-typegen" }, "dependencies": { - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.58", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-start": "^1.169.6", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-basic-netlify/package.json b/examples/solid/start-basic-netlify/package.json index 4a9f23a22a..69299cdb79 100644 --- a/examples/solid/start-basic-netlify/package.json +++ b/examples/solid/start-basic-netlify/package.json @@ -9,9 +9,9 @@ "preview": "vite preview" }, "dependencies": { - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.58", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-start": "^1.169.6", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-basic-nitro/package.json b/examples/solid/start-basic-nitro/package.json index 2d27ea5111..2c0dc7dad6 100644 --- a/examples/solid/start-basic-nitro/package.json +++ b/examples/solid/start-basic-nitro/package.json @@ -9,9 +9,9 @@ "preview": "vite preview" }, "dependencies": { - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.58", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-start": "^1.169.6", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-basic-solid-query/package.json b/examples/solid/start-basic-solid-query/package.json index 06c10bade1..ddbb7d8764 100644 --- a/examples/solid/start-basic-solid-query/package.json +++ b/examples/solid/start-basic-solid-query/package.json @@ -12,10 +12,10 @@ "dependencies": { "@tanstack/solid-query": "^5.90.9", "@tanstack/solid-query-devtools": "^5.90.0", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "@tanstack/solid-router-ssr-query": "^1.167.3", - "@tanstack/solid-start": "^1.168.58", + "@tanstack/solid-start": "^1.169.6", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic-static/package.json b/examples/solid/start-basic-static/package.json index bbd49252bc..8b639da68a 100644 --- a/examples/solid/start-basic-static/package.json +++ b/examples/solid/start-basic-static/package.json @@ -10,10 +10,10 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.58", - "@tanstack/start-static-server-functions": "^1.167.40", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-start": "^1.169.6", + "@tanstack/start-static-server-functions": "^1.167.44", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-basic/package.json b/examples/solid/start-basic/package.json index 6d29c027f3..758815b669 100644 --- a/examples/solid/start-basic/package.json +++ b/examples/solid/start-basic/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.58", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-start": "^1.169.6", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0" diff --git a/examples/solid/start-bun/package.json b/examples/solid/start-bun/package.json index 1a17de205a..d1ad9a9563 100644 --- a/examples/solid/start-bun/package.json +++ b/examples/solid/start-bun/package.json @@ -15,11 +15,11 @@ "dependencies": { "@tailwindcss/vite": "^4.2.2", "@tanstack/solid-devtools": "^0.7.0", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "@tanstack/solid-router-ssr-query": "^1.167.3", - "@tanstack/solid-start": "^1.168.58", - "@tanstack/router-plugin": "^1.168.43", + "@tanstack/solid-start": "^1.169.6", + "@tanstack/router-plugin": "^1.169.0", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2" }, @@ -35,7 +35,7 @@ "@typescript/native": "npm:typescript@^7.0.2", "typescript": "npm:@typescript/typescript6@^6.0.2", "vite": "^8.0.14", - "vitest": "^4.1.4", + "vitest": "^5.0.4", "web-vitals": "^5.1.0" } } diff --git a/examples/solid/start-convex-better-auth/package.json b/examples/solid/start-convex-better-auth/package.json index 918658480b..ea13a1c1e3 100644 --- a/examples/solid/start-convex-better-auth/package.json +++ b/examples/solid/start-convex-better-auth/package.json @@ -13,9 +13,9 @@ "dependencies": { "@convex-dev/better-auth": "^0.9.7", "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.58", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-start": "^1.169.6", "better-auth": "^1.6.19", "clsx": "^2.1.1", "convex": "^1.28.2", diff --git a/examples/solid/start-counter/package.json b/examples/solid/start-counter/package.json index 25ea8d95b6..8b49c516bd 100644 --- a/examples/solid/start-counter/package.json +++ b/examples/solid/start-counter/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.58", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-start": "^1.169.6", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0", diff --git a/examples/solid/start-i18n-paraglide/package.json b/examples/solid/start-i18n-paraglide/package.json index 824c904371..076c9b41dc 100644 --- a/examples/solid/start-i18n-paraglide/package.json +++ b/examples/solid/start-i18n-paraglide/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tanstack/solid-devtools": "^0.7.0", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.58", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-start": "^1.169.6", "solid-js": "^1.9.10" }, "devDependencies": { diff --git a/examples/solid/start-large/package.json b/examples/solid/start-large/package.json index 7d186c8a53..83f3589cc2 100644 --- a/examples/solid/start-large/package.json +++ b/examples/solid/start-large/package.json @@ -13,9 +13,9 @@ }, "dependencies": { "@tanstack/solid-query": "^5.90.9", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.58", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-start": "^1.169.6", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0", diff --git a/examples/solid/start-streaming-data-from-server-functions/package.json b/examples/solid/start-streaming-data-from-server-functions/package.json index ac6f60d2c7..83e0719b39 100644 --- a/examples/solid/start-streaming-data-from-server-functions/package.json +++ b/examples/solid/start-streaming-data-from-server-functions/package.json @@ -10,9 +10,9 @@ "start": "pnpx srvx --prod -s ../client dist/server/server.js" }, "dependencies": { - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.58", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-start": "^1.169.6", "solid-js": "^1.9.10", "zod": "^4.4.3" }, diff --git a/examples/solid/start-supabase-basic/package.json b/examples/solid/start-supabase-basic/package.json index c8f3e888d8..81ab5cd63c 100644 --- a/examples/solid/start-supabase-basic/package.json +++ b/examples/solid/start-supabase-basic/package.json @@ -14,9 +14,9 @@ "dependencies": { "@supabase/ssr": "^0.5.2", "@supabase/supabase-js": "^2.48.1", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.58", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-start": "^1.169.6", "solid-js": "^1.9.9", "redaxios": "^0.5.1" }, diff --git a/examples/solid/start-tailwind-v4/package.json b/examples/solid/start-tailwind-v4/package.json index 4a29a5477f..94db6ac790 100644 --- a/examples/solid/start-tailwind-v4/package.json +++ b/examples/solid/start-tailwind-v4/package.json @@ -10,9 +10,9 @@ "start": "node .output/server/index.mjs" }, "dependencies": { - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", - "@tanstack/solid-start": "^1.168.58", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", + "@tanstack/solid-start": "^1.169.6", "solid-js": "^1.9.10", "tailwind-merge": "^3.6.0", "zod": "^4.4.3" diff --git a/examples/solid/view-transitions/package.json b/examples/solid/view-transitions/package.json index eecdf6dd1b..2acb2432bf 100644 --- a/examples/solid/view-transitions/package.json +++ b/examples/solid/view-transitions/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.43", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.169.0", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "tailwindcss": "^4.2.2", diff --git a/examples/solid/with-framer-motion/package.json b/examples/solid/with-framer-motion/package.json index 8d536271de..449d8a3927 100644 --- a/examples/solid/with-framer-motion/package.json +++ b/examples/solid/with-framer-motion/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "redaxios": "^0.5.1", "solid-js": "^1.9.10", "solid-motionone": "^1.0.4", diff --git a/examples/solid/with-trpc/package.json b/examples/solid/with-trpc/package.json index ad3b9f4798..46d33436db 100644 --- a/examples/solid/with-trpc/package.json +++ b/examples/solid/with-trpc/package.json @@ -11,9 +11,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.43", - "@tanstack/solid-router": "^1.170.39", - "@tanstack/solid-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.169.0", + "@tanstack/solid-router": "^1.170.43", + "@tanstack/solid-router-devtools": "^1.167.3", "@trpc/client": "^11.4.3", "@trpc/server": "^11.4.3", "express": "^5.2.1", diff --git a/examples/vue/basic-file-based-jsx/package.json b/examples/vue/basic-file-based-jsx/package.json index 25540d1e9f..9cc36a6991 100644 --- a/examples/vue/basic-file-based-jsx/package.json +++ b/examples/vue/basic-file-based-jsx/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.43", - "@tanstack/vue-router": "^1.170.38", - "@tanstack/vue-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.169.0", + "@tanstack/vue-router": "^1.170.42", + "@tanstack/vue-router-devtools": "^1.167.3", "redaxios": "^0.5.1", "tailwindcss": "^4.2.2", "vue": "^3.5.16", diff --git a/examples/vue/basic-file-based-jsx/src/routeTree.gen.ts b/examples/vue/basic-file-based-jsx/src/routeTree.gen.ts index 3922025c82..5922c5f7b1 100644 --- a/examples/vue/basic-file-based-jsx/src/routeTree.gen.ts +++ b/examples/vue/basic-file-based-jsx/src/routeTree.gen.ts @@ -364,7 +364,7 @@ declare module '@tanstack/vue-router' { '/(group)/_layout': { id: '/(group)/_layout' path: '' - fullPath: '' + fullPath: '/' preLoaderRoute: typeof groupLayoutRouteImport parentRoute: typeof rootRouteImport } diff --git a/examples/vue/basic-file-based-sfc/package.json b/examples/vue/basic-file-based-sfc/package.json index 9028ad5c22..87ab2c332b 100644 --- a/examples/vue/basic-file-based-sfc/package.json +++ b/examples/vue/basic-file-based-sfc/package.json @@ -10,9 +10,9 @@ }, "dependencies": { "@tailwindcss/vite": "^4.2.2", - "@tanstack/router-plugin": "^1.168.43", - "@tanstack/vue-router": "^1.170.38", - "@tanstack/vue-router-devtools": "^1.167.2", + "@tanstack/router-plugin": "^1.169.0", + "@tanstack/vue-router": "^1.170.42", + "@tanstack/vue-router-devtools": "^1.167.3", "redaxios": "^0.5.1", "tailwindcss": "^4.2.2", "vue": "^3.5.16", diff --git a/examples/vue/basic-file-based-sfc/src/routeTree.gen.ts b/examples/vue/basic-file-based-sfc/src/routeTree.gen.ts index 09d62b0706..0bfdddab3d 100644 --- a/examples/vue/basic-file-based-sfc/src/routeTree.gen.ts +++ b/examples/vue/basic-file-based-sfc/src/routeTree.gen.ts @@ -454,7 +454,7 @@ declare module '@tanstack/vue-router' { '/(group)/_layout': { id: '/(group)/_layout' path: '' - fullPath: '' + fullPath: '/' preLoaderRoute: typeof groupLayoutRouteImport parentRoute: typeof rootRouteImport } diff --git a/examples/vue/basic/package.json b/examples/vue/basic/package.json index 528b59db7b..af74afff3a 100644 --- a/examples/vue/basic/package.json +++ b/examples/vue/basic/package.json @@ -9,8 +9,8 @@ "start": "vite" }, "dependencies": { - "@tanstack/vue-router": "^1.170.38", - "@tanstack/vue-router-devtools": "^1.167.2", + "@tanstack/vue-router": "^1.170.42", + "@tanstack/vue-router-devtools": "^1.167.3", "redaxios": "^0.5.1", "vue": "^3.5.13", "tailwindcss": "4.1.18" diff --git a/labeler-config.yml b/labeler-config.yml index c1ad49328e..9da92bf7ff 100644 --- a/labeler-config.yml +++ b/labeler-config.yml @@ -10,9 +10,6 @@ 'package: history': - changed-files: - any-glob-to-any-file: 'packages/history/**/*' -'package: nitro-v2-vite-plugin': - - changed-files: - - any-glob-to-any-file: 'packages/nitro-v2-vite-plugin/**/*' 'package: react-router': - changed-files: - any-glob-to-any-file: 'packages/react-router/**/*' diff --git a/nx.json b/nx.json index 9f9d782278..b7df8b2c09 100644 --- a/nx.json +++ b/nx.json @@ -1,6 +1,7 @@ { "$schema": "./node_modules/nx/schemas/nx-schema.json", "defaultBase": "main", + "bust": "nx24-exclusive-e2e-16-medium-baseline-2026-10-25-05", "nxCloudId": "6442f7de8226a6291646a813", "useInferencePlugins": false, "parallel": 5, @@ -10,7 +11,10 @@ "namedInputs": { "sharedGlobals": [ "{workspaceRoot}/.npmrc", - "{workspaceRoot}/.nx/workflows/sandboxing-config.yaml", + "{workspaceRoot}/nx.json", + "{workspaceRoot}/.github/workflows/pr.yml", + "{workspaceRoot}/.nx/ci-config.yaml", + "{workspaceRoot}/.nx/workflows/ultracache-config.yaml", "{workspaceRoot}/.nvmrc", "{workspaceRoot}/package.json", "{workspaceRoot}/tsconfig.json" @@ -41,7 +45,7 @@ "targetDefaults": { "test:docs": { "cache": true, - "inputs": ["{workspaceRoot}/docs/**/*"] + "inputs": ["sharedGlobals", "{workspaceRoot}/docs/**/*"] }, "test:eslint": { "cache": true, diff --git a/package.json b/package.json index 5876d0893d..3ef11b1969 100644 --- a/package.json +++ b/package.json @@ -5,17 +5,17 @@ "type": "git", "url": "git+https://github.com/TanStack/router.git" }, - "packageManager": "pnpm@11.21.0", + "packageManager": "pnpm@12.18.0", "engines": { - "pnpm": ">=11.21.0" + "pnpm": ">=12.18.0" }, "type": "module", "scripts": { "cleanNodeModules": "pnpm -r exec rm -rf node_modules", "clean": "pnpm --filter \"./packages/**\" run clean", "test": "pnpm run test:ci", - "test:pr": "nx affected --targets=test:eslint,test:unit,test:e2e,test:types,test:build,build", - "test:ci": "nx run-many --targets=test:eslint,test:unit,test:e2e,test:types,test:build,build", + "test:pr": "nx affected --targets=test:eslint,test:unit,test:integration,test:e2e,test:types,test:build,build", + "test:ci": "nx run-many --targets=test:eslint,test:unit,test:integration,test:e2e,test:types,test:build,build", "test:eslint": "nx affected --target=test:eslint --exclude=examples/**,e2e/**", "test:unit": "nx affected --target=test:unit --exclude=examples/**,e2e/**", "test:unit:dev": "pnpm run test:unit && nx watch --all -- pnpm run test:unit", @@ -65,7 +65,7 @@ "devDependencies": { "@changesets/changelog-github": "^0.7.0", "@changesets/cli": "^2.30.0", - "@nx/devkit": "23.2.0", + "@nx/devkit": "24.0.0", "@playwright/test": "catalog:", "@swc-node/register": "^1.11.1", "@tanstack/eslint-config": "0.4.0", @@ -73,7 +73,7 @@ "eslint": "catalog:", "eslint-plugin-unused-imports": "^4.1.4", "markdown-link-extractor": "^4.0.3", - "nx": "23.2.0", + "nx": "24.0.0", "prettier": "^3.8.0", "tinyglobby": "^0.2.15", "typescript": "npm:@typescript/typescript6@^6.0.2", diff --git a/packages/arktype-adapter/tests/index.test.tsx b/packages/arktype-adapter/tests/index.test.tsx index a99ecda9c4..ce6eb74756 100644 --- a/packages/arktype-adapter/tests/index.test.tsx +++ b/packages/arktype-adapter/tests/index.test.tsx @@ -9,7 +9,6 @@ import { cleanup, fireEvent, render, screen } from '@testing-library/react' import { afterEach, expect, test, vi } from 'vitest' import { type } from 'arktype' import { arkTypeValidator } from '../src' -import '@testing-library/jest-dom/vitest' afterEach(() => { vi.resetAllMocks() diff --git a/packages/arktype-adapter/tests/jest-dom.setup.ts b/packages/arktype-adapter/tests/jest-dom.setup.ts new file mode 100644 index 0000000000..8f7cbf15be --- /dev/null +++ b/packages/arktype-adapter/tests/jest-dom.setup.ts @@ -0,0 +1,18 @@ +import * as jestDomMatchers from '@testing-library/jest-dom/matchers' +import { expect } from 'vitest' +import type { TestingLibraryMatchers } from '@testing-library/jest-dom/matchers' + +// Workaround for Vitest 5: remove once testing-library/jest-dom#742 is merged +// and released, and go back to `import '@testing-library/jest-dom/vitest'`. +// That entry imports `vitest` from its own install location, which can resolve +// a different Vitest copy than the one running these tests, and its types +// augment Vitest 4's `Assertion` instead of Vitest 5's `Matchers`. +// Keep `jest-dom` in this file name: vite-plugin-solid only skips injecting +// `@testing-library/jest-dom/vitest` when a setup file path contains it. +expect.extend(jestDomMatchers) + +declare module 'vitest' { + // Type parameter names must match Vitest's declaration for the interfaces to merge. + // eslint-disable-next-line @typescript-eslint/naming-convention + interface Matchers extends TestingLibraryMatchers {} +} diff --git a/packages/arktype-adapter/vite.config.ts b/packages/arktype-adapter/vite.config.ts index 8c8c0c519f..8d553e0a59 100644 --- a/packages/arktype-adapter/vite.config.ts +++ b/packages/arktype-adapter/vite.config.ts @@ -9,6 +9,7 @@ const config = defineConfig({ watch: false, environment: 'jsdom', typecheck: { enabled: true }, + setupFiles: ['./tests/jest-dom.setup.ts'], }, }) diff --git a/packages/nitro-v2-vite-plugin/CHANGELOG.md b/packages/nitro-v2-vite-plugin/CHANGELOG.md deleted file mode 100644 index 0ac463cae8..0000000000 --- a/packages/nitro-v2-vite-plugin/CHANGELOG.md +++ /dev/null @@ -1,31 +0,0 @@ -# @tanstack/nitro-v2-vite-plugin - -## 1.155.2 - -### Patch Changes - -- [#8300](https://github.com/TanStack/router/pull/8300) [`49bcd4d`](https://github.com/TanStack/router/commit/49bcd4db743dba4a783d5533a42a0f97a5721292) - Refresh compatible build and runtime dependencies. - -## 1.155.1 - -### Patch Changes - -- [#8251](https://github.com/TanStack/router/pull/8251) [`0497cae`](https://github.com/TanStack/router/commit/0497caeef3ff7e1c1c6080eca38bca24e7ec320b) - Use URL.canParse for absolute URL checks in links, navigation, redirects, and build configuration. Preserve a URL constructor fallback for older browsers. - -## 1.155.0 - -### Minor Changes - -- Clean minor bump, fresh start ([#7395](https://github.com/TanStack/router/pull/7395)) - -## 1.154.9 - -### Patch Changes - -- build: update to vite-config 5.x (rolldown) ([#6926](https://github.com/TanStack/router/pull/6926)) - -## 1.154.8 - -### Patch Changes - -- fix: build with @tanstack/vite-config 0.4.3 ([#6923](https://github.com/TanStack/router/pull/6923)) diff --git a/packages/nitro-v2-vite-plugin/README.md b/packages/nitro-v2-vite-plugin/README.md deleted file mode 100644 index 5882e61120..0000000000 --- a/packages/nitro-v2-vite-plugin/README.md +++ /dev/null @@ -1 +0,0 @@ -# Experimental Nitro v2 Vite Plugin diff --git a/packages/nitro-v2-vite-plugin/eslint.config.js b/packages/nitro-v2-vite-plugin/eslint.config.js deleted file mode 100644 index 8ce6ad05fc..0000000000 --- a/packages/nitro-v2-vite-plugin/eslint.config.js +++ /dev/null @@ -1,5 +0,0 @@ -// @ts-check - -import rootConfig from '../../eslint.config.js' - -export default [...rootConfig] diff --git a/packages/nitro-v2-vite-plugin/package.json b/packages/nitro-v2-vite-plugin/package.json deleted file mode 100644 index 6db01313f2..0000000000 --- a/packages/nitro-v2-vite-plugin/package.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "name": "@tanstack/nitro-v2-vite-plugin", - "version": "1.155.2", - "description": "Modern and scalable routing for React applications", - "author": "Tanner Linsley", - "license": "MIT", - "repository": { - "type": "git", - "url": "git+https://github.com/TanStack/router.git", - "directory": "packages/nitro-v2-vite-plugin" - }, - "homepage": "https://tanstack.com/router", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/tannerlinsley" - }, - "keywords": [ - "react", - "location", - "router", - "routing", - "async", - "async router", - "typescript" - ], - "scripts": { - "clean": "rimraf ./dist && rimraf ./coverage", - "test": "pnpm test:eslint && pnpm test:types && pnpm test:build && pnpm test:unit", - "test:unit": "echo 'No unit tests are needed here since we do them in @tanstack/router-plugin!'", - "test:eslint": "eslint ./src", - "test:types": "pnpm run \"/^test:types:ts[0-9]{2}$/\"", - "test:types:ts56": "node ../../node_modules/typescript56/lib/tsc.js", - "test:types:ts57": "node ../../node_modules/typescript57/lib/tsc.js", - "test:types:ts58": "node ../../node_modules/typescript58/lib/tsc.js", - "test:types:ts59": "node ../../node_modules/typescript59/lib/tsc.js", - "test:types:ts60": "tsc6", - "test:types:ts70": "tsc", - "test:build": "publint --strict && attw --ignore-rules no-resolution --pack .", - "build": "vite build" - }, - "type": "module", - "types": "dist/esm/index.d.ts", - "main": "dist/cjs/index.cjs", - "module": "dist/esm/index.js", - "exports": { - ".": { - "import": { - "types": "./dist/esm/index.d.ts", - "default": "./dist/esm/index.js" - } - }, - "./package.json": "./package.json" - }, - "sideEffects": false, - "files": [ - "dist", - "src" - ], - "engines": { - "node": ">=22.12" - }, - "dependencies": { - "nitropack": "^2.13.4", - "pathe": "catalog:" - }, - "peerDependencies": { - "vite": ">=7.0.0" - }, - "devDependencies": { - "@tanstack/vite-config": "catalog:", - "vitest": "catalog:", - "@arethetypeswrong/cli": "catalog:", - "publint": "catalog:", - "rimraf": "catalog:" - } -} diff --git a/packages/nitro-v2-vite-plugin/src/index.ts b/packages/nitro-v2-vite-plugin/src/index.ts deleted file mode 100644 index 9adf8d8577..0000000000 --- a/packages/nitro-v2-vite-plugin/src/index.ts +++ /dev/null @@ -1,188 +0,0 @@ -import { build, copyPublicAssets, createNitro, prepare } from 'nitropack' -import { dirname, resolve } from 'pathe' - -import type { PluginOption, ResolvedConfig, Rollup } from 'vite' -import type { NitroConfig } from 'nitropack' - -let ssrBundle: Rollup.OutputBundle -let ssrEntryFile: string - -export function nitroV2Plugin(nitroConfig?: NitroConfig): Array { - let resolvedConfig: ResolvedConfig - return [ - { - name: 'tanstack-nitro-v2-vite-plugin', - - generateBundle: { - handler(_options, bundle) { - if (this.environment.name !== 'ssr') { - return - } - - // find entry point of ssr bundle - let entryFile: string | undefined - for (const [_name, file] of Object.entries(bundle)) { - if (file.type === 'chunk') { - if (file.isEntry) { - if (entryFile !== undefined) { - this.error( - `Multiple entry points found for service "${this.environment.name}". Only one entry point is allowed.`, - ) - } - entryFile = file.fileName - } - } - } - if (entryFile === undefined) { - this.error( - `No entry point found for service "${this.environment.name}".`, - ) - } - ssrEntryFile = entryFile! - ssrBundle = bundle - }, - }, - - configResolved(config) { - resolvedConfig = config - }, - config(_, env) { - if (env.command !== 'build') { - return - } - - return { - environments: { - ssr: { - consumer: 'server', - build: { - ssr: true, - // we don't write to the file system as the below 'capture-output' plugin will - // capture the output and write it to the virtual file system - write: false, - copyPublicDir: false, - commonjsOptions: { - include: [/node_modules/], - }, - }, - }, - }, - builder: { - sharedPlugins: true, - async buildApp(builder) { - const client = builder.environments.client - const server = builder.environments.ssr - - if (!client) { - throw new Error('Client environment not found') - } - - if (!server) { - throw new Error('SSR environment not found') - } - - await builder.build(client) - await builder.build(server) - - const virtualEntry = '#tanstack/start/entry' - const baseURL = !URL.canParse(resolvedConfig.base) - ? resolvedConfig.base - : undefined - const config: NitroConfig = { - baseURL, - publicAssets: [ - { - dir: client.config.build.outDir, - maxAge: 31536000, // 1 year - baseURL: '/', - }, - ], - ...nitroConfig, - esbuild: { - options: { - target: server.config.build.target || undefined, - ...nitroConfig?.esbuild?.options, - }, - }, - renderer: virtualEntry, - rollupConfig: { - ...nitroConfig?.rollupConfig, - plugins: [virtualBundlePlugin(ssrBundle) as any], - }, - virtual: { - ...nitroConfig?.virtual, - [virtualEntry]: `import { fromWebHandler } from 'h3' - import handler from '${ssrEntryFile}' - export default fromWebHandler(handler.fetch)`, - }, - } - - const nitro = await createNitro(config) - - await prepare(nitro) - await copyPublicAssets(nitro) - await build(nitro) - - await nitro.close() - }, - }, - } - }, - }, - ] -} - -function virtualBundlePlugin(bundle: Rollup.OutputBundle): Rollup.Plugin { - type VirtualModule = { code: string; map: string | null } - let _modules: Map | null = null - - // lazy initialize _modules since at the time of plugin creation, the bundles are not available yet - const getModules = () => { - if (_modules) { - return _modules - } - _modules = new Map() - // group chunks and source maps - for (const [fileName, content] of Object.entries(bundle)) { - if (content.type === 'chunk') { - const virtualModule: VirtualModule = { - code: content.code, - map: null, - } - const maybeMap = bundle[`${fileName}.map`] - if (maybeMap && maybeMap.type === 'asset') { - virtualModule.map = maybeMap.source as string - } - _modules.set(fileName, virtualModule) - _modules.set(resolve(fileName), virtualModule) - } - } - return _modules - } - - return { - name: 'virtual-bundle', - resolveId(id, importer) { - const modules = getModules() - if (modules.has(id)) { - return resolve(id) - } - - if (importer) { - const resolved = resolve(dirname(importer), id) - if (modules.has(resolved)) { - return resolved - } - } - return null - }, - load(id) { - const modules = getModules() - const m = modules.get(id) - if (!m) { - return null - } - return m - }, - } -} diff --git a/packages/nitro-v2-vite-plugin/tsconfig.build.json b/packages/nitro-v2-vite-plugin/tsconfig.build.json deleted file mode 100644 index 92be18587f..0000000000 --- a/packages/nitro-v2-vite-plugin/tsconfig.build.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "rootDir": "./src" - }, - "include": ["src"] -} diff --git a/packages/nitro-v2-vite-plugin/tsconfig.json b/packages/nitro-v2-vite-plugin/tsconfig.json deleted file mode 100644 index bd398a8728..0000000000 --- a/packages/nitro-v2-vite-plugin/tsconfig.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "include": ["src", "vite.config.ts", "tests"], - "exclude": ["tests/test-files/**", "tests/snapshots/**"], - "compilerOptions": { - "jsx": "react-jsx" - } -} diff --git a/packages/nitro-v2-vite-plugin/vite.config.ts b/packages/nitro-v2-vite-plugin/vite.config.ts deleted file mode 100644 index 7401092b13..0000000000 --- a/packages/nitro-v2-vite-plugin/vite.config.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { defineConfig, mergeConfig } from 'vitest/config' -import { tanstackViteConfig } from '@tanstack/vite-config' - -const config = defineConfig({}) - -export default mergeConfig( - config, - tanstackViteConfig({ - tsconfigPath: './tsconfig.build.json', - entry: './src/index.ts', - srcDir: './src', - exclude: ['./src/tests/'], - }), -) diff --git a/packages/react-router-devtools/CHANGELOG.md b/packages/react-router-devtools/CHANGELOG.md index 963524b66d..f74de5f187 100644 --- a/packages/react-router-devtools/CHANGELOG.md +++ b/packages/react-router-devtools/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/react-router-devtools +## 1.167.3 + +### Patch Changes + +- Updated dependencies [[`bbf9b75`](https://github.com/TanStack/router/commit/bbf9b75808d8eee497a6dd1663f0cf08426512e0)]: + - @tanstack/router-devtools-core@1.168.3 + ## 1.167.2 ### Patch Changes diff --git a/packages/react-router-devtools/package.json b/packages/react-router-devtools/package.json index fd750b4c2b..969371a6a6 100644 --- a/packages/react-router-devtools/package.json +++ b/packages/react-router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router-devtools", - "version": "1.167.2", + "version": "1.167.3", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-router/CHANGELOG.md b/packages/react-router/CHANGELOG.md index 4c4b343b32..7e1e2f1a62 100644 --- a/packages/react-router/CHANGELOG.md +++ b/packages/react-router/CHANGELOG.md @@ -1,5 +1,37 @@ # @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 diff --git a/packages/react-router/package.json b/packages/react-router/package.json index fca9731bde..9a61d5af25 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-router", - "version": "1.170.42", + "version": "1.170.46", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", @@ -86,7 +86,9 @@ "sideEffects": false, "files": [ "dist", - "src" + "src", + "skills", + "!skills/_artifacts" ], "engines": { "node": ">=20.19" diff --git a/packages/react-router/skills/compositions/router-query/SKILL.md b/packages/react-router/skills/compositions/router-query/SKILL.md index ce634b5068..4fdd74fc30 100644 --- a/packages/react-router/skills/compositions/router-query/SKILL.md +++ b/packages/react-router/skills/compositions/router-query/SKILL.md @@ -21,7 +21,7 @@ sources: # TanStack Router + TanStack Query Integration -This skill requires familiarity with both TanStack Router and TanStack Query. Read [router-core](../../../../router-core/skills/router-core/SKILL.md) and [react-router](../../react-router/SKILL.md) first. +This skill requires familiarity with both TanStack Router and TanStack Query. Read `@tanstack/router-core#router-core` and [react-router](../../react-router/SKILL.md) first. This skill covers coordinating TanStack Query as an external data cache with TanStack Router's loader system. The router acts as a **coordinator** — it triggers data fetching during navigation, while Query manages caching, background refetching, and data lifecycle. @@ -437,5 +437,5 @@ TanStack Router has its own SWR cache (`staleTime`, `gcTime`, `defaultPreloadSta ## Cross-References -- [router-core/data-loading](../../../../router-core/skills/router-core/data-loading/SKILL.md) — built-in loader caching fundamentals -- [router-core/ssr](../../../../router-core/skills/router-core/ssr/SKILL.md) — SSR setup for dehydration/hydration +- `@tanstack/router-core#router-core/data-loading` — built-in loader caching fundamentals +- `@tanstack/router-core#router-core/ssr` — SSR setup for dehydration/hydration diff --git a/packages/react-router/skills/react-router/SKILL.md b/packages/react-router/skills/react-router/SKILL.md index ba628f7003..f8df76df02 100644 --- a/packages/react-router/skills/react-router/SKILL.md +++ b/packages/react-router/skills/react-router/SKILL.md @@ -23,7 +23,7 @@ sources: # React Router (`@tanstack/react-router`) -This skill builds on router-core. Read [router-core](../../../router-core/skills/router-core/SKILL.md) first for foundational concepts. +This skill builds on router-core. Read `@tanstack/router-core#router-core` first for foundational concepts. > **CRITICAL**: TanStack Router types are FULLY INFERRED. Never cast, never annotate inferred values. > **CRITICAL**: TanStack Router is CLIENT-FIRST. Loaders run on the client by default, not on the server. @@ -495,4 +495,4 @@ function App() { ## Cross-References -- [router-core/SKILL.md](../../../router-core/skills/router-core/SKILL.md) — all sub-skills for domain-specific patterns (search params, data loading, navigation, auth, SSR, etc.) +- `@tanstack/router-core#router-core` — all sub-skills for domain-specific patterns (search params, data loading, navigation, auth, SSR, etc.) diff --git a/packages/react-router/tests/Scripts.test.tsx b/packages/react-router/tests/Scripts.test.tsx index 893cef01bc..976410cba5 100644 --- a/packages/react-router/tests/Scripts.test.tsx +++ b/packages/react-router/tests/Scripts.test.tsx @@ -547,6 +547,35 @@ describe('ssr HeadContent', () => { ) }) + test('renders manifest module preloads with low fetch priority', async () => { + const preloadHref = '/low-priority-module.js' + const rootRoute = createRootRoute({ + component: () => , + }) + const indexRoute = createRoute({ + path: '/', + getParentRoute: () => rootRoute, + }) + const router = createRouter({ + history: createMemoryHistory({ initialEntries: ['/'] }), + routeTree: rootRoute.addChildren([indexRoute]), + isServer: true, + }) + + router.ssr = { + manifest: createTestManifest(rootRoute.id, { preloadHref }), + } + + await router.load() + + const html = ReactDOMServer.renderToString( + , + ) + expect(html).toContain( + ``, + ) + }) + test('keeps manifest stylesheet links mounted when history state changes', async () => { const history = createTestBrowserHistory() const stylesheetHref = '/history-state.css' @@ -745,7 +774,7 @@ describe('ssr HeadContent', () => { ).toBe('.runtime{color:red}') }) - test('renders preload as script links for iife manifest preloads', async () => { + test('renders iife manifest preloads as low priority script links', async () => { const history = createTestBrowserHistory() const preloadHref = '/iife-preload.js' @@ -795,6 +824,13 @@ describe('ssr HeadContent', () => { `link[rel="modulepreload"][href="${preloadHref}"]`, ), ).toBeFalsy() + expect( + document.head + .querySelector( + `link[rel="preload"][as="script"][href="${preloadHref}"]`, + ) + ?.getAttribute('fetchpriority'), + ).toBe('low') }) test('assetCrossOrigin overrides manifest crossOrigin values', async () => { diff --git a/packages/react-router/tests/blocker.test.tsx b/packages/react-router/tests/blocker.test.tsx index 60d1e8a821..3ed3c3039e 100644 --- a/packages/react-router/tests/blocker.test.tsx +++ b/packages/react-router/tests/blocker.test.tsx @@ -1,5 +1,4 @@ import React from 'react' -import '@testing-library/jest-dom/vitest' import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest' import { cleanup, fireEvent, render, screen } from '@testing-library/react' import combinate from 'combinate' diff --git a/packages/react-router/tests/jest-dom.setup.ts b/packages/react-router/tests/jest-dom.setup.ts new file mode 100644 index 0000000000..8f7cbf15be --- /dev/null +++ b/packages/react-router/tests/jest-dom.setup.ts @@ -0,0 +1,18 @@ +import * as jestDomMatchers from '@testing-library/jest-dom/matchers' +import { expect } from 'vitest' +import type { TestingLibraryMatchers } from '@testing-library/jest-dom/matchers' + +// Workaround for Vitest 5: remove once testing-library/jest-dom#742 is merged +// and released, and go back to `import '@testing-library/jest-dom/vitest'`. +// That entry imports `vitest` from its own install location, which can resolve +// a different Vitest copy than the one running these tests, and its types +// augment Vitest 4's `Assertion` instead of Vitest 5's `Matchers`. +// Keep `jest-dom` in this file name: vite-plugin-solid only skips injecting +// `@testing-library/jest-dom/vitest` when a setup file path contains it. +expect.extend(jestDomMatchers) + +declare module 'vitest' { + // Type parameter names must match Vitest's declaration for the interfaces to merge. + // eslint-disable-next-line @typescript-eslint/naming-convention + interface Matchers extends TestingLibraryMatchers {} +} diff --git a/packages/react-router/tests/link.bench.tsx b/packages/react-router/tests/link.bench.tsx index 239173340b..6871afc8a4 100644 --- a/packages/react-router/tests/link.bench.tsx +++ b/packages/react-router/tests/link.bench.tsx @@ -1,5 +1,5 @@ import { render } from '@testing-library/react' -import { bench, describe } from 'vitest' +import { describe, test } from 'vitest' import { getRouteSegments } from '@tanstack/router-core' import { Link, @@ -82,9 +82,8 @@ describe.each([ ])('$name', ({ numberOfRoutes, numberOfLinks, matchedParamId }) => { const renderRouter = createRouterRenderer(numberOfRoutes) - bench( - 'hardcoded href', - () => { + test('hardcoded href', async ({ bench }) => { + await bench('hardcoded href', () => { const router = renderRouter( Array.from({ length: numberOfLinks }).map((_, i) => (
@@ -93,13 +92,13 @@ describe.each([ )), ) render() - }, - { warmupIterations: 1 }, - ) + }).run({ + warmupIterations: 1, + }) + }) - bench( - 'interpolate path', - () => { + test('interpolate path', async ({ bench }) => { + await bench('interpolate path', () => { const router = renderRouter( Array.from({ length: numberOfLinks }).map((_, i) => ( ) - }, - { warmupIterations: 1 }, - ) + }).run({ + warmupIterations: 1, + }) + }) - bench( - 'build location', - () => { + test('build location', async ({ bench }) => { + await bench('build location', () => { const router = renderRouter( Array.from({ length: numberOfLinks }).map((_, i) => ( ) - }, - { warmupIterations: 1 }, - ) + }).run({ + warmupIterations: 1, + }) + }) - bench( - 'link to absolute path', - () => { + test('link to absolute path', async ({ bench }) => { + await bench('link to absolute path', () => { const router = renderRouter( Array.from({ length: numberOfLinks }).map((_, i) => ( ) - }, - { warmupIterations: 1 }, - ) + }).run({ + warmupIterations: 1, + }) + }) - bench( - 'link to relative path', - () => { + test('link to relative path', async ({ bench }) => { + await bench('link to relative path', () => { const router = renderRouter( Array.from({ length: numberOfLinks }).map((_, i) => { const to = `./params/$param${Math.min(i, matchedParamId)}` @@ -174,13 +173,13 @@ describe.each([ }), ) render() - }, - { warmupIterations: 1 }, - ) + }).run({ + warmupIterations: 1, + }) + }) - bench( - 'link to current path', - () => { + test('link to current path', async ({ bench }) => { + await bench('link to current path', () => { const router = renderRouter( Array.from({ length: numberOfLinks }).map((_, i) => ( @@ -189,7 +188,8 @@ describe.each([ )), ) render() - }, - { warmupIterations: 1 }, - ) + }).run({ + warmupIterations: 1, + }) + }) }) diff --git a/packages/react-router/tests/setupTests.tsx b/packages/react-router/tests/setupTests.tsx index c3d7ec5cf7..6ab5039d6e 100644 --- a/packages/react-router/tests/setupTests.tsx +++ b/packages/react-router/tests/setupTests.tsx @@ -1,4 +1,3 @@ -import '@testing-library/jest-dom/vitest' import { vi } from 'vitest' // @ts-expect-error diff --git a/packages/react-router/tests/useBlocker.test.tsx b/packages/react-router/tests/useBlocker.test.tsx index c11cd054f1..e13437780e 100644 --- a/packages/react-router/tests/useBlocker.test.tsx +++ b/packages/react-router/tests/useBlocker.test.tsx @@ -1,5 +1,4 @@ import React from 'react' -import '@testing-library/jest-dom/vitest' import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest' import { cleanup, fireEvent, render, screen } from '@testing-library/react' diff --git a/packages/react-router/tests/useNavigate.test.tsx b/packages/react-router/tests/useNavigate.test.tsx index 1ec1072a26..3acf185b22 100644 --- a/packages/react-router/tests/useNavigate.test.tsx +++ b/packages/react-router/tests/useNavigate.test.tsx @@ -1,5 +1,4 @@ import React, { act } from 'react' -import '@testing-library/jest-dom/vitest' import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest' import { cleanup, diff --git a/packages/react-router/vite.config.ts b/packages/react-router/vite.config.ts index 0eb9e3c77e..798d9b74e4 100644 --- a/packages/react-router/vite.config.ts +++ b/packages/react-router/vite.config.ts @@ -18,7 +18,7 @@ const config = defineConfig({ watch: false, environment: 'jsdom', typecheck: { enabled: true }, - setupFiles: ['./tests/setupTests.tsx'], + setupFiles: ['./tests/jest-dom.setup.ts', './tests/setupTests.tsx'], }, }) diff --git a/packages/react-start-client/CHANGELOG.md b/packages/react-start-client/CHANGELOG.md index 1089a0f391..1cb31dea24 100644 --- a/packages/react-start-client/CHANGELOG.md +++ b/packages/react-start-client/CHANGELOG.md @@ -1,5 +1,47 @@ # @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 diff --git a/packages/react-start-client/package.json b/packages/react-start-client/package.json index 349e703263..b919d47b92 100644 --- a/packages/react-start-client/package.json +++ b/packages/react-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-client", - "version": "1.168.40", + "version": "1.168.45", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start-client/src/hydration/visible.tsx b/packages/react-start-client/src/hydration/visible.tsx index e274285cb8..b295d77462 100644 --- a/packages/react-start-client/src/hydration/visible.tsx +++ b/packages/react-start-client/src/hydration/visible.tsx @@ -26,20 +26,22 @@ function HydrationBoundary(props: { o?: () => void children?: React.ReactNode }) { - const { g, o } = props - - if (!g.r) { - if (!reactUse) { - throw g.p - } - - reactUse(g.p) - } - + // Above the gate: a replay after `use` suspended can find the gate open and + // skip `use`, and only `use` leaves the replay's dispatcher, which rejects a + // hook the first attempt did not reach. + const { o } = props React.useEffect(() => { o?.() }, [o]) + if (!props.g.r) { + if (!reactUse) { + throw props.g.p + } + + reactUse(props.g.p) + } + return props.children as React.JSX.Element } diff --git a/packages/react-start-client/src/tests/Hydrate.test.tsx b/packages/react-start-client/src/tests/Hydrate.test.tsx index 0d0ce1faad..0e7abe502a 100644 --- a/packages/react-start-client/src/tests/Hydrate.test.tsx +++ b/packages/react-start-client/src/tests/Hydrate.test.tsx @@ -12,7 +12,14 @@ import { import { afterEach, describe, expect, it, vi } from 'vitest' import { hydrateIdAttribute } from '@tanstack/start-client-core/hydration/constants' import { Hydrate } from '../Hydrate' -import { condition, idle, interaction, load, never } from '../hydration' +import { + condition, + idle, + interaction, + load, + never, + visible, +} from '../hydration' import type { HydrateProps, HydrationPrefetchStrategy } from '../Hydrate' const InternalHydrate = Hydrate as React.ComponentType< @@ -673,4 +680,84 @@ describe('Hydrate', () => { await unmountHydratedRoot(root, container) } }) + + // `visible()` reads its gate's mutable flag during render (`if (!g.r) use(g.p)`). + // React replays a component that suspended in `use` with its re-render + // dispatcher, and only `use` switches away from it: when the intersection + // arrives while React waits to replay, the flag is true, the replay skips + // `use`, and a hook after it would throw "Update hook called on initial render" + // (#467 in production). React would then discard the boundary's server HTML. + // Which task the intersection lands in is the browser's choice, so this runs + // it in each of the tasks around the boundary's first hydration attempt. + it('hydrates a visible boundary whichever task the intersection arrives in', async () => { + const actEnvironment = globalThis as { + IS_REACT_ACT_ENVIRONMENT?: boolean + } + const wasActEnvironment = actEnvironment.IS_REACT_ACT_ENVIRONMENT + actEnvironment.IS_REACT_ACT_ENVIRONMENT = false + const nextTask = () => new Promise((resolve) => setImmediate(resolve)) + const app = (onHydrated?: () => void) => ( + fallback

} + onHydrated={onHydrated} + > +

child

+
+ ) + vi.stubGlobal('window', undefined) + const html = renderToString(app()) + vi.unstubAllGlobals() + const failed: Array<{ tasks: number; errors: Array }> = [] + try { + for (let tasks = 0; tasks < 12; tasks++) { + vi.stubGlobal( + 'IntersectionObserver', + class { + constructor(private notify: IntersectionObserverCallback) {} + observe() { + void (async () => { + for (let task = 0; task < tasks; task++) { + await nextTask() + } + this.notify( + [{ isIntersecting: true } as IntersectionObserverEntry], + this as unknown as IntersectionObserver, + ) + })() + } + disconnect() {} + }, + ) + const container = document.createElement('div') + document.body.append(container) + container.innerHTML = html + const errors: Array = [] + const hydrated = new Promise((resolve) => { + const root = hydrateRoot( + container, + app(() => { + resolve() + setImmediate(() => { + root.unmount() + container.remove() + }) + }), + { + onRecoverableError: (error) => { + errors.push(String((error as Error).cause ?? error)) + }, + }, + ) + }) + await hydrated + if (errors.length > 0) { + failed.push({ tasks, errors }) + } + } + } finally { + actEnvironment.IS_REACT_ACT_ENVIRONMENT = wasActEnvironment + } + expect(failed).toEqual([]) + }) }) diff --git a/packages/react-start-rsc/CHANGELOG.md b/packages/react-start-rsc/CHANGELOG.md index 0c26745c27..fae6bcabee 100644 --- a/packages/react-start-rsc/CHANGELOG.md +++ b/packages/react-start-rsc/CHANGELOG.md @@ -1,5 +1,74 @@ # @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 diff --git a/packages/react-start-rsc/package.json b/packages/react-start-rsc/package.json index 63c3b04318..40b1847068 100644 --- a/packages/react-start-rsc/package.json +++ b/packages/react-start-rsc/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-rsc", - "version": "0.1.60", + "version": "0.1.67", "description": "React Server Components support for TanStack Start", "author": "Tanner Linsley", "license": "MIT", @@ -110,8 +110,8 @@ "@rspack/core": "2.2.7", "@testing-library/react": "catalog:", "@vitejs/plugin-react": "catalog:", - "@vitejs/plugin-rsc": "^0.5.30", - "react-server-dom-rspack": "^0.0.2", + "@vitejs/plugin-rsc": "^0.5.39", + "react-server-dom-rspack": "^0.1.1", "@tanstack/vite-config": "catalog:", "vitest": "catalog:", "jsdom": "catalog:", @@ -127,10 +127,10 @@ }, "peerDependencies": { "@rspack/core": ">=2.0.0-0", - "@vitejs/plugin-rsc": ">=0.5.30", + "@vitejs/plugin-rsc": ">=0.5.38", "react": ">=18.0.0 || >=19.0.0", "react-dom": ">=18.0.0 || >=19.0.0", - "react-server-dom-rspack": ">=0.0.2" + "react-server-dom-rspack": ">=0.1.1" }, "peerDependenciesMeta": { "@rspack/core": { diff --git a/packages/react-start-rsc/src/plugin/vite.ts b/packages/react-start-rsc/src/plugin/vite.ts index 90da9d8b96..9aa9523c6a 100644 --- a/packages/react-start-rsc/src/plugin/vite.ts +++ b/packages/react-start-rsc/src/plugin/vite.ts @@ -109,7 +109,7 @@ export function reactStartRscVitePlugin(): PluginOption { ], }, build: { - rollupOptions: { + rolldownOptions: { input: { index: rscEntryPath, }, diff --git a/packages/react-start-server/CHANGELOG.md b/packages/react-start-server/CHANGELOG.md index 97f2468575..86d7854a59 100644 --- a/packages/react-start-server/CHANGELOG.md +++ b/packages/react-start-server/CHANGELOG.md @@ -1,5 +1,54 @@ # @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 diff --git a/packages/react-start-server/package.json b/packages/react-start-server/package.json index f3d0818119..a725b70d9c 100644 --- a/packages/react-start-server/package.json +++ b/packages/react-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start-server", - "version": "1.167.47", + "version": "1.167.52", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/react-start/CHANGELOG.md b/packages/react-start/CHANGELOG.md index 4151be61f4..9d6432f985 100644 --- a/packages/react-start/CHANGELOG.md +++ b/packages/react-start/CHANGELOG.md @@ -1,5 +1,106 @@ # @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 diff --git a/packages/react-start/package.json b/packages/react-start/package.json index 925b4232dc..6d51a4c6d0 100644 --- a/packages/react-start/package.json +++ b/packages/react-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/react-start", - "version": "1.168.61", + "version": "1.169.6", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", @@ -171,10 +171,10 @@ "pathe": "catalog:" }, "peerDependencies": { - "@rsbuild/core": "^2.0.0", + "@rsbuild/core": "^2.0.5", "react": ">=18.0.0 || >=19.0.0", "react-dom": ">=18.0.0 || >=19.0.0", - "vite": ">=7.0.0" + "vite": ">=8.0.0" }, "peerDependenciesMeta": { "@rsbuild/core": { diff --git a/packages/react-start/skills/lifecycle/migrate-from-nextjs/SKILL.md b/packages/react-start/skills/lifecycle/migrate-from-nextjs/SKILL.md index d59292bc4b..81b020713b 100644 --- a/packages/react-start/skills/lifecycle/migrate-from-nextjs/SKILL.md +++ b/packages/react-start/skills/lifecycle/migrate-from-nextjs/SKILL.md @@ -432,5 +432,5 @@ export const myAction = createServerFn({ method: 'POST' }) ## Cross-References - [react-start](../../react-start/SKILL.md) — full React Start setup -- [start-core/server-functions](../../../../start-client-core/skills/start-core/server-functions/SKILL.md) — server function patterns -- [start-core/execution-model](../../../../start-client-core/skills/start-core/execution-model/SKILL.md) — isomorphic execution +- `@tanstack/start-client-core#start-core/server-functions` — server function patterns +- `@tanstack/start-client-core#start-core/execution-model` — isomorphic execution diff --git a/packages/react-start/skills/react-start/SKILL.md b/packages/react-start/skills/react-start/SKILL.md index b0f69009e1..988373f107 100644 --- a/packages/react-start/skills/react-start/SKILL.md +++ b/packages/react-start/skills/react-start/SKILL.md @@ -291,6 +291,6 @@ Without `` in the root route's ``, client JavaScript doesn't lo ## Cross-References -- [start-core](../../../start-client-core/skills/start-core/SKILL.md) — core Start concepts -- [router-core](../../../router-core/skills/router-core/SKILL.md) — routing fundamentals -- [react-router](../../../react-router/skills/react-router/SKILL.md) — React Router hooks and components +- `@tanstack/start-client-core#start-core` — core Start concepts +- `@tanstack/router-core#router-core` — routing fundamentals +- `@tanstack/react-router#react-router` — React Router hooks and components diff --git a/packages/react-start/src/default-entry/server.ts b/packages/react-start/src/default-entry/server.ts index 8e734a7e49..638ac3c0a6 100644 --- a/packages/react-start/src/default-entry/server.ts +++ b/packages/react-start/src/default-entry/server.ts @@ -1,6 +1,7 @@ import { createStartHandler, defaultStreamHandler, + createServerEntry as createCoreServerEntry, } from '@tanstack/react-start/server' import type { Register } from '@tanstack/react-router' import type { RequestHandler } from '@tanstack/react-start/server' @@ -10,12 +11,8 @@ const fetch = createStartHandler(defaultStreamHandler) // Providing `RequestHandler` from `@tanstack/react-start/server` is required so that the output types don't import it from `@tanstack/start-server-core` export type ServerEntry = { fetch: RequestHandler } -export function createServerEntry(entry: ServerEntry): ServerEntry { - return { - async fetch(...args) { - return await entry.fetch(...args) - }, - } -} +// Bind the shared request context and fallback error handling to React's Register. +export const createServerEntry: (entry: ServerEntry) => ServerEntry = + createCoreServerEntry export default createServerEntry({ fetch }) diff --git a/packages/router-cli/CHANGELOG.md b/packages/router-cli/CHANGELOG.md index 3601bd3f99..67101c3e51 100644 --- a/packages/router-cli/CHANGELOG.md +++ b/packages/router-cli/CHANGELOG.md @@ -1,5 +1,53 @@ # @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 diff --git a/packages/router-cli/package.json b/packages/router-cli/package.json index 19f4811dee..51a729d79b 100644 --- a/packages/router-cli/package.json +++ b/packages/router-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-cli", - "version": "1.167.41", + "version": "1.168.0", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", @@ -63,16 +63,15 @@ "bin/**" ], "engines": { - "node": ">=20.19" + "node": "^20.19.0 || >=22.12.0" }, "dependencies": { "@tanstack/router-generator": "workspace:*", - "chokidar": "catalog:", - "yargs": "^17.7.2" + "cac": "^7.1.0", + "chokidar": "catalog:" }, "devDependencies": { "@types/node": ">=20", - "@types/yargs": "^17.0.33", "vite": "catalog:", "@tanstack/vite-config": "catalog:", "vitest": "catalog:", diff --git a/packages/router-cli/src/index.ts b/packages/router-cli/src/index.ts index eca5a9ff0e..7610fde457 100644 --- a/packages/router-cli/src/index.ts +++ b/packages/router-cli/src/index.ts @@ -1,25 +1,51 @@ -import yargs from 'yargs' -import { hideBin } from 'yargs/helpers' +import { cac } from 'cac' import { getConfig } from '@tanstack/router-generator' import { generate } from './generate' import { watch } from './watch' +declare const __TSR_VERSION__: string + main() export function main() { - yargs(hideBin(process.argv)) - .scriptName('tsr') - .usage('$0 [args]') - .command('generate', 'Generate the routes for a project', async () => { + const cli = cac('tsr') + + cli + .command('generate', 'Generate the routes for a project') + .action(async () => { const config = getConfig() await generate(config, process.cwd()) }) + + cli .command( 'watch', 'Continuously watch and generate the routes for a project', - () => { - watch(process.cwd()) - }, ) - .help().argv + .action(() => { + watch(process.cwd()) + }) + + cli.help() + cli.version(__TSR_VERSION__) + + try { + cli.parse() + } catch (err) { + // cac throws `CACError` for invalid usage (unknown option, extra args) + if (err instanceof Error && err.name === 'CACError') { + console.error(err.message) + process.exit(1) + } + throw err + } + + if (!cli.matchedCommand && !cli.options.help && !cli.options.version) { + // `tsr` and `tsr help` print help; unknown commands also exit with 1 + if (cli.args.length && cli.args[0] !== 'help') { + console.error(`Unknown command: ${cli.args.join(' ')}\n`) + process.exitCode = 1 + } + cli.outputHelp() + } } diff --git a/packages/router-cli/vite.config.ts b/packages/router-cli/vite.config.ts index f418b4e943..0eac9e6ed4 100644 --- a/packages/router-cli/vite.config.ts +++ b/packages/router-cli/vite.config.ts @@ -1,7 +1,12 @@ import { defineConfig, mergeConfig } from 'vitest/config' import { tanstackViteConfig } from '@tanstack/vite-config' +import packageJson from './package.json' -const config = defineConfig({}) +const config = defineConfig({ + define: { + __TSR_VERSION__: JSON.stringify(packageJson.version), + }, +}) export default mergeConfig( config, diff --git a/packages/router-core/AGENTS.md b/packages/router-core/AGENTS.md index b6f0e66911..7402f0bdfe 100644 --- a/packages/router-core/AGENTS.md +++ b/packages/router-core/AGENTS.md @@ -8,5 +8,5 @@ - Backpressure tests are excluded from normal unit runs. For buffering/backpressure changes, run the gated suite below. Its memory case requires exposed GC; bypass Nx cache so a previous run with the gate disabled cannot count as validation. ```sh -RUN_BACKPRESSURE_PERF=1 CI=1 NX_DAEMON=false pnpm nx run @tanstack/router-core:test:unit --outputStyle=stream --skipRemoteCache --skipNxCache -- tests/transformStreamBackpressure.perf.test.ts --pool=forks --execArgv=--expose-gc +RUN_BACKPRESSURE_PERF=1 CI=1 NX_DAEMON=false pnpm nx run-many -p @tanstack/router-core -t test:unit --skipRemoteCache --skipNxCache -- tests/transformStreamBackpressure.perf.test.ts --pool=forks --execArgv=--expose-gc ``` diff --git a/packages/router-core/CHANGELOG.md b/packages/router-core/CHANGELOG.md index e416caa2c5..b01991e223 100644 --- a/packages/router-core/CHANGELOG.md +++ b/packages/router-core/CHANGELOG.md @@ -1,5 +1,29 @@ # @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 diff --git a/packages/router-core/package.json b/packages/router-core/package.json index 36b91956ca..ed2b794278 100644 --- a/packages/router-core/package.json +++ b/packages/router-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-core", - "version": "1.171.35", + "version": "1.171.39", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-core/skills/router-core/auth-and-guards/SKILL.md b/packages/router-core/skills/router-core/auth-and-guards/SKILL.md index 71a87a2a3e..4d1a6a3b6e 100644 --- a/packages/router-core/skills/router-core/auth-and-guards/SKILL.md +++ b/packages/router-core/skills/router-core/auth-and-guards/SKILL.md @@ -21,7 +21,7 @@ sources: # Auth and Guards -> **This skill covers the routing side of auth.** Route guards are UX and navigation control; the data/API boundary still belongs in the server function, server route, or API endpoint that reads or mutates private data. For the **server-side primitives** — session cookies (`HttpOnly`/`Secure`/`SameSite`), `useSession`-style helpers, OAuth `state` + PKCE, password-reset enumeration defense, CSRF, rate limiting — see [start-core/auth-server-primitives](../../../../start-client-core/skills/start-core/auth-server-primitives/SKILL.md). +> **This skill covers the routing side of auth.** Route guards are UX and navigation control; the data/API boundary still belongs in the server function, server route, or API endpoint that reads or mutates private data. For the **server-side primitives** — session cookies (`HttpOnly`/`Secure`/`SameSite`), external session helpers, OAuth `state` + PKCE, password-reset enumeration defense, CSRF, rate limiting — see `@tanstack/start-client-core#start-core/auth-server-primitives`. > > **CRITICAL**: A route guard (`beforeLoad`) does NOT protect a `createServerFn` declared on that route. Server functions are API endpoints reachable independently of the route that calls them. See "Route guards do not protect server functions" below. @@ -408,7 +408,7 @@ const getMyOrders = createServerFn({ method: 'GET' }) }) ``` -Rule of thumb: every `createServerFn`, server route, or API endpoint that touches user data needs `authMiddleware` (or an equivalent in-handler check). The route guard is for the page experience; the endpoint guard is for the data. See [start-core/auth-server-primitives](../../../../start-client-core/skills/start-core/auth-server-primitives/SKILL.md) for the full session/middleware pattern. +Rule of thumb: every `createServerFn`, server route, or API endpoint that touches user data needs `authMiddleware` (or an equivalent in-handler check). The route guard is for the page experience; the endpoint guard is for the data. See `@tanstack/start-client-core#start-core/auth-server-primitives` for the full session/middleware pattern. ### CRITICAL: The anonymous destination can still disclose protected data diff --git a/packages/router-core/skills/router-core/ssr/SKILL.md b/packages/router-core/skills/router-core/ssr/SKILL.md index d1e0524f13..752fb837a5 100644 --- a/packages/router-core/skills/router-core/ssr/SKILL.md +++ b/packages/router-core/skills/router-core/ssr/SKILL.md @@ -489,4 +489,4 @@ See [router-core/data-loading](../data-loading/SKILL.md) for loader fundamentals ## Cross-References - [router-core/data-loading](../data-loading/SKILL.md) — SSR changes where loaders execute -- [compositions/router-query](../../../../react-router/skills/compositions/router-query/SKILL.md) — SSR dehydration/hydration with TanStack Query +- `@tanstack/react-router#compositions/router-query` — SSR dehydration/hydration with TanStack Query diff --git a/packages/router-core/src/load-server.ts b/packages/router-core/src/load-server.ts index aff9e11d26..325f8d63f7 100644 --- a/packages/router-core/src/load-server.ts +++ b/packages/router-core/src/load-server.ts @@ -904,7 +904,9 @@ export async function loadServerRoute( router: AnyRouter, opts?: ServerLoadOptions, ): Promise { - router.updateLatestLocation() + if (!opts?._skipLocationUpdate) { + router.updateLatestLocation() + } const next = router.latestLocation const previous = router._committed const previousEnd = router._lifecycleEnd diff --git a/packages/router-core/src/manifest.ts b/packages/router-core/src/manifest.ts index aca4b96eac..b43f485236 100644 --- a/packages/router-core/src/manifest.ts +++ b/packages/router-core/src/manifest.ts @@ -43,6 +43,7 @@ export function getScriptPreloadAttrs( rel: 'modulepreload' | 'preload' as?: 'script' href: string + fetchPriority: 'low' crossOrigin?: AssetCrossOrigin } { const preloadLink = resolveManifestAssetLink(link) @@ -54,6 +55,7 @@ export function getScriptPreloadAttrs( ? { rel: 'preload', as: 'script' } : { rel: 'modulepreload' }), href: preloadLink.href, + fetchPriority: 'low', ...(crossOrigin ? { crossOrigin } : {}), } } diff --git a/packages/router-core/src/router.ts b/packages/router-core/src/router.ts index ab3fe23194..ecf443168d 100644 --- a/packages/router-core/src/router.ts +++ b/packages/router-core/src/router.ts @@ -788,6 +788,8 @@ export type LoadFn = (opts?: { sync?: boolean action?: { type: HistoryAction } _signal?: AbortSignal + /** @private Reuse the location already prepared for this SSR request. */ + _skipLocationUpdate?: boolean }) => Promise export type CommitLocationFn = ({ diff --git a/packages/router-core/src/ssr/createRequestHandler.ts b/packages/router-core/src/ssr/createRequestHandler.ts index e3297730d0..21e48ca242 100644 --- a/packages/router-core/src/ssr/createRequestHandler.ts +++ b/packages/router-core/src/ssr/createRequestHandler.ts @@ -72,6 +72,7 @@ export function createRequestHandler({ await router.load({ _signal: signal, + _skipLocationUpdate: true, }) signal.throwIfAborted() diff --git a/packages/router-core/src/ssr/ssr-server.ts b/packages/router-core/src/ssr/ssr-server.ts index 496e17a912..e7c9cc2fa6 100644 --- a/packages/router-core/src/ssr/ssr-server.ts +++ b/packages/router-core/src/ssr/ssr-server.ts @@ -673,12 +673,10 @@ export function getOrigin(request: Request) { // new URLSearchParams() encodes "|" while new URL() does not, and in this instance // chromium treats search params differently than paths, i.e. "|" is not encoded in search params. export function getNormalizedURL(url: string | URL, base?: string | URL) { - // ensure backslashes are encoded correctly in the URL - if (typeof url === 'string') { - url = url.replace('\\', '%5C') - } - - const rawUrl = new URL(url, base) + // Encode backslashes in a string URL. A URL object is already parsed and is + // only read here. + const rawUrl = + typeof url === 'string' ? new URL(url.replace('\\', '%5C'), base) : url // URL parsing has already handled backslashes and ignored controls. A pathname // like "//evil.example" would become a protocol-relative URL when rebuilt below. const handledProtocolRelativeURL = rawUrl.pathname.startsWith('//') diff --git a/packages/router-core/tests/build-location.bench.ts b/packages/router-core/tests/build-location.bench.ts index b6162aafef..2b93731d2c 100644 --- a/packages/router-core/tests/build-location.bench.ts +++ b/packages/router-core/tests/build-location.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe, expect } from 'vitest' +import { describe, expect, test } from 'vitest' import { createMemoryHistory } from '@tanstack/history' import { BaseRootRoute, BaseRoute, retainSearchParams } from '../src' import { createTestRouter } from './routerTestUtils' @@ -75,20 +75,23 @@ function defineCase( expect(router.buildLocation(dest as any).href).toBe(expectedHref(index)) }) let checksum = 0 - bench( - name, - () => { - checksum = publication(router, dests) - }, - { + test(name, async ({ bench }) => { + await bench( + name, + { + afterAll: () => { + expect(checksum).toBe(expected) + }, + }, + () => { + checksum = publication(router, dests) + }, + ).run({ time: 1000, warmupTime: 200, throws: true, - teardown: () => { - expect(checksum).toBe(expected) - }, - }, - ) + }) + }) } describe(`buildLocation per publication (${LINKS} links)`, () => { diff --git a/packages/router-core/tests/cache-commit.bench.ts b/packages/router-core/tests/cache-commit.bench.ts index 221836aa29..d570e55bf2 100644 --- a/packages/router-core/tests/cache-commit.bench.ts +++ b/packages/router-core/tests/cache-commit.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe, expect } from 'vitest' +import { describe, expect, test } from 'vitest' import { commitMatches } from '../src/load-client' import type { AnyRouteMatch, AnyRouter } from '../src' import type { LoaderFlight, LoadTransaction } from '../src/load-client' @@ -99,15 +99,21 @@ for (const family of ['snapshots', 'mixed flights', 'preload flights']) { } } const batch = size <= 100 ? 100 : 1 - bench( - `${retainedFraction * 100}% retained (${batch} commits)`, - () => { - for (let index = 0; index < batch; index++) { - run() - } - }, - { time: 500, warmupTime: 100 }, - ) + test(`${retainedFraction * 100}% retained (${batch} commits)`, async ({ + bench, + }) => { + await bench( + `${retainedFraction * 100}% retained (${batch} commits)`, + () => { + for (let index = 0; index < batch; index++) { + run() + } + }, + ).run({ + time: 500, + warmupTime: 100, + }) + }) } }, ) diff --git a/packages/router-core/tests/cache-navigation.bench.ts b/packages/router-core/tests/cache-navigation.bench.ts index 16650d7c4b..053aa645ac 100644 --- a/packages/router-core/tests/cache-navigation.bench.ts +++ b/packages/router-core/tests/cache-navigation.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe, expect } from 'vitest' +import { describe, expect, test } from 'vitest' import { createMemoryHistory } from '@tanstack/history' import { BaseRootRoute, BaseRoute } from '../src' import { createTestRouter } from './routerTestUtils' @@ -42,9 +42,11 @@ for (const size of [0, 100, 1000, 5000]) { expect(router._cache.size).toBe(size) expect(router.state.location.pathname).toBe('/') describe(`${size} cached preloads`, () => { - bench('two unrelated navigations', navigate, { - time: 1000, - warmupTime: 200, + test('two unrelated navigations', async ({ bench }) => { + await bench('two unrelated navigations', navigate).run({ + time: 1000, + warmupTime: 200, + }) }) }) } diff --git a/packages/router-core/tests/closing-tag-detection.bench.ts b/packages/router-core/tests/closing-tag-detection.bench.ts index 5a52f6c580..641c016bb4 100644 --- a/packages/router-core/tests/closing-tag-detection.bench.ts +++ b/packages/router-core/tests/closing-tag-detection.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { describe, test } from 'vitest' const BODY_END_TAG = '' const MIN_CLOSING_TAG_LENGTH = 4 @@ -680,204 +680,284 @@ verifyBodyImplementations() describe('Closing Tag Detection - Small Chunk (~70 chars)', () => { const chunk = generateSmallChunk() - bench('regex', () => { - findLastClosingTagRegex(chunk) + test('regex', async ({ bench }) => { + await bench('regex', () => { + findLastClosingTagRegex(chunk) + }).run() }) - bench('manual backwards scan', () => { - findLastClosingTagManual(chunk) + test('manual backwards scan', async ({ bench }) => { + await bench('manual backwards scan', () => { + findLastClosingTagManual(chunk) + }).run() }) - bench('optimized (charCodeAt)', () => { - findLastClosingTagOptimized(chunk) + test('optimized (charCodeAt)', async ({ bench }) => { + await bench('optimized (charCodeAt)', () => { + findLastClosingTagOptimized(chunk) + }).run() }) - bench('hybrid (lastIndexOf + validation)', () => { - findLastClosingTagHybrid(chunk) + test('hybrid (lastIndexOf + validation)', async ({ bench }) => { + await bench('hybrid (lastIndexOf + validation)', () => { + findLastClosingTagHybrid(chunk) + }).run() }) }) describe('Closing Tag Detection - Medium Chunk (~1.5KB)', () => { const chunk = generateMediumChunk() - bench('regex', () => { - findLastClosingTagRegex(chunk) + test('regex', async ({ bench }) => { + await bench('regex', () => { + findLastClosingTagRegex(chunk) + }).run() }) - bench('manual backwards scan', () => { - findLastClosingTagManual(chunk) + test('manual backwards scan', async ({ bench }) => { + await bench('manual backwards scan', () => { + findLastClosingTagManual(chunk) + }).run() }) - bench('optimized (charCodeAt)', () => { - findLastClosingTagOptimized(chunk) + test('optimized (charCodeAt)', async ({ bench }) => { + await bench('optimized (charCodeAt)', () => { + findLastClosingTagOptimized(chunk) + }).run() }) - bench('hybrid (lastIndexOf + validation)', () => { - findLastClosingTagHybrid(chunk) + test('hybrid (lastIndexOf + validation)', async ({ bench }) => { + await bench('hybrid (lastIndexOf + validation)', () => { + findLastClosingTagHybrid(chunk) + }).run() }) }) describe('Closing Tag Detection - Large Chunk (~13KB)', () => { const chunk = generateLargeChunk() - bench('regex', () => { - findLastClosingTagRegex(chunk) + test('regex', async ({ bench }) => { + await bench('regex', () => { + findLastClosingTagRegex(chunk) + }).run() }) - bench('manual backwards scan', () => { - findLastClosingTagManual(chunk) + test('manual backwards scan', async ({ bench }) => { + await bench('manual backwards scan', () => { + findLastClosingTagManual(chunk) + }).run() }) - bench('optimized (charCodeAt)', () => { - findLastClosingTagOptimized(chunk) + test('optimized (charCodeAt)', async ({ bench }) => { + await bench('optimized (charCodeAt)', () => { + findLastClosingTagOptimized(chunk) + }).run() }) - bench('hybrid (lastIndexOf + validation)', () => { - findLastClosingTagHybrid(chunk) + test('hybrid (lastIndexOf + validation)', async ({ bench }) => { + await bench('hybrid (lastIndexOf + validation)', () => { + findLastClosingTagHybrid(chunk) + }).run() }) }) describe('Closing Tag Detection - Web Components', () => { const chunk = generateWebComponentChunk() - bench('regex', () => { - findLastClosingTagRegex(chunk) + test('regex', async ({ bench }) => { + await bench('regex', () => { + findLastClosingTagRegex(chunk) + }).run() }) - bench('manual backwards scan', () => { - findLastClosingTagManual(chunk) + test('manual backwards scan', async ({ bench }) => { + await bench('manual backwards scan', () => { + findLastClosingTagManual(chunk) + }).run() }) - bench('optimized (charCodeAt)', () => { - findLastClosingTagOptimized(chunk) + test('optimized (charCodeAt)', async ({ bench }) => { + await bench('optimized (charCodeAt)', () => { + findLastClosingTagOptimized(chunk) + }).run() }) - bench('hybrid (lastIndexOf + validation)', () => { - findLastClosingTagHybrid(chunk) + test('hybrid (lastIndexOf + validation)', async ({ bench }) => { + await bench('hybrid (lastIndexOf + validation)', () => { + findLastClosingTagHybrid(chunk) + }).run() }) }) describe('Closing Tag Detection - No Closing Tags (worst case for regex)', () => { const chunk = generateNoClosingTagChunk() - bench('regex', () => { - findLastClosingTagRegex(chunk) + test('regex', async ({ bench }) => { + await bench('regex', () => { + findLastClosingTagRegex(chunk) + }).run() }) - bench('manual backwards scan', () => { - findLastClosingTagManual(chunk) + test('manual backwards scan', async ({ bench }) => { + await bench('manual backwards scan', () => { + findLastClosingTagManual(chunk) + }).run() }) - bench('optimized (charCodeAt)', () => { - findLastClosingTagOptimized(chunk) + test('optimized (charCodeAt)', async ({ bench }) => { + await bench('optimized (charCodeAt)', () => { + findLastClosingTagOptimized(chunk) + }).run() }) - bench('hybrid (lastIndexOf + validation)', () => { - findLastClosingTagHybrid(chunk) + test('hybrid (lastIndexOf + validation)', async ({ bench }) => { + await bench('hybrid (lastIndexOf + validation)', () => { + findLastClosingTagHybrid(chunk) + }).run() }) }) describe('Closing Tag Detection - Nested React-like Structure', () => { const chunk = generateNestedChunk() - bench('regex', () => { - findLastClosingTagRegex(chunk) + test('regex', async ({ bench }) => { + await bench('regex', () => { + findLastClosingTagRegex(chunk) + }).run() }) - bench('manual backwards scan', () => { - findLastClosingTagManual(chunk) + test('manual backwards scan', async ({ bench }) => { + await bench('manual backwards scan', () => { + findLastClosingTagManual(chunk) + }).run() }) - bench('optimized (charCodeAt)', () => { - findLastClosingTagOptimized(chunk) + test('optimized (charCodeAt)', async ({ bench }) => { + await bench('optimized (charCodeAt)', () => { + findLastClosingTagOptimized(chunk) + }).run() }) - bench('hybrid (lastIndexOf + validation)', () => { - findLastClosingTagHybrid(chunk) + test('hybrid (lastIndexOf + validation)', async ({ bench }) => { + await bench('hybrid (lastIndexOf + validation)', () => { + findLastClosingTagHybrid(chunk) + }).run() }) }) describe('Closing Tag Detection - Partial Chunk (streaming edge case)', () => { const chunk = generatePartialChunk() - bench('regex', () => { - findLastClosingTagRegex(chunk) + test('regex', async ({ bench }) => { + await bench('regex', () => { + findLastClosingTagRegex(chunk) + }).run() }) - bench('manual backwards scan', () => { - findLastClosingTagManual(chunk) + test('manual backwards scan', async ({ bench }) => { + await bench('manual backwards scan', () => { + findLastClosingTagManual(chunk) + }).run() }) - bench('optimized (charCodeAt)', () => { - findLastClosingTagOptimized(chunk) + test('optimized (charCodeAt)', async ({ bench }) => { + await bench('optimized (charCodeAt)', () => { + findLastClosingTagOptimized(chunk) + }).run() }) - bench('hybrid (lastIndexOf + validation)', () => { - findLastClosingTagHybrid(chunk) + test('hybrid (lastIndexOf + validation)', async ({ bench }) => { + await bench('hybrid (lastIndexOf + validation)', () => { + findLastClosingTagHybrid(chunk) + }).run() }) }) function benchBodyEndTagDetection(name: string, chunk: string) { describe(`Body End Tag Detection - ${name}`, () => { - bench('forward charCodeAt', () => { - findBodyEndTagForward(chunk) + test('forward charCodeAt', async ({ bench }) => { + await bench('forward charCodeAt', () => { + findBodyEndTagForward(chunk) + }).run() }) - bench('backward charCodeAt', () => { - findBodyEndTagBackward(chunk) + test('backward charCodeAt', async ({ bench }) => { + await bench('backward charCodeAt', () => { + findBodyEndTagBackward(chunk) + }).run() }) - bench('lastIndexOf( { - findBodyEndTagLastOpenSlash(chunk) + test('lastIndexOf( { + await bench('lastIndexOf( { + findBodyEndTagLastOpenSlash(chunk) + }).run() }) - bench('native lowercase + lastIndexOf( { - findBodyEndTagNativeLowerThenLastOpenSlash(chunk) + test('native lowercase + lastIndexOf( { + await bench('native lowercase + lastIndexOf( { + findBodyEndTagNativeLowerThenLastOpenSlash(chunk) + }).run() }) - bench('combined boundary scan', () => { - findHtmlBoundaryCombined(chunk).bodyEndIndex + test('combined boundary scan', async ({ bench }) => { + await bench('combined boundary scan', () => { + findHtmlBoundaryCombined(chunk).bodyEndIndex + }).run() }) }) } function benchBoundaryDetection(name: string, chunk: string) { describe(`HTML Boundary Detection - ${name}`, () => { - bench('current two-step forward body + last closing', () => { - const bodyEndIndex = findBodyEndTagForward(chunk) - if (bodyEndIndex === -1) { - findLastClosingTagOptimized(chunk) - } + test('current two-step forward body + last closing', async ({ bench }) => { + await bench('current two-step forward body + last closing', () => { + const bodyEndIndex = findBodyEndTagForward(chunk) + if (bodyEndIndex === -1) { + findLastClosingTagOptimized(chunk) + } + }).run() }) - bench('lastIndexOf( { - const bodyEndIndex = findBodyEndTagLastOpenSlash(chunk) - if (bodyEndIndex === -1) { - findLastClosingTagOptimized(chunk) - } + test('lastIndexOf( { + await bench('lastIndexOf( { + const bodyEndIndex = findBodyEndTagLastOpenSlash(chunk) + if (bodyEndIndex === -1) { + findLastClosingTagOptimized(chunk) + } + }).run() }) - bench('native lowercase body + last closing', () => { - const bodyEndIndex = findBodyEndTagNativeLowerThenLastOpenSlash(chunk) - if (bodyEndIndex === -1) { - findLastClosingTagOptimized(chunk) - } + test('native lowercase body + last closing', async ({ bench }) => { + await bench('native lowercase body + last closing', () => { + const bodyEndIndex = findBodyEndTagNativeLowerThenLastOpenSlash(chunk) + if (bodyEndIndex === -1) { + findLastClosingTagOptimized(chunk) + } + }).run() }) - bench('fused lastIndexOf( { - findHtmlBoundaryLastOpenSlash(chunk) + test('fused lastIndexOf( { + await bench('fused lastIndexOf( { + findHtmlBoundaryLastOpenSlash(chunk) + }).run() }) - bench('lazy fused lastIndexOf( { - findHtmlBoundaryLastOpenSlashLazy(chunk) + test('lazy fused lastIndexOf( { + await bench('lazy fused lastIndexOf( { + findHtmlBoundaryLastOpenSlashLazy(chunk) + }).run() }) - bench('lazy encoded lastIndexOf( { - findHtmlBoundaryLastOpenSlashLazyEncoded(chunk) + test('lazy encoded lastIndexOf( { + await bench('lazy encoded lastIndexOf( { + findHtmlBoundaryLastOpenSlashLazyEncoded(chunk) + }).run() }) - bench('combined boundary scan', () => { - findHtmlBoundaryCombined(chunk) + test('combined boundary scan', async ({ bench }) => { + await bench('combined boundary scan', () => { + findHtmlBoundaryCombined(chunk) + }).run() }) }) } diff --git a/packages/router-core/tests/deep-equal.bench.ts b/packages/router-core/tests/deep-equal.bench.ts index 2b2e788e16..c796add1ac 100644 --- a/packages/router-core/tests/deep-equal.bench.ts +++ b/packages/router-core/tests/deep-equal.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe, expect } from 'vitest' +import { describe, expect, test } from 'vitest' import { deepEqual } from '../src/utils' // Workloads modeled on the router's callers: Link inline-option stabilization @@ -79,104 +79,87 @@ for (let index = 0; index < linkOptions.length; index++) { describe('deepEqual', () => { const options = { time: 1000, warmupTime: 200 } - bench( - 'equal flat search record (default)', - () => { + test('equal flat search record (default)', async ({ bench }) => { + await bench('equal flat search record (default)', () => { sink += +deepEqual(search, next(searchEqual)) - }, - options, - ) + }).run(options) + }) - bench( - 'equal flat record with a shared child (default)', - () => { + test('equal flat record with a shared child (default)', async ({ bench }) => { + await bench('equal flat record with a shared child (default)', () => { sink += +deepEqual(search, shared) - }, - options, - ) + }).run(options) + }) - bench( - 'equal flat record (explicitUndefined)', - () => { + test('equal flat record (explicitUndefined)', async ({ bench }) => { + await bench('equal flat record (explicitUndefined)', () => { sink += +deepEqual(search, next(searchEqual), false, true) - }, - options, - ) + }).run(options) + }) - bench( - 'equal flat record (partial)', - () => { + test('equal flat record (partial)', async ({ bench }) => { + await bench('equal flat record (partial)', () => { sink += +deepEqual(search, next(searchEqual), true) - }, - options, - ) + }).run(options) + }) - bench( - 'late mismatch in a nested array (default)', - () => { + test('late mismatch in a nested array (default)', async ({ bench }) => { + await bench('late mismatch in a nested array (default)', () => { sink += +deepEqual(search, next(searchChangedLate)) - }, - options, - ) + }).run(options) + }) - bench( - 'early mismatch (default)', - () => { + test('early mismatch (default)', async ({ bench }) => { + await bench('early mismatch (default)', () => { sink += +deepEqual(search, next(searchChangedEarly)) - }, - options, - ) + }).run(options) + }) - bench( - 'equal nested record (default)', - () => { + test('equal nested record (default)', async ({ bench }) => { + await bench('equal nested record (default)', () => { sink += +deepEqual(nested, next(nestedEqual)) - }, - options, - ) + }).run(options) + }) - bench( - 'equal array of 32 numbers', - () => { + test('equal array of 32 numbers', async ({ bench }) => { + await bench('equal array of 32 numbers', () => { sink += +deepEqual(numbers, next(numbersEqual)) - }, - options, - ) + }).run(options) + }) - bench( - 'fresh equal flat record (explicitUndefined)', - () => { + test('fresh equal flat record (explicitUndefined)', async ({ bench }) => { + await bench('fresh equal flat record (explicitUndefined)', () => { sink += +deepEqual( search, { page: 1, sort: 'asc', filter: 'open', tags: search.tags }, false, true, ) - }, - options, - ) + }).run(options) + }) - bench( - 'fresh partial mismatch', - () => { + test('fresh partial mismatch', async ({ bench }) => { + await bench('fresh partial mismatch', () => { sink += +deepEqual(search, { page: 1, sort: 'desc' }, true) - }, - options, - ) + }).run(options) + }) - bench( - 'link option stabilization: 100 entries x 3 equal values', - () => { - for (let index = 0; index < linkOptions.length; index++) { - const previous = linkOptions[index]! - const incoming = linkOptionsEqual[index]! - for (let slot = 0; slot < 3; slot++) { - sink += +deepEqual(previous[slot], incoming[slot], false, true) + test('link option stabilization: 100 entries x 3 equal values', async ({ + bench, + }) => { + await bench( + 'link option stabilization: 100 entries x 3 equal values', + () => { + for (let index = 0; index < linkOptions.length; index++) { + const previous = linkOptions[index]! + const incoming = linkOptionsEqual[index]! + for (let slot = 0; slot < 3; slot++) { + sink += +deepEqual(previous[slot], incoming[slot], false, true) + } } - } - }, - options, - ) + }, + ).run(options) + }) }) // Keep the results observable so the comparisons cannot be optimized away. diff --git a/packages/router-core/tests/fallback-route-lifecycle.bench.ts b/packages/router-core/tests/fallback-route-lifecycle.bench.ts index 5542aee292..16468d473e 100644 --- a/packages/router-core/tests/fallback-route-lifecycle.bench.ts +++ b/packages/router-core/tests/fallback-route-lifecycle.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe, expect } from 'vitest' +import { describe, expect, test } from 'vitest' import { lifecycleEnd, runRouteLifecycle } from '../src/router' import type { AnyRouteMatch, AnyRouter, AnyRoute } from '../src' import type { LoadTransaction } from '../src/load-client' @@ -191,16 +191,16 @@ for (const depth of [1, 2, 3, 4, 5, 6]) { ['original', originalLifecycle], ['candidate', candidateLifecycle], ] as const) { - bench( - name, - () => { + test(name, async ({ bench }) => { + await bench(name, () => { for (let i = 0; i < 100; i++) { router._lifecycleEnd = previousEnd run(router, previous, matches, owner) } - }, - { time: 300 }, - ) + }).run({ + time: 300, + }) + }) } }) } diff --git a/packages/router-core/tests/getNormalizedURL.test.ts b/packages/router-core/tests/getNormalizedURL.test.ts index f07316fe55..89cca987b7 100644 --- a/packages/router-core/tests/getNormalizedURL.test.ts +++ b/packages/router-core/tests/getNormalizedURL.test.ts @@ -2,6 +2,21 @@ import { describe, expect, test } from 'vitest' import { getNormalizedURL } from '../src/ssr/ssr-server' describe('getNormalizedURL', () => { + test('returns an independent URL that callers can modify', () => { + const input = new URL('https://example.com/path?query=value') + const { url } = getNormalizedURL(input) + url.pathname = '/changed' + expect(input.href).toBe('https://example.com/path?query=value') + }) + + test.each([ + 'https://user:password@example.com/path', + 'https://example.com/path?', + 'https://example.com/path#', + ])('normalizes the full URL consistently: %s', (input) => { + expect(getNormalizedURL(input).url.href).toBe('https://example.com/path') + }) + test.each(['/%2Fdocs', '/%5Cdocs', '/%00/docs'])( 'preserves encoded pathname data in a URL object: %s', (pathname) => { diff --git a/packages/router-core/tests/hydrationQueue.bench.ts b/packages/router-core/tests/hydrationQueue.bench.ts index 821cbeb5ad..04679b3c5c 100644 --- a/packages/router-core/tests/hydrationQueue.bench.ts +++ b/packages/router-core/tests/hydrationQueue.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { describe, test } from 'vitest' const MAX_DYNAMIC_RECORD_CODE_UNITS = 64 * 1024 const SOURCE_SEPARATOR = ';' @@ -93,11 +93,15 @@ if ( } describe('maximum hydration source queue with 4 KiB sources', () => { - bench('front splice', () => { - return void (benchmarkSink = drainWithSplice(sources.slice())) + test('front splice', async ({ bench }) => { + await bench('front splice', () => { + return void (benchmarkSink = drainWithSplice(sources.slice())) + }).run() }) - bench('head index with compaction', () => { - return void (benchmarkSink = drainWithHead(sources.slice())) + test('head index with compaction', async ({ bench }) => { + await bench('head index with compaction', () => { + return void (benchmarkSink = drainWithHead(sources.slice())) + }).run() }) }) diff --git a/packages/router-core/tests/lightweight-location.bench.ts b/packages/router-core/tests/lightweight-location.bench.ts index 2470f40cc1..44f70c9d53 100644 --- a/packages/router-core/tests/lightweight-location.bench.ts +++ b/packages/router-core/tests/lightweight-location.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe, expect } from 'vitest' +import { describe, expect, test } from 'vitest' import { createMemoryHistory } from '@tanstack/history' import { BaseRootRoute, BaseRoute } from '../src' import { createTestRouter } from './routerTestUtils' @@ -46,13 +46,20 @@ describe.each([false, true])( } run() expect(checksum).toBe(iterations * '/target'.length) - bench(`${count} source params`, run, { - time: 1000, - warmupTime: 200, - throws: true, - teardown: () => { - expect(checksum).toBe(iterations * '/target'.length) - }, + test(`${count} source params`, async ({ bench }) => { + await bench( + `${count} source params`, + { + afterAll: () => { + expect(checksum).toBe(iterations * '/target'.length) + }, + }, + run, + ).run({ + time: 1000, + warmupTime: 200, + throws: true, + }) }) } }, diff --git a/packages/router-core/tests/matching-interpolation.bench.ts b/packages/router-core/tests/matching-interpolation.bench.ts index f86cd0b87e..03fe060bfa 100644 --- a/packages/router-core/tests/matching-interpolation.bench.ts +++ b/packages/router-core/tests/matching-interpolation.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe, expect } from 'vitest' +import { describe, expect, test } from 'vitest' import { createMemoryHistory } from '@tanstack/history' import { BaseRootRoute, BaseRoute } from '../src' import { createTestRouter } from './routerTestUtils' @@ -95,25 +95,26 @@ for (const server of [false, true]) { } } let checksum = 0 - bench( - scenario.name, - () => { - let length = 0 - for (const path of scenario.paths) { - for (const match of router.matchRoutes(path, {}, options)) { - length += - match.id.length + Object.keys(match._strictParams).length + test(scenario.name, async ({ bench }) => { + await bench( + scenario.name, + { afterAll: () => expect(checksum).toBe(expected) }, + () => { + let length = 0 + for (const path of scenario.paths) { + for (const match of router.matchRoutes(path, {}, options)) { + length += + match.id.length + Object.keys(match._strictParams).length + } } - } - checksum = length - }, - { + checksum = length + }, + ).run({ time: 1000, warmupTime: 300, throws: true, - teardown: () => expect(checksum).toBe(expected), - }, - ) + }) + }) } }) } diff --git a/packages/router-core/tests/new-process-route-tree.test.ts b/packages/router-core/tests/new-process-route-tree.test.ts index 3a1db0338d..86a7c4e659 100644 --- a/packages/router-core/tests/new-process-route-tree.test.ts +++ b/packages/router-core/tests/new-process-route-tree.test.ts @@ -1961,7 +1961,7 @@ describe('findRouteMatch', () => { }) }) -describe('processRouteMasks', { sequential: true }, () => { +describe('processRouteMasks', { concurrent: false }, () => { const routeTree = { id: '__root__', isRoot: true, diff --git a/packages/router-core/tests/path-decoder.bench.ts b/packages/router-core/tests/path-decoder.bench.ts index 23060b33be..4c56a8aa76 100644 --- a/packages/router-core/tests/path-decoder.bench.ts +++ b/packages/router-core/tests/path-decoder.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe, expect } from 'vitest' +import { describe, expect, test } from 'vitest' import { createMemoryHistory } from '@tanstack/history' import { BaseRootRoute, BaseRoute } from '../src' import { createTestRouter } from './routerTestUtils' @@ -51,11 +51,16 @@ describe.each(['stable', 'new-router', 'no-update'] as const)( } run() verify() - bench('update and build 200 locations', run, { - time: 1500, - warmupTime: 500, - throws: true, - teardown: verify, + test('update and build 200 locations', async ({ bench }) => { + await bench( + 'update and build 200 locations', + { afterAll: verify }, + run, + ).run({ + time: 1500, + warmupTime: 500, + throws: true, + }) }) }, ) diff --git a/packages/router-core/tests/path-interpolation.bench.ts b/packages/router-core/tests/path-interpolation.bench.ts index 53498b5198..80d3478594 100644 --- a/packages/router-core/tests/path-interpolation.bench.ts +++ b/packages/router-core/tests/path-interpolation.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe, expect } from 'vitest' +import { describe, expect, test } from 'vitest' import { createMemoryHistory, normalizeProtocolRelative, @@ -203,79 +203,88 @@ describe.each(scenarios)('$name', ({ inputs, register = true }) => { : parseSegments(false, { fullPath: input.path }, 0), })) - bench( - 'interpolation and normalization batch', - () => { - let length = 0 - for (const call of calls) { - length += canonicalPathname(call.path, call.params, call.route).length - } - checksum = length - }, - { + test('interpolation and normalization batch', async ({ bench }) => { + await bench( + 'interpolation and normalization batch', + { + afterAll: () => { + expect(checksum).toBe(cachedExpected) + }, + }, + () => { + let length = 0 + for (const call of calls) { + length += canonicalPathname(call.path, call.params, call.route).length + } + checksum = length + }, + ).run({ time: 1500, warmupTime: 500, throws: true, - teardown: () => { - expect(checksum).toBe(cachedExpected) - }, - }, - ) + }) + }) - bench( - 'prepared pathname interpolation batch', - () => { - let length = 0 - for (const input of preparedInputs) { - length += ( - input.segments - ? interpolatePath( - input.path, - input.segments, - input.params, - input.decoder, - ) - : input.path - ).length - } - checksum = length - }, - { + test('prepared pathname interpolation batch', async ({ bench }) => { + await bench( + 'prepared pathname interpolation batch', + { + afterAll: () => { + expect(checksum).toBe(expected) + }, + }, + () => { + let length = 0 + for (const input of preparedInputs) { + length += ( + input.segments + ? interpolatePath( + input.path, + input.segments, + input.params, + input.decoder, + ) + : input.path + ).length + } + checksum = length + }, + ).run({ time: 1500, warmupTime: 500, throws: true, - teardown: () => { - expect(checksum).toBe(expected) - }, - }, - ) + }) + }) - bench( - 'prepared metadata interpolation batch', - () => { - let length = 0 - for (const input of preparedInputs) { - length += ( - input.segments - ? interpolatePath( - input.path, - input.segments, - input.params, - input.decoder, - Object.create(null), - ) - : input.path - ).length - } - checksum = length - }, - { + test('prepared metadata interpolation batch', async ({ bench }) => { + await bench( + 'prepared metadata interpolation batch', + { + afterAll: () => { + expect(checksum).toBe(expected) + }, + }, + () => { + let length = 0 + for (const input of preparedInputs) { + length += ( + input.segments + ? interpolatePath( + input.path, + input.segments, + input.params, + input.decoder, + Object.create(null), + ) + : input.path + ).length + } + checksum = length + }, + ).run({ time: 1500, warmupTime: 500, throws: true, - teardown: () => { - expect(checksum).toBe(expected) - }, - }, - ) + }) + }) }) diff --git a/packages/router-core/tests/replace-equal-deep.bench.ts b/packages/router-core/tests/replace-equal-deep.bench.ts index 86639cb26d..044fbe38bc 100644 --- a/packages/router-core/tests/replace-equal-deep.bench.ts +++ b/packages/router-core/tests/replace-equal-deep.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe, expect } from 'vitest' +import { describe, expect, test } from 'vitest' import { createNull, deepEqual, @@ -199,213 +199,303 @@ const iterations = 1_000 let sink: unknown describe('isPlainObject', () => { - bench('literal', () => { - for (let i = 0; i < iterations; i++) { - sink = isPlainObject(search) - } + test('literal', async ({ bench }) => { + await bench('literal', () => { + for (let i = 0; i < iterations; i++) { + sink = isPlainObject(search) + } + }).run() }) - bench('null-proto record', () => { - for (let i = 0; i < iterations; i++) { - sink = isPlainObject(emptyNull) - } + test('null-proto record', async ({ bench }) => { + await bench('null-proto record', () => { + for (let i = 0; i < iterations; i++) { + sink = isPlainObject(emptyNull) + } + }).run() }) - bench('null-proto record with a constructor key', () => { - for (let i = 0; i < iterations; i++) { - sink = isPlainObject(searchWithConstructorKey) - } + test('null-proto record with a constructor key', async ({ bench }) => { + await bench('null-proto record with a constructor key', () => { + for (let i = 0; i < iterations; i++) { + sink = isPlainObject(searchWithConstructorKey) + } + }).run() }) - bench('class instance', () => { - for (let i = 0; i < iterations; i++) { - sink = isPlainObject(instance) - } + test('class instance', async ({ bench }) => { + await bench('class instance', () => { + for (let i = 0; i < iterations; i++) { + sink = isPlainObject(instance) + } + }).run() }) }) describe('replaceEqualDeep', () => { - bench('equal empty objects', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(empty, {}) - } + test('equal empty objects', async ({ bench }) => { + await bench('equal empty objects', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(empty, {}) + } + }).run() }) - bench('equal empty null-proto objects', () => { - for (let i = 0; i < iterations; i++) { - sink = nullReplaceEqualDeep(emptyNull, createNull()) - } + test('equal empty null-proto objects', async ({ bench }) => { + await bench('equal empty null-proto objects', () => { + for (let i = 0; i < iterations; i++) { + sink = nullReplaceEqualDeep(emptyNull, createNull()) + } + }).run() }) - bench('equal null-proto search with a constructor key', () => { - for (let i = 0; i < iterations; i++) { - sink = nullReplaceEqualDeep( - searchWithConstructorKey, - searchWithConstructorKeyCopy, - ) - } + test('equal null-proto search with a constructor key', async ({ bench }) => { + await bench('equal null-proto search with a constructor key', () => { + for (let i = 0; i < iterations; i++) { + sink = nullReplaceEqualDeep( + searchWithConstructorKey, + searchWithConstructorKeyCopy, + ) + } + }).run() }) - bench('equal flat search', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(search, searchCopy) - } + test('equal flat search', async ({ bench }) => { + await bench('equal flat search', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(search, searchCopy) + } + }).run() }) - bench('flat search with one changed leaf', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(search, searchChanged) - } + test('flat search with one changed leaf', async ({ bench }) => { + await bench('flat search with one changed leaf', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(search, searchChanged) + } + }).run() }) - bench('equal parsed null-proto search', () => { - for (let i = 0; i < iterations; i++) { - sink = nullReplaceEqualDeep(nullSearch, nullSearchCopy) - } + test('equal parsed null-proto search', async ({ bench }) => { + await bench('equal parsed null-proto search', () => { + for (let i = 0; i < iterations; i++) { + sink = nullReplaceEqualDeep(nullSearch, nullSearchCopy) + } + }).run() }) - bench('equal ordinary search against a null-proto previous value', () => { - for (let i = 0; i < iterations; i++) { - sink = nullReplaceEqualDeep(nullSearch, searchCopy) - } + test('equal ordinary search against a null-proto previous value', async ({ + bench, + }) => { + await bench( + 'equal ordinary search against a null-proto previous value', + () => { + for (let i = 0; i < iterations; i++) { + sink = nullReplaceEqualDeep(nullSearch, searchCopy) + } + }, + ).run() }) - bench('parsed null-proto search with one changed leaf', () => { - for (let i = 0; i < iterations; i++) { - sink = nullReplaceEqualDeep(nullSearch, nullSearchChanged) - } + test('parsed null-proto search with one changed leaf', async ({ bench }) => { + await bench('parsed null-proto search with one changed leaf', () => { + for (let i = 0; i < iterations; i++) { + sink = nullReplaceEqualDeep(nullSearch, nullSearchChanged) + } + }).run() }) - bench('ordinary search update in null-proto mode', () => { - for (let i = 0; i < iterations; i++) { - sink = nullReplaceEqualDeep(nullSearch, searchChanged) - } + test('ordinary search update in null-proto mode', async ({ bench }) => { + await bench('ordinary search update in null-proto mode', () => { + for (let i = 0; i < iterations; i++) { + sink = nullReplaceEqualDeep(nullSearch, searchChanged) + } + }).run() }) - bench('equal ordinary search in null-proto mode', () => { - for (let i = 0; i < iterations; i++) { - sink = nullReplaceEqualDeep(search, searchCopy) - } + test('equal ordinary search in null-proto mode', async ({ bench }) => { + await bench('equal ordinary search in null-proto mode', () => { + for (let i = 0; i < iterations; i++) { + sink = nullReplaceEqualDeep(search, searchCopy) + } + }).run() }) - bench('successive ordinary search update in null-proto mode', () => { - for (let i = 0; i < iterations; i++) { - sink = nullReplaceEqualDeep(search, searchChanged) - } + test('successive ordinary search update in null-proto mode', async ({ + bench, + }) => { + await bench('successive ordinary search update in null-proto mode', () => { + for (let i = 0; i < iterations; i++) { + sink = nullReplaceEqualDeep(search, searchChanged) + } + }).run() }) - bench('changed selector followed by the same incoming reference', () => { - for (let i = 0; i < iterations; i++) { - const current = replaceEqualDeep(search, searchChanged) - sink = replaceEqualDeep(current, searchChanged) - } + test('changed selector followed by the same incoming reference', async ({ + bench, + }) => { + await bench( + 'changed selector followed by the same incoming reference', + () => { + for (let i = 0; i < iterations; i++) { + const current = replaceEqualDeep(search, searchChanged) + sink = replaceEqualDeep(current, searchChanged) + } + }, + ).run() }) - bench('equal record with decimal values', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(decimalRecord, decimalRecordCopy) - } + test('equal record with decimal values', async ({ bench }) => { + await bench('equal record with decimal values', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(decimalRecord, decimalRecordCopy) + } + }).run() }) - bench('changed record with decimal values', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(decimalRecord, decimalRecordChanged) - } + test('changed record with decimal values', async ({ bench }) => { + await bench('changed record with decimal values', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(decimalRecord, decimalRecordChanged) + } + }).run() }) - bench('equal nested search', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(nested, nestedCopy) - } + test('equal nested search', async ({ bench }) => { + await bench('equal nested search', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(nested, nestedCopy) + } + }).run() }) - bench('nested search sharing unchanged subtrees', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(nested, nestedLeafChanged) - } + test('nested search sharing unchanged subtrees', async ({ bench }) => { + await bench('nested search sharing unchanged subtrees', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(nested, nestedLeafChanged) + } + }).run() }) - bench('nested search sharing unchanged subtrees in null-proto mode', () => { - for (let i = 0; i < iterations; i++) { - sink = nullReplaceEqualDeep(nested, nestedLeafChanged) - } + test('nested search sharing unchanged subtrees in null-proto mode', async ({ + bench, + }) => { + await bench( + 'nested search sharing unchanged subtrees in null-proto mode', + () => { + for (let i = 0; i < iterations; i++) { + sink = nullReplaceEqualDeep(nested, nestedLeafChanged) + } + }, + ).run() }) - bench('equal array of objects', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(list, listCopy) - } + test('equal array of objects', async ({ bench }) => { + await bench('equal array of objects', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(list, listCopy) + } + }).run() }) - bench('array of objects with one changed item', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(list, listChanged) - } + test('array of objects with one changed item', async ({ bench }) => { + await bench('array of objects with one changed item', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(list, listChanged) + } + }).run() }) - bench('wide flat object with one changed leaf', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(wide, wideChanged) - } + test('wide flat object with one changed leaf', async ({ bench }) => { + await bench('wide flat object with one changed leaf', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(wide, wideChanged) + } + }).run() }) - bench('wide flat object with one changed leaf (null-proto)', () => { - for (let i = 0; i < iterations; i++) { - sink = nullReplaceEqualDeep(wide, wideChanged) - } + test('wide flat object with one changed leaf (null-proto)', async ({ + bench, + }) => { + await bench('wide flat object with one changed leaf (null-proto)', () => { + for (let i = 0; i < iterations; i++) { + sink = nullReplaceEqualDeep(wide, wideChanged) + } + }).run() }) - bench('flat search with all leaves changed', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(search, searchAllChanged) - } + test('flat search with all leaves changed', async ({ bench }) => { + await bench('flat search with all leaves changed', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(search, searchAllChanged) + } + }).run() }) - bench('equal flat search with reordered keys', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(search, searchReordered) - } + test('equal flat search with reordered keys', async ({ bench }) => { + await bench('equal flat search with reordered keys', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(search, searchReordered) + } + }).run() }) - bench('flat search with a key removed', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(search, searchSubset) - } + test('flat search with a key removed', async ({ bench }) => { + await bench('flat search with a key removed', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(search, searchSubset) + } + }).run() }) - bench('array of shared objects with one changed item', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(list, listShared) - } + test('array of shared objects with one changed item', async ({ bench }) => { + await bench('array of shared objects with one changed item', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(list, listShared) + } + }).run() }) - bench('wider flat object (64 keys) with the last leaf changed', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(wider, widerChangedLast) - } + test('wider flat object (64 keys) with the last leaf changed', async ({ + bench, + }) => { + await bench( + 'wider flat object (64 keys) with the last leaf changed', + () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(wider, widerChangedLast) + } + }, + ).run() }) - bench('flat object growing from 8 to 64 keys', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(widerSubset, wider) - } + test('flat object growing from 8 to 64 keys', async ({ bench }) => { + await bench('flat object growing from 8 to 64 keys', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(widerSubset, wider) + } + }).run() }) for (const [name, next] of [ ['first leaf changed', widerChangedFirst], ['all leaves changed', widerAllChanged], ] as const) { - bench(`wider flat object (64 keys) with ${name}`, () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(wider, next) - } + test(`wider flat object (64 keys) with ${name}`, async ({ bench }) => { + await bench(`wider flat object (64 keys) with ${name}`, () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(wider, next) + } + }).run() }) } - bench('equal long array of shared objects', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(longList, longListCopy) - } + test('equal long array of shared objects', async ({ bench }) => { + await bench('equal long array of shared objects', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(longList, longListCopy) + } + }).run() }) for (const [name, next] of [ @@ -413,10 +503,17 @@ describe('replaceEqualDeep', () => { ['changed', longListChangedLast], ['changed after a cloned but equal item', longListClonedThenChanged], ] as const) { - bench(`long array of shared objects with the last item ${name}`, () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(longList, next) - } + test(`long array of shared objects with the last item ${name}`, async ({ + bench, + }) => { + await bench( + `long array of shared objects with the last item ${name}`, + () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(longList, next) + } + }, + ).run() }) } @@ -424,23 +521,29 @@ describe('replaceEqualDeep', () => { const prev = Array.from({ length }, (_, index) => index) const next = [...prev] expect(replaceEqualDeep(prev, next)).toBe(prev) - bench(`equal primitive array of length ${length}`, () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(prev, next) - } + test(`equal primitive array of length ${length}`, async ({ bench }) => { + await bench(`equal primitive array of length ${length}`, () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(prev, next) + } + }).run() }) } - bench('equal long primitive array', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(numbers, numbersCopy) - } + test('equal long primitive array', async ({ bench }) => { + await bench('equal long primitive array', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(numbers, numbersCopy) + } + }).run() }) - bench('long primitive array with the last item changed', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(numbers, numbersChangedLast) - } + test('long primitive array with the last item changed', async ({ bench }) => { + await bench('long primitive array with the last item changed', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(numbers, numbersChangedLast) + } + }).run() }) for (const [name, next] of [ @@ -450,88 +553,112 @@ describe('replaceEqualDeep', () => { ['shortened', numbersShorter], ['appended undefined values', numbersLonger], ] as const) { - bench(`long primitive array with ${name}`, () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(numbers, next) - } + test(`long primitive array with ${name}`, async ({ bench }) => { + await bench(`long primitive array with ${name}`, () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(numbers, next) + } + }).run() }) } - bench('small primitive array with the first item changed', () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(smallNumbers, smallNumbersChanged) - } + test('small primitive array with the first item changed', async ({ + bench, + }) => { + await bench('small primitive array with the first item changed', () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(smallNumbers, smallNumbersChanged) + } + }).run() }) - bench('mixed search and array updates', () => { - for (let i = 0; i < iterations; i++) { - const [prev, next] = mixedPairs[i % mixedPairs.length]! - sink = replaceEqualDeep(prev, next) - } + test('mixed search and array updates', async ({ bench }) => { + await bench('mixed search and array updates', () => { + for (let i = 0; i < iterations; i++) { + const [prev, next] = mixedPairs[i % mixedPairs.length]! + sink = replaceEqualDeep(prev, next) + } + }).run() }) for (const { name, prev, next } of numericResults) { - bench(`long ${name} array with the last item changed`, () => { - for (let i = 0; i < iterations; i++) { - sink = replaceEqualDeep(prev, next) - } + test(`long ${name} array with the last item changed`, async ({ bench }) => { + await bench(`long ${name} array with the last item changed`, () => { + for (let i = 0; i < iterations; i++) { + sink = replaceEqualDeep(prev, next) + } + }).run() }) } }) describe('consume structurally shared arrays', () => { - bench('sum changed primitive array by index', () => { - for (let i = 0; i < iterations; i++) { - let sum = 0 - for (let j = 0; j < consumedNumbers.length; j++) { - sum += consumedNumbers[j]! - } - sink = sum - } - }) - - bench('reduce changed primitive array', () => { - for (let i = 0; i < iterations; i++) { - sink = consumedNumbers.reduce((sum, value) => sum + value, 0) - } - }) - - for (const { name, result } of numericResults) { - bench(`sum changed ${name} array by index`, () => { + test('sum changed primitive array by index', async ({ bench }) => { + await bench('sum changed primitive array by index', () => { for (let i = 0; i < iterations; i++) { let sum = 0 - for (let j = 0; j < result.length; j++) { - sum += result[j]! + for (let j = 0; j < consumedNumbers.length; j++) { + sum += consumedNumbers[j]! } sink = sum } + }).run() + }) + + test('reduce changed primitive array', async ({ bench }) => { + await bench('reduce changed primitive array', () => { + for (let i = 0; i < iterations; i++) { + sink = consumedNumbers.reduce((sum, value) => sum + value, 0) + } + }).run() + }) + + for (const { name, result } of numericResults) { + test(`sum changed ${name} array by index`, async ({ bench }) => { + await bench(`sum changed ${name} array by index`, () => { + for (let i = 0; i < iterations; i++) { + let sum = 0 + for (let j = 0; j < result.length; j++) { + sum += result[j]! + } + sink = sum + } + }).run() }) - bench(`reduce changed ${name} array`, () => { - for (let i = 0; i < iterations; i++) { - sink = result.reduce((sum, value) => sum + value, 0) - } + test(`reduce changed ${name} array`, async ({ bench }) => { + await bench(`reduce changed ${name} array`, () => { + for (let i = 0; i < iterations; i++) { + sink = result.reduce((sum, value) => sum + value, 0) + } + }).run() }) } }) describe('deepEqual', () => { - bench('equal empty objects', () => { - for (let i = 0; i < iterations; i++) { - sink = deepEqual(empty, {}) - } + test('equal empty objects', async ({ bench }) => { + await bench('equal empty objects', () => { + for (let i = 0; i < iterations; i++) { + sink = deepEqual(empty, {}) + } + }).run() }) - bench('equal flat search (partial)', () => { - for (let i = 0; i < iterations; i++) { - sink = deepEqual(search, searchCopy, true) - } + test('equal flat search (partial)', async ({ bench }) => { + await bench('equal flat search (partial)', () => { + for (let i = 0; i < iterations; i++) { + sink = deepEqual(search, searchCopy, true) + } + }).run() }) - bench('nested search with one changed leaf', () => { - for (let i = 0; i < iterations; i++) { - sink = deepEqual(nested, nestedLeafChanged) - } + test('nested search with one changed leaf', async ({ bench }) => { + await bench('nested search with one changed leaf', () => { + for (let i = 0; i < iterations; i++) { + sink = deepEqual(nested, nestedLeafChanged) + } + }).run() }) }) diff --git a/packages/router-core/tests/rewrite.bench.ts b/packages/router-core/tests/rewrite.bench.ts index 0ccf78cb82..1f7b88d610 100644 --- a/packages/router-core/tests/rewrite.bench.ts +++ b/packages/router-core/tests/rewrite.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe, expect } from 'vitest' +import { describe, expect, test } from 'vitest' import { createMemoryHistory } from '@tanstack/history' import { BaseRootRoute } from '../src' import { @@ -89,50 +89,59 @@ describe.each([ url = executeRewriteOutput(rewrite, url) expect(url.href).toBe('https://example.com/app/public?sort=name#title') - bench( - `${name} round trip`, - () => { - // Reuse the round-trip URL so URL construction does not hide the - // composition cost for callbacks that mutate or leave it unchanged. - for (let index = 0; index < 64; index++) { - url = executeRewriteOutput(rewrite, executeRewriteInput(rewrite, url)) - } - }, - { + test(`${name} round trip`, async ({ bench }) => { + await bench( + `${name} round trip`, + { + afterAll: () => { + expect(url.href).toBe( + 'https://example.com/app/public?sort=name#title', + ) + }, + }, + () => { + // Reuse the round-trip URL so URL construction does not hide the + // composition cost for callbacks that mutate or leave it unchanged. + for (let index = 0; index < 64; index++) { + url = executeRewriteOutput( + rewrite, + executeRewriteInput(rewrite, url), + ) + } + }, + ).run({ time: 1000, warmupTime: 200, throws: true, - teardown: () => { - expect(url.href).toBe( - 'https://example.com/app/public?sort=name#title', - ) - }, - }, - ) + }) + }) } let trailingSlash = false - bench( - 'router update rebuilding the rewrite', - () => { - if (custom) { - router.update({ rewrite: { ...custom } }) - } else { - trailingSlash = !trailingSlash - router.update({ basepath: trailingSlash ? '/app/' : '/app' }) - } - }, - { + test('router update rebuilding the rewrite', async ({ bench }) => { + await bench( + 'router update rebuilding the rewrite', + { + afterAll: () => { + expect(router.latestLocation.pathname).toBe( + unchanged ? '/public' : '/internal', + ) + }, + }, + () => { + if (custom) { + router.update({ rewrite: { ...custom } }) + } else { + trailingSlash = !trailingSlash + router.update({ basepath: trailingSlash ? '/app/' : '/app' }) + } + }, + ).run({ time: 1000, warmupTime: 200, throws: true, - teardown: () => { - expect(router.latestLocation.pathname).toBe( - unchanged ? '/public' : '/internal', - ) - }, - }, - ) + }) + }) }) describe.each(['/', '/app'])('unchanged rewrite options (%s)', (basepath) => { @@ -152,17 +161,20 @@ describe.each(['/', '/app'])('unchanged rewrite options (%s)', (basepath) => { expect(router.rewrite).toBe(rewrite) expect(router.latestLocation.pathname).toBe('/public') - bench( - 'router update without rebuilding the rewrite', - () => router.update({}), - { + test('router update without rebuilding the rewrite', async ({ bench }) => { + await bench( + 'router update without rebuilding the rewrite', + { + afterAll: () => { + expect(router.rewrite).toBe(rewrite) + expect(router.latestLocation.pathname).toBe('/public') + }, + }, + () => router.update({}), + ).run({ time: 1000, warmupTime: 200, throws: true, - teardown: () => { - expect(router.rewrite).toBe(rewrite) - expect(router.latestLocation.pathname).toBe('/public') - }, - }, - ) + }) + }) }) diff --git a/packages/router-core/tests/route-tree-construction.bench.ts b/packages/router-core/tests/route-tree-construction.bench.ts index 6d564d9e84..e567f06d36 100644 --- a/packages/router-core/tests/route-tree-construction.bench.ts +++ b/packages/router-core/tests/route-tree-construction.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe, expect } from 'vitest' +import { describe, expect, test } from 'vitest' import { BaseRootRoute, BaseRoute } from '../src' import { findRouteMatch, processRouteTree } from '../src/new-process-route-tree' import type { AnyRoute } from '../src' @@ -62,37 +62,42 @@ for (const count of [100, 1000, 10000]) { } verify() - bench( - 'processRouteTree + route.init on fresh objects', - () => { - result = processRouteTree(tree) - }, - { - setup: (task) => { - // Vitest forwards Bench options, not per-iteration Task options. - task.opts.beforeEach = () => { + test('processRouteTree + route.init on fresh objects', async ({ + bench, + }) => { + await bench( + 'processRouteTree + route.init on fresh objects', + { + beforeEach: () => { tree = createTree(count, shape) - } + }, + afterAll: verify, }, - teardown: verify, + () => { + result = processRouteTree(tree) + }, + ).run({ time: 1500, warmupTime: 500, throws: true, - }, - ) + }) + }) - bench( - 'route objects + processRouteTree + route.init', - () => { - result = processRouteTree(createTree(count, shape)) - }, - { - teardown: verify, + test('route objects + processRouteTree + route.init', async ({ + bench, + }) => { + await bench( + 'route objects + processRouteTree + route.init', + { afterAll: verify }, + () => { + result = processRouteTree(createTree(count, shape)) + }, + ).run({ time: 1500, warmupTime: 500, throws: true, - }, - ) + }) + }) }, ) } diff --git a/packages/router-core/tests/searchParams-parse.bench.ts b/packages/router-core/tests/searchParams-parse.bench.ts index ff94dcb99e..79f7e3e5ac 100644 --- a/packages/router-core/tests/searchParams-parse.bench.ts +++ b/packages/router-core/tests/searchParams-parse.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe, expect } from 'vitest' +import { describe, expect, test } from 'vitest' import { defaultParseSearch, parseSearchWith } from '../src' const iterations = 1_000 @@ -184,60 +184,96 @@ const searches = Object.fromEntries( ) describe('default search parsing', () => { - bench('ordinary string values', () => { - parseBatch(searches.ordinaryStrings!) + test('ordinary string values', async ({ bench }) => { + await bench('ordinary string values', () => { + parseBatch(searches.ordinaryStrings!) + }).run() }) - bench('ordinary strings outside JSON-literal initials', () => { - parseBatch(searches.nonLiteralInitialStrings!) + test('ordinary strings outside JSON-literal initials', async ({ bench }) => { + await bench('ordinary strings outside JSON-literal initials', () => { + parseBatch(searches.nonLiteralInitialStrings!) + }).run() }) - bench('ordinary strings with JSON-literal initials', () => { - parseBatch(searches.jsonInitialStrings!) + test('ordinary strings with JSON-literal initials', async ({ bench }) => { + await bench('ordinary strings with JSON-literal initials', () => { + parseBatch(searches.jsonInitialStrings!) + }).run() }) - bench('empty string values', () => { - parseBatch(searches.emptyStrings!) + test('empty string values', async ({ bench }) => { + await bench('empty string values', () => { + parseBatch(searches.emptyStrings!) + }).run() }) - bench('ordinary strings with non-JSON punctuation starts', () => { - parseBatch(searches.punctuationStrings!) + test('ordinary strings with non-JSON punctuation starts', async ({ + bench, + }) => { + await bench('ordinary strings with non-JSON punctuation starts', () => { + parseBatch(searches.punctuationStrings!) + }).run() }) - bench('ordinary f/n/t words outside JSON-literal prefixes', () => { - parseBatch(searches.nonLiteralPrefixStrings!) + test('ordinary f/n/t words outside JSON-literal prefixes', async ({ + bench, + }) => { + await bench('ordinary f/n/t words outside JSON-literal prefixes', () => { + parseBatch(searches.nonLiteralPrefixStrings!) + }).run() }) - bench('application words with JSON-literal prefixes', () => { - parseBatch(searches.jsonLiteralPrefixStrings!) + test('application words with JSON-literal prefixes', async ({ bench }) => { + await bench('application words with JSON-literal prefixes', () => { + parseBatch(searches.jsonLiteralPrefixStrings!) + }).run() }) - bench('application words with complete JSON-literal prefixes', () => { - parseBatch(searches.jsonLiteralWordStrings!) + test('application words with complete JSON-literal prefixes', async ({ + bench, + }) => { + await bench('application words with complete JSON-literal prefixes', () => { + parseBatch(searches.jsonLiteralWordStrings!) + }).run() }) - bench('JSON-literal prefixes followed by punctuation', () => { - parseBatch(searches.jsonLiteralBoundaryStrings!) + test('JSON-literal prefixes followed by punctuation', async ({ bench }) => { + await bench('JSON-literal prefixes followed by punctuation', () => { + parseBatch(searches.jsonLiteralBoundaryStrings!) + }).run() }) - bench('JSON-compatible string values', () => { - parseBatch(searches.jsonStrings!) + test('JSON-compatible string values', async ({ bench }) => { + await bench('JSON-compatible string values', () => { + parseBatch(searches.jsonStrings!) + }).run() }) - bench('mixed application values', () => { - parseBatch(searches.mixedValues!) + test('mixed application values', async ({ bench }) => { + await bench('mixed application values', () => { + parseBatch(searches.mixedValues!) + }).run() }) - bench('primitives already converted by decode', () => { - parseBatch(searches.decodedPrimitives!) + test('primitives already converted by decode', async ({ bench }) => { + await bench('primitives already converted by decode', () => { + parseBatch(searches.decodedPrimitives!) + }).run() }) - bench('strings requiring JSON.parse', () => { - parseBatch(searches.parsedJson!) + test('strings requiring JSON.parse', async ({ bench }) => { + await bench('strings requiring JSON.parse', () => { + parseBatch(searches.parsedJson!) + }).run() }) - bench('JSON with leading whitespace', () => { - parseBatch(searches.whitespaceJson!) + test('JSON with leading whitespace', async ({ bench }) => { + await bench('JSON with leading whitespace', () => { + parseBatch(searches.whitespaceJson!) + }).run() }) - bench('malformed JSON retains original strings', () => { - parseBatch(searches.malformedJson!) + test('malformed JSON retains original strings', async ({ bench }) => { + await bench('malformed JSON retains original strings', () => { + parseBatch(searches.malformedJson!) + }).run() }) }) @@ -248,16 +284,20 @@ expect(customParse(searches.ordinaryStrings!)).toEqual({ category: 'HARDWARE', sort: 'NEWEST', }) -bench('custom search parser ordinary strings', () => { - parseBatch(searches.ordinaryStrings!, customParse) +test('custom search parser ordinary strings', async ({ bench }) => { + await bench('custom search parser ordinary strings', () => { + parseBatch(searches.ordinaryStrings!, customParse) + }).run() }) const throwingParse = parseSearchWith(() => { throw new Error('not parseable') }) expect(throwingParse(searches.ordinaryStrings!)).toEqual(ordinaryStrings) -bench('custom search parser rejected strings', () => { - parseBatch(searches.ordinaryStrings!, throwingParse) +test('custom search parser rejected strings', async ({ bench }) => { + await bench('custom search parser rejected strings', () => { + parseBatch(searches.ordinaryStrings!, throwingParse) + }).run() }) const encodedMixed = new URLSearchParams([ @@ -279,8 +319,10 @@ expect(defaultParseSearch(encodedMixed)).toEqual({ category: 'favorite', tag: ['one', 'two'], }) -bench('encoded mixed search with repeated keys', () => { - parseBatch(encodedMixed) +test('encoded mixed search with repeated keys', async ({ bench }) => { + await bench('encoded mixed search with repeated keys', () => { + parseBatch(encodedMixed) + }).run() }) void benchmarkSink diff --git a/packages/router-core/tests/searchParams.bench.ts b/packages/router-core/tests/searchParams.bench.ts index 35fda3060f..32d42b96fd 100644 --- a/packages/router-core/tests/searchParams.bench.ts +++ b/packages/router-core/tests/searchParams.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe, expect } from 'vitest' +import { describe, expect, test } from 'vitest' import { defaultStringifySearch } from '../src' const iterations = 1_000 @@ -112,56 +112,88 @@ function stringifyBatch(search: Record) { } describe('default search serialization', () => { - bench('empty object', () => { - stringifyBatch({}) + test('empty object', async ({ bench }) => { + await bench('empty object', () => { + stringifyBatch({}) + }).run() }) - bench('only undefined values', () => { - stringifyBatch({ first: undefined, second: undefined }) + test('only undefined values', async ({ bench }) => { + await bench('only undefined values', () => { + stringifyBatch({ first: undefined, second: undefined }) + }).run() }) - bench('ordinary string values', () => { - stringifyBatch(ordinaryStrings) + test('ordinary string values', async ({ bench }) => { + await bench('ordinary string values', () => { + stringifyBatch(ordinaryStrings) + }).run() }) - bench('ordinary strings outside JSON-literal initials', () => { - stringifyBatch(nonLiteralInitialStrings) + test('ordinary strings outside JSON-literal initials', async ({ bench }) => { + await bench('ordinary strings outside JSON-literal initials', () => { + stringifyBatch(nonLiteralInitialStrings) + }).run() }) - bench('ordinary strings with JSON-literal initials', () => { - stringifyBatch(jsonInitialStrings) + test('ordinary strings with JSON-literal initials', async ({ bench }) => { + await bench('ordinary strings with JSON-literal initials', () => { + stringifyBatch(jsonInitialStrings) + }).run() }) - bench('empty string values', () => { - stringifyBatch(emptyStrings) + test('empty string values', async ({ bench }) => { + await bench('empty string values', () => { + stringifyBatch(emptyStrings) + }).run() }) - bench('ordinary strings with non-JSON punctuation starts', () => { - stringifyBatch(punctuationStrings) + test('ordinary strings with non-JSON punctuation starts', async ({ + bench, + }) => { + await bench('ordinary strings with non-JSON punctuation starts', () => { + stringifyBatch(punctuationStrings) + }).run() }) - bench('ordinary f/n/t words outside JSON-literal prefixes', () => { - stringifyBatch(nonLiteralPrefixStrings) + test('ordinary f/n/t words outside JSON-literal prefixes', async ({ + bench, + }) => { + await bench('ordinary f/n/t words outside JSON-literal prefixes', () => { + stringifyBatch(nonLiteralPrefixStrings) + }).run() }) - bench('application words with JSON-literal prefixes', () => { - stringifyBatch(jsonLiteralPrefixStrings) + test('application words with JSON-literal prefixes', async ({ bench }) => { + await bench('application words with JSON-literal prefixes', () => { + stringifyBatch(jsonLiteralPrefixStrings) + }).run() }) - bench('application words with complete JSON-literal prefixes', () => { - stringifyBatch(jsonLiteralWordStrings) + test('application words with complete JSON-literal prefixes', async ({ + bench, + }) => { + await bench('application words with complete JSON-literal prefixes', () => { + stringifyBatch(jsonLiteralWordStrings) + }).run() }) - bench('JSON-literal prefixes followed by punctuation', () => { - stringifyBatch(jsonLiteralBoundaryStrings) + test('JSON-literal prefixes followed by punctuation', async ({ bench }) => { + await bench('JSON-literal prefixes followed by punctuation', () => { + stringifyBatch(jsonLiteralBoundaryStrings) + }).run() }) - bench('JSON-compatible string values', () => { - stringifyBatch(jsonStrings) + test('JSON-compatible string values', async ({ bench }) => { + await bench('JSON-compatible string values', () => { + stringifyBatch(jsonStrings) + }).run() }) - bench('mixed application values', () => { - stringifyBatch(mixedValues) + test('mixed application values', async ({ bench }) => { + await bench('mixed application values', () => { + stringifyBatch(mixedValues) + }).run() }) }) diff --git a/packages/router-core/tests/server-history.test.ts b/packages/router-core/tests/server-history.test.ts index 86485fbe4c..6343a08cd2 100644 --- a/packages/router-core/tests/server-history.test.ts +++ b/packages/router-core/tests/server-history.test.ts @@ -1,8 +1,142 @@ import { createMemoryHistory, createServerHistory } from '@tanstack/history' import { expect, test, vi } from 'vitest' import { BaseRootRoute, BaseRoute, redirect } from '../src' +import { createRequestHandler } from '../src/ssr/server' import { createTestRouter, loadServerResponse } from './routerTestUtils' +test.each([ + { basepath: '', origin: undefined }, + { basepath: '/app', origin: undefined }, + { basepath: '/app', origin: 'https://canonical.example' }, +])( + 'request handling rewrites once with basepath $basepath and origin $origin', + async ({ basepath, origin }) => { + const root = new BaseRootRoute() + const input = vi.fn(({ url }: { url: URL }) => { + url.pathname = url.pathname.replace('/public/', '/posts/') + return url + }) + const router = createTestRouter({ + isServer: true, + basepath, + origin, + rewrite: { + input, + output: ({ url }) => { + url.pathname = url.pathname.replace('/posts/', '/public/') + return url + }, + }, + routeTree: root.addChildren([ + new BaseRoute({ + getParentRoute: () => root, + path: '/posts/$postId', + loader: ({ params }) => params.postId, + }), + ]), + }) + input.mockClear() + + const response = await createRequestHandler({ + createRouter: () => router, + request: new Request( + `https://example.com${basepath}/public/caf%C3%A9?view=full`, + ), + })(({ router: loadedRouter }) => { + return Response.json({ + postId: loadedRouter.state.matches.at(-1)?.loaderData, + pathname: loadedRouter.state.location.pathname, + search: loadedRouter.state.location.search, + }) + }) + + expect(response.status).toBe(200) + expect(await response.json()).toEqual({ + postId: 'café', + pathname: '/posts/café', + search: { view: 'full' }, + }) + expect(input).toHaveBeenCalledTimes(1) + expect(input.mock.calls[0]?.[0].url.origin).toBe( + origin ?? 'https://example.com', + ) + }, +) + +test.each([ + { isServer: false, action: 'push' }, + { isServer: false, action: 'replace' }, + { isServer: true, action: 'push' }, + { isServer: true, action: 'replace' }, +] as const)( + 'loads refresh memory history after $action with isServer=$isServer by default', + async ({ isServer, action }) => { + const root = new BaseRootRoute() + const targetLoader = vi.fn(() => 'target') + const history = createMemoryHistory({ initialEntries: ['/'] }) + const router = createTestRouter({ + isServer, + history, + routeTree: root.addChildren([ + new BaseRoute({ getParentRoute: () => root, path: '/' }), + new BaseRoute({ + getParentRoute: () => root, + path: '/target', + loader: targetLoader, + }), + ]), + }) + await router.load() + + history[action]('/target') + await router.load() + + expect(router.state.location.pathname).toBe('/target') + expect(targetLoader).toHaveBeenCalledTimes(1) + expect(router.state.matches.at(-1)?.loaderData).toBe('target') + }, +) + +test('server loads reuse a location prepared with updated router options', async () => { + const root = new BaseRootRoute() + const input = vi.fn(({ url }: { url: URL }) => { + url.pathname = url.pathname.replace('/public', '/target') + return url + }) + const router = createTestRouter({ + isServer: true, + basepath: '/old', + history: createMemoryHistory({ initialEntries: ['/old/'] }), + routeTree: root.addChildren([ + new BaseRoute({ getParentRoute: () => root, path: '/' }), + new BaseRoute({ + getParentRoute: () => root, + path: '/target', + loader: () => 'target', + }), + ]), + }) + router.update({ + history: createServerHistory('/app/public'), + basepath: '/app', + rewrite: { + input, + output: ({ url }) => { + url.pathname = url.pathname.replace('/target', '/public') + return url + }, + }, + }) + input.mockClear() + + await router.load({ _skipLocationUpdate: true }) + + expect(router.state.location.pathname).toBe('/target') + expect(router.state.location.publicHref).toBe('/app/public') + expect(router.state.matches.at(-1)?.loaderData).toBe('target') + expect(input).not.toHaveBeenCalled() +}) + test.each([false, true])( 'router navigation respects isServer=%s with memory history', async (isServer) => { diff --git a/packages/router-core/tests/ssr-match-id.bench.ts b/packages/router-core/tests/ssr-match-id.bench.ts index 650a5e33f3..33e0bb5945 100644 --- a/packages/router-core/tests/ssr-match-id.bench.ts +++ b/packages/router-core/tests/ssr-match-id.bench.ts @@ -1,4 +1,4 @@ -import { bench, describe } from 'vitest' +import { describe, test } from 'vitest' import { dehydrateSsrMatchId } from '../src/ssr/ssr-match-id' const typicalIds = Array.from( @@ -14,20 +14,24 @@ const deepIds = Array.from( let benchmarkSink = 0 describe('SSR match ID codec', () => { - bench('encode 100 typical match IDs', () => { - let size = 0 - for (const id of typicalIds) { - size += dehydrateSsrMatchId(id).length - } - benchmarkSink = size + test('encode 100 typical match IDs', async ({ bench }) => { + await bench('encode 100 typical match IDs', () => { + let size = 0 + for (const id of typicalIds) { + size += dehydrateSsrMatchId(id).length + } + benchmarkSink = size + }).run() }) - bench('encode 100 deep match IDs', () => { - let size = 0 - for (const id of deepIds) { - 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() }) }) diff --git a/packages/router-devtools-core/CHANGELOG.md b/packages/router-devtools-core/CHANGELOG.md index 791c877aa9..63eb2961dd 100644 --- a/packages/router-devtools-core/CHANGELOG.md +++ b/packages/router-devtools-core/CHANGELOG.md @@ -1,5 +1,11 @@ # @tanstack/router-devtools-core +## 1.168.3 + +### Patch Changes + +- [#8888](https://github.com/TanStack/router/pull/8888) [`bbf9b75`](https://github.com/TanStack/router/commit/bbf9b75808d8eee497a6dd1663f0cf08426512e0) - Fix broken styling of the embedded `TanStackRouterDevtoolsPanel` (including inside shadow DOM) by giving the devtools size tokens a `1rem` fallback when `--tsrd-font-size` is not set. + ## 1.168.2 ### Patch Changes diff --git a/packages/router-devtools-core/package.json b/packages/router-devtools-core/package.json index 722a76e522..24db637cc7 100644 --- a/packages/router-devtools-core/package.json +++ b/packages/router-devtools-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-devtools-core", - "version": "1.168.2", + "version": "1.168.3", "description": "Modern and scalable routing for Web applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-devtools-core/src/tokens.ts b/packages/router-devtools-core/src/tokens.ts index 9d247cf184..97ed9e4cd9 100644 --- a/packages/router-devtools-core/src/tokens.ts +++ b/packages/router-devtools-core/src/tokens.ts @@ -161,37 +161,37 @@ export const tokens = { }, font: { size: { - '2xs': 'calc(var(--tsrd-font-size) * 0.625)', - xs: 'calc(var(--tsrd-font-size) * 0.75)', - sm: 'calc(var(--tsrd-font-size) * 0.875)', - md: 'var(--tsrd-font-size)', - lg: 'calc(var(--tsrd-font-size) * 1.125)', - xl: 'calc(var(--tsrd-font-size) * 1.25)', - '2xl': 'calc(var(--tsrd-font-size) * 1.5)', - '3xl': 'calc(var(--tsrd-font-size) * 1.875)', - '4xl': 'calc(var(--tsrd-font-size) * 2.25)', - '5xl': 'calc(var(--tsrd-font-size) * 3)', - '6xl': 'calc(var(--tsrd-font-size) * 3.75)', - '7xl': 'calc(var(--tsrd-font-size) * 4.5)', - '8xl': 'calc(var(--tsrd-font-size) * 6)', - '9xl': 'calc(var(--tsrd-font-size) * 8)', + '2xs': 'calc(var(--tsrd-font-size, 1rem) * 0.625)', + xs: 'calc(var(--tsrd-font-size, 1rem) * 0.75)', + sm: 'calc(var(--tsrd-font-size, 1rem) * 0.875)', + md: 'var(--tsrd-font-size, 1rem)', + lg: 'calc(var(--tsrd-font-size, 1rem) * 1.125)', + xl: 'calc(var(--tsrd-font-size, 1rem) * 1.25)', + '2xl': 'calc(var(--tsrd-font-size, 1rem) * 1.5)', + '3xl': 'calc(var(--tsrd-font-size, 1rem) * 1.875)', + '4xl': 'calc(var(--tsrd-font-size, 1rem) * 2.25)', + '5xl': 'calc(var(--tsrd-font-size, 1rem) * 3)', + '6xl': 'calc(var(--tsrd-font-size, 1rem) * 3.75)', + '7xl': 'calc(var(--tsrd-font-size, 1rem) * 4.5)', + '8xl': 'calc(var(--tsrd-font-size, 1rem) * 6)', + '9xl': 'calc(var(--tsrd-font-size, 1rem) * 8)', }, lineHeight: { - '3xs': 'calc(var(--tsrd-font-size) * 0.75)', - '2xs': 'calc(var(--tsrd-font-size) * 0.875)', - xs: 'calc(var(--tsrd-font-size) * 1)', - sm: 'calc(var(--tsrd-font-size) * 1.25)', - md: 'calc(var(--tsrd-font-size) * 1.5)', - lg: 'calc(var(--tsrd-font-size) * 1.75)', - xl: 'calc(var(--tsrd-font-size) * 2)', - '2xl': 'calc(var(--tsrd-font-size) * 2.25)', - '3xl': 'calc(var(--tsrd-font-size) * 2.5)', - '4xl': 'calc(var(--tsrd-font-size) * 2.75)', - '5xl': 'calc(var(--tsrd-font-size) * 3)', - '6xl': 'calc(var(--tsrd-font-size) * 3.25)', - '7xl': 'calc(var(--tsrd-font-size) * 3.5)', - '8xl': 'calc(var(--tsrd-font-size) * 3.75)', - '9xl': 'calc(var(--tsrd-font-size) * 4)', + '3xs': 'calc(var(--tsrd-font-size, 1rem) * 0.75)', + '2xs': 'calc(var(--tsrd-font-size, 1rem) * 0.875)', + xs: 'calc(var(--tsrd-font-size, 1rem) * 1)', + sm: 'calc(var(--tsrd-font-size, 1rem) * 1.25)', + md: 'calc(var(--tsrd-font-size, 1rem) * 1.5)', + lg: 'calc(var(--tsrd-font-size, 1rem) * 1.75)', + xl: 'calc(var(--tsrd-font-size, 1rem) * 2)', + '2xl': 'calc(var(--tsrd-font-size, 1rem) * 2.25)', + '3xl': 'calc(var(--tsrd-font-size, 1rem) * 2.5)', + '4xl': 'calc(var(--tsrd-font-size, 1rem) * 2.75)', + '5xl': 'calc(var(--tsrd-font-size, 1rem) * 3)', + '6xl': 'calc(var(--tsrd-font-size, 1rem) * 3.25)', + '7xl': 'calc(var(--tsrd-font-size, 1rem) * 3.5)', + '8xl': 'calc(var(--tsrd-font-size, 1rem) * 3.75)', + '9xl': 'calc(var(--tsrd-font-size, 1rem) * 4)', }, weight: { thin: '100', @@ -220,55 +220,55 @@ export const tokens = { border: { radius: { none: '0px', - xs: 'calc(var(--tsrd-font-size) * 0.125)', - sm: 'calc(var(--tsrd-font-size) * 0.25)', - md: 'calc(var(--tsrd-font-size) * 0.375)', - lg: 'calc(var(--tsrd-font-size) * 0.5)', - xl: 'calc(var(--tsrd-font-size) * 0.75)', - '2xl': 'calc(var(--tsrd-font-size) * 1)', - '3xl': 'calc(var(--tsrd-font-size) * 1.5)', + xs: 'calc(var(--tsrd-font-size, 1rem) * 0.125)', + sm: 'calc(var(--tsrd-font-size, 1rem) * 0.25)', + md: 'calc(var(--tsrd-font-size, 1rem) * 0.375)', + lg: 'calc(var(--tsrd-font-size, 1rem) * 0.5)', + xl: 'calc(var(--tsrd-font-size, 1rem) * 0.75)', + '2xl': 'calc(var(--tsrd-font-size, 1rem) * 1)', + '3xl': 'calc(var(--tsrd-font-size, 1rem) * 1.5)', full: '9999px', }, }, size: { 0: '0px', - 0.25: 'calc(var(--tsrd-font-size) * 0.0625)', - 0.5: 'calc(var(--tsrd-font-size) * 0.125)', - 1: 'calc(var(--tsrd-font-size) * 0.25)', - 1.5: 'calc(var(--tsrd-font-size) * 0.375)', - 2: 'calc(var(--tsrd-font-size) * 0.5)', - 2.5: 'calc(var(--tsrd-font-size) * 0.625)', - 3: 'calc(var(--tsrd-font-size) * 0.75)', - 3.5: 'calc(var(--tsrd-font-size) * 0.875)', - 4: 'calc(var(--tsrd-font-size) * 1)', - 4.5: 'calc(var(--tsrd-font-size) * 1.125)', - 5: 'calc(var(--tsrd-font-size) * 1.25)', - 5.5: 'calc(var(--tsrd-font-size) * 1.375)', - 6: 'calc(var(--tsrd-font-size) * 1.5)', - 6.5: 'calc(var(--tsrd-font-size) * 1.625)', - 7: 'calc(var(--tsrd-font-size) * 1.75)', - 8: 'calc(var(--tsrd-font-size) * 2)', - 9: 'calc(var(--tsrd-font-size) * 2.25)', - 10: 'calc(var(--tsrd-font-size) * 2.5)', - 11: 'calc(var(--tsrd-font-size) * 2.75)', - 12: 'calc(var(--tsrd-font-size) * 3)', - 14: 'calc(var(--tsrd-font-size) * 3.5)', - 16: 'calc(var(--tsrd-font-size) * 4)', - 20: 'calc(var(--tsrd-font-size) * 5)', - 24: 'calc(var(--tsrd-font-size) * 6)', - 28: 'calc(var(--tsrd-font-size) * 7)', - 32: 'calc(var(--tsrd-font-size) * 8)', - 36: 'calc(var(--tsrd-font-size) * 9)', - 40: 'calc(var(--tsrd-font-size) * 10)', - 44: 'calc(var(--tsrd-font-size) * 11)', - 48: 'calc(var(--tsrd-font-size) * 12)', - 52: 'calc(var(--tsrd-font-size) * 13)', - 56: 'calc(var(--tsrd-font-size) * 14)', - 60: 'calc(var(--tsrd-font-size) * 15)', - 64: 'calc(var(--tsrd-font-size) * 16)', - 72: 'calc(var(--tsrd-font-size) * 18)', - 80: 'calc(var(--tsrd-font-size) * 20)', - 96: 'calc(var(--tsrd-font-size) * 24)', + 0.25: 'calc(var(--tsrd-font-size, 1rem) * 0.0625)', + 0.5: 'calc(var(--tsrd-font-size, 1rem) * 0.125)', + 1: 'calc(var(--tsrd-font-size, 1rem) * 0.25)', + 1.5: 'calc(var(--tsrd-font-size, 1rem) * 0.375)', + 2: 'calc(var(--tsrd-font-size, 1rem) * 0.5)', + 2.5: 'calc(var(--tsrd-font-size, 1rem) * 0.625)', + 3: 'calc(var(--tsrd-font-size, 1rem) * 0.75)', + 3.5: 'calc(var(--tsrd-font-size, 1rem) * 0.875)', + 4: 'calc(var(--tsrd-font-size, 1rem) * 1)', + 4.5: 'calc(var(--tsrd-font-size, 1rem) * 1.125)', + 5: 'calc(var(--tsrd-font-size, 1rem) * 1.25)', + 5.5: 'calc(var(--tsrd-font-size, 1rem) * 1.375)', + 6: 'calc(var(--tsrd-font-size, 1rem) * 1.5)', + 6.5: 'calc(var(--tsrd-font-size, 1rem) * 1.625)', + 7: 'calc(var(--tsrd-font-size, 1rem) * 1.75)', + 8: 'calc(var(--tsrd-font-size, 1rem) * 2)', + 9: 'calc(var(--tsrd-font-size, 1rem) * 2.25)', + 10: 'calc(var(--tsrd-font-size, 1rem) * 2.5)', + 11: 'calc(var(--tsrd-font-size, 1rem) * 2.75)', + 12: 'calc(var(--tsrd-font-size, 1rem) * 3)', + 14: 'calc(var(--tsrd-font-size, 1rem) * 3.5)', + 16: 'calc(var(--tsrd-font-size, 1rem) * 4)', + 20: 'calc(var(--tsrd-font-size, 1rem) * 5)', + 24: 'calc(var(--tsrd-font-size, 1rem) * 6)', + 28: 'calc(var(--tsrd-font-size, 1rem) * 7)', + 32: 'calc(var(--tsrd-font-size, 1rem) * 8)', + 36: 'calc(var(--tsrd-font-size, 1rem) * 9)', + 40: 'calc(var(--tsrd-font-size, 1rem) * 10)', + 44: 'calc(var(--tsrd-font-size, 1rem) * 11)', + 48: 'calc(var(--tsrd-font-size, 1rem) * 12)', + 52: 'calc(var(--tsrd-font-size, 1rem) * 13)', + 56: 'calc(var(--tsrd-font-size, 1rem) * 14)', + 60: 'calc(var(--tsrd-font-size, 1rem) * 15)', + 64: 'calc(var(--tsrd-font-size, 1rem) * 16)', + 72: 'calc(var(--tsrd-font-size, 1rem) * 18)', + 80: 'calc(var(--tsrd-font-size, 1rem) * 20)', + 96: 'calc(var(--tsrd-font-size, 1rem) * 24)', }, shadow: { xs: (_: string = 'rgb(0 0 0 / 0.1)') => diff --git a/packages/router-devtools/CHANGELOG.md b/packages/router-devtools/CHANGELOG.md index 3ba014e38f..201d972d6c 100644 --- a/packages/router-devtools/CHANGELOG.md +++ b/packages/router-devtools/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/router-devtools +## 1.167.3 + +### Patch Changes + +- Updated dependencies []: + - @tanstack/react-router-devtools@1.167.3 + ## 1.167.2 ### Patch Changes diff --git a/packages/router-devtools/package.json b/packages/router-devtools/package.json index 2aa446dbab..4158b280d7 100644 --- a/packages/router-devtools/package.json +++ b/packages/router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-devtools", - "version": "1.167.2", + "version": "1.167.3", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/router-generator/CHANGELOG.md b/packages/router-generator/CHANGELOG.md index e3b74d16c2..a37550d255 100644 --- a/packages/router-generator/CHANGELOG.md +++ b/packages/router-generator/CHANGELOG.md @@ -1,5 +1,55 @@ # @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 diff --git a/packages/router-generator/package.json b/packages/router-generator/package.json index ac9225ea42..e62e105068 100644 --- a/packages/router-generator/package.json +++ b/packages/router-generator/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-generator", - "version": "1.167.41", + "version": "1.168.0", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", @@ -62,7 +62,7 @@ "src" ], "engines": { - "node": ">=20.19" + "node": "^20.19.0 || >=22.12.0" }, "dependencies": { "@babel/types": "catalog:", diff --git a/packages/router-generator/src/generator.ts b/packages/router-generator/src/generator.ts index e8cd170e40..91f87dadda 100644 --- a/packages/router-generator/src/generator.ts +++ b/packages/router-generator/src/generator.ts @@ -1146,6 +1146,7 @@ ${acc.routeTree.map((child) => `${child.variableName}Route: typeof ${getResolved strategy: { type: 'mtime', expectedMtimeMs: updatedCacheEntry.mtimeMs, + expectedContent: existingRouteFile.fileContent, }, }) updatedCacheEntry.mtimeMs = stats.mtimeMs @@ -1206,6 +1207,9 @@ ${acc.routeTree.map((child) => `${child.variableName}Route: typeof ${getResolved | { type: 'mtime' expectedMtimeMs: bigint + // An in-place save can truncate and rewrite a file within one mtime + // tick, so user-authored files also compare the content. + expectedContent?: string } | { type: 'new-file' @@ -1215,13 +1219,8 @@ ${acc.routeTree.map((child) => `${child.variableName}Route: typeof ${getResolved await this.fs.writeFile(tmpPath, opts.newContent) if (opts.strategy.type === 'mtime') { + const { expectedMtimeMs, expectedContent } = opts.strategy const beforeStat = await this.fs.stat(opts.filePath) - if (beforeStat.mtimeMs !== opts.strategy.expectedMtimeMs) { - throw rerun({ - msg: `File ${opts.filePath} was modified by another process during processing.`, - event: { type: 'update', path: opts.filePath }, - }) - } const newFileState = await this.fs.stat(tmpPath) if (newFileState.mode !== beforeStat.mode) { await this.fs.chmod(tmpPath, beforeStat.mode) @@ -1247,6 +1246,25 @@ ${acc.routeTree.map((child) => `${child.variableName}Route: typeof ${getResolved } } } + // Check right before the rename so that changes made while the + // temporary file was prepared are not overwritten. + let changed: boolean + if (expectedContent === undefined) { + const current = await this.fs.stat(opts.filePath) + changed = current.mtimeMs !== expectedMtimeMs + } else { + const current = await this.fs.readFile(opts.filePath) + changed = + current === 'file-not-existing' || + current.stat.mtimeMs !== expectedMtimeMs || + current.fileContent !== expectedContent + } + if (changed) { + throw rerun({ + msg: `File ${opts.filePath} was modified by another process during processing.`, + event: { type: 'update', path: opts.filePath }, + }) + } } else { if (await checkFileExists(opts.filePath)) { throw rerun({ @@ -1370,6 +1388,7 @@ ${acc.routeTree.map((child) => `${child.variableName}Route: typeof ${getResolved strategy: { type: 'mtime', expectedMtimeMs: rootNodeFile.stat.mtimeMs, + expectedContent: rootNodeFile.fileContent, }, }) updatedCacheEntry.fileContent = rootRouteContent diff --git a/packages/router-generator/src/utils.ts b/packages/router-generator/src/utils.ts index 747980aa7b..a3bb4b746c 100644 --- a/packages/router-generator/src/utils.ts +++ b/packages/router-generator/src/utils.ts @@ -924,9 +924,10 @@ const inferPath = (routeNode: RouteNode): string => { } /** - * Infers the full path for use by TS + * The full path with groups and pathless segments removed. A route group's + * layout (e.g. `/(group)/_layout`) strips down to `''`. */ -export const inferFullPath = (routeNode: RouteNode): string => { +const stripFullPath = (routeNode: RouteNode): string => { const fullPath = removeGroups( removeLayoutSegmentsAndUnderscoresWithEscape( routeNode.routePath, @@ -949,6 +950,13 @@ export const inferFullPath = (routeNode: RouteNode): string => { return fullPath.replace(/\/$/, '') } +/** + * Infers the full path for use by TS + */ +export const inferFullPath = (routeNode: RouteNode): string => + // A route group's layout has the router's full path `/` + stripFullPath(routeNode) || '/' + const shouldPreferIndexRoute = ( current: RouteNode, existing: RouteNode, @@ -1112,8 +1120,12 @@ Conflicting files: \n ${emptyPathRoutes throw new Error(errorMessage) } + // A route group's layout keeps its stripped path `''` here, so one without + // child routes yet doesn't conflict with the index route. A childless + // `_auth.tsx` does: the route tree lists the index route first, and the + // router would then match `/` to the layout const routes = _routes.map((d) => { - const inferredFullPath = inferFullPath(d) + const inferredFullPath = stripFullPath(d) return { ...d, inferredFullPath } }) diff --git a/packages/router-generator/tests/childless-pathless-layout.test.ts b/packages/router-generator/tests/childless-pathless-layout.test.ts new file mode 100644 index 0000000000..caef9449bf --- /dev/null +++ b/packages/router-generator/tests/childless-pathless-layout.test.ts @@ -0,0 +1,107 @@ +import fs from 'node:fs/promises' +import os from 'node:os' +import path from 'node:path' +import { afterEach, describe, expect, it, test } from 'vitest' + +import { Generator, getConfig } from '../src' + +let tempDir: string | undefined + +afterEach(async () => { + if (tempDir) { + await fs.rm(tempDir, { recursive: true, force: true }) + tempDir = undefined + } +}) + +function routeSource(id: string) { + if (id === '__root__') { + return `import { createRootRoute } from '@tanstack/react-router' + +export const Route = createRootRoute() +` + } + return `import { createFileRoute } from '@tanstack/react-router' + +export const Route = createFileRoute('${id}')() +` +} + +async function generate(files: Record) { + tempDir = await fs.mkdtemp( + path.join(os.tmpdir(), 'tsr-generator-childless-layout-'), + ) + const routesDirectory = path.join(tempDir, 'routes') + for (const [file, id] of Object.entries(files)) { + const filePath = path.join(routesDirectory, file) + await fs.mkdir(path.dirname(filePath), { recursive: true }) + await fs.writeFile(filePath, routeSource(id)) + } + const generatedRouteTree = path.join(tempDir, 'routeTree.gen.ts') + const generator = new Generator({ + config: getConfig( + { + disableLogging: true, + routesDirectory, + generatedRouteTree, + tmpDir: path.join(tempDir, 'tmp'), + }, + tempDir, + ), + root: tempDir, + }) + await generator.run() + return fs.readFile(generatedRouteTree, 'utf-8') +} + +// A route group's layout without child routes yet next to the index route +// generates, as before route-group layouts were typed with the full path `/`. +describe('a route-group layout without child routes yet next to the index route', () => { + it.each([ + { file: '(group)/_layout.tsx', id: '/(group)/_layout' }, + { file: '(marketing)/route.tsx', id: '/(marketing)' }, + ])('$file is added to the route tree', async ({ file, id }) => { + const routeTree = await generate({ + '__root.tsx': '__root__', + 'index.tsx': '/', + [file]: id, + }) + + expect(routeTree).toContain(`'${id}': typeof`) + }) +}) + +// The route tree lists the index route first, and the router then matches +// `/` to a pathless layout without child routes instead of the index route. +// The generator refuses that pair rather than hide the index route. +test('a pathless layout without child routes yet conflicts with the index route', async () => { + await expect( + generate({ + '__root.tsx': '__root__', + 'index.tsx': '/', + '_auth.tsx': '/_auth', + }), + ).rejects.toThrow( + 'Conflicting configuration paths were found for the following routes: "/", "/".', + ) +}) + +// A pathless layout whose parent directory has no route file of its own +// (`foo/_layout.tsx` without `foo.tsx`) carries that directory's path, so it +// matches `/foo` like any other route there. +describe('a layout without child routes yet that adds a path', () => { + it.each([ + { file: '(group)/foo.tsx', id: '/(group)/foo' }, + { file: 'foo_.tsx', id: '/foo_' }, + ])('conflicts with $file at the same full path', async ({ file, id }) => { + await expect( + generate({ + '__root.tsx': '__root__', + 'foo/_layout.tsx': '/foo/_layout', + [file]: id, + }), + ).rejects.toThrow( + 'Conflicting configuration paths were found for the following routes: "/foo", "/foo".', + ) + }) +}) diff --git a/packages/router-generator/tests/concurrent-write.test.ts b/packages/router-generator/tests/concurrent-write.test.ts new file mode 100644 index 0000000000..6550ad562d --- /dev/null +++ b/packages/router-generator/tests/concurrent-write.test.ts @@ -0,0 +1,148 @@ +import fs from 'node:fs/promises' +import os from 'node:os' +import path from 'node:path' +import { afterEach, describe, expect, it } from 'vitest' + +import { Generator, getConfig } from '../src' + +const rootRouteSource = `import { createRootRoute } from '@tanstack/react-router' + +export const Route = createRootRoute() +` + +const postsRouteSource = `import { createFileRoute } from '@tanstack/react-router' + +export const Route = createFileRoute('/posts')({ + component: () => 'posts', +}) +` + +const savedPostsRouteSource = postsRouteSource.replace("'posts'", "'saved'") + +let tempDir: string | undefined + +afterEach(async () => { + if (tempDir) { + await fs.rm(tempDir, { recursive: true, force: true }) + tempDir = undefined + } +}) + +async function readFileWithStat(filePath: string) { + try { + const fileHandle = await fs.open(filePath, 'r') + const stat = await fileHandle.stat({ bigint: true }) + const fileContent = (await fileHandle.readFile()).toString() + await fileHandle.close() + return { stat, fileContent } + } catch (e: any) { + if (e?.code === 'ENOENT') { + return 'file-not-existing' as const + } + throw e + } +} + +describe('generator with concurrent in-place saves', () => { + it.each(['route file read', 'temporary file stat'] as const)( + 'does not scaffold over a route file whose in-place save completes during the %s', + async (completeSaveDuring) => { + tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'tsr-generator-race-')) + const routesDirectory = path.join(tempDir, 'routes') + const tmpDir = path.join(tempDir, 'tmp') + const postsRoutePath = path.join(routesDirectory, 'posts.tsx') + await fs.mkdir(routesDirectory) + await fs.writeFile( + path.join(routesDirectory, '__root.tsx'), + rootRouteSource, + ) + await fs.writeFile(postsRoutePath, postsRouteSource) + + let saveRacesNextRead = false + let completeSave: (() => Promise) | undefined + + const generator = new Generator({ + config: getConfig( + { + disableLogging: true, + routesDirectory, + generatedRouteTree: path.join(tempDir, 'routeTree.gen.ts'), + tmpDir, + }, + tempDir, + ), + root: tempDir, + fs: { + rename: (oldPath, newPath) => fs.rename(oldPath, newPath), + writeFile: (filePath, content) => fs.writeFile(filePath, content), + readFile: async (filePath) => { + // The generator passes route paths with forward slashes, also on + // Windows. + if ( + !saveRacesNextRead || + path.resolve(filePath) !== postsRoutePath + ) { + return readFileWithStat(filePath) + } + saveRacesNextRead = false + + // An editor saving in place truncates the file before writing the + // new content, so the generator can observe an empty route file. + await fs.truncate(postsRoutePath) + const result = await readFileWithStat(postsRoutePath) + if (result === 'file-not-existing') { + throw new Error('expected the route file to exist') + } + + // The save then completes within the same timestamp tick, which is + // common for filesystems with coarse mtime granularity. + completeSave = async () => { + completeSave = undefined + await fs.writeFile(postsRoutePath, savedPostsRouteSource) + const truncatedAt = new Date(Number(result.stat.mtimeMs)) + await fs.utimes(postsRoutePath, truncatedAt, truncatedAt) + } + if (completeSaveDuring === 'route file read') { + await completeSave() + } + + return result + }, + stat: async (filePath) => { + if (completeSave && path.resolve(filePath).startsWith(tmpDir)) { + await completeSave() + } + const stat = await fs.stat(filePath, { bigint: true }) + return { + mtimeMs: stat.mtimeMs, + mode: Number(stat.mode), + uid: Number(stat.uid), + gid: Number(stat.gid), + } + }, + chmod: (filePath, mode) => fs.chmod(filePath, mode), + chown: (filePath, uid, gid) => fs.chown(filePath, uid, gid), + }, + }) + + await generator.run() + + // A first save makes the generator process the route file again, and the + // next save races with that read. + await fs.writeFile( + postsRoutePath, + postsRouteSource.replace("'posts'", "'edited'"), + ) + const editedAt = new Date(Date.now() + 10_000) + await fs.utimes(postsRoutePath, editedAt, editedAt) + saveRacesNextRead = true + await generator.run({ type: 'update', path: postsRoutePath }) + + expect(saveRacesNextRead).toBe(false) + expect(completeSave).toBeUndefined() + await expect(fs.readFile(postsRoutePath, 'utf8')).resolves.toBe( + savedPostsRouteSource, + ) + }, + ) +}) diff --git a/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routeTree.snapshot.ts b/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routeTree.snapshot.ts index 8f2741b206..bda946f97b 100644 --- a/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routeTree.snapshot.ts +++ b/packages/router-generator/tests/generator/nested-route-groups-with-layouts-before-physical/routeTree.snapshot.ts @@ -51,16 +51,16 @@ const groupCLayoutCIndexRoute = groupCLayoutCIndexRouteImport.update({ } as any) export interface FileRoutesByFullPath { + '/': typeof groupCLayoutCIndexRoute '/login': typeof groupALayoutALoginRoute '/signup': typeof groupALayoutASignupRoute '/dashboard': typeof groupBLayoutBDashboardRoute - '/': typeof groupCLayoutCIndexRoute } export interface FileRoutesByTo { + '/': typeof groupCLayoutCIndexRoute '/login': typeof groupALayoutALoginRoute '/signup': typeof groupALayoutASignupRoute '/dashboard': typeof groupBLayoutBDashboardRoute - '/': typeof groupCLayoutCIndexRoute } export interface FileRoutesById { __root__: typeof rootRouteImport @@ -74,9 +74,9 @@ export interface FileRoutesById { } export interface FileRouteTypes { fileRoutesByFullPath: FileRoutesByFullPath - fullPaths: '/login' | '/signup' | '/dashboard' | '/' + fullPaths: '/' | '/login' | '/signup' | '/dashboard' fileRoutesByTo: FileRoutesByTo - to: '/login' | '/signup' | '/dashboard' | '/' + to: '/' | '/login' | '/signup' | '/dashboard' id: | '__root__' | '/(group-a)/_layout-a' @@ -99,21 +99,21 @@ declare module '@tanstack/react-router' { '/(group-a)/_layout-a': { id: '/(group-a)/_layout-a' path: '' - fullPath: '' + fullPath: '/' preLoaderRoute: typeof groupALayoutARouteImport parentRoute: typeof rootRouteImport } '/(group-b)/_layout-b': { id: '/(group-b)/_layout-b' path: '' - fullPath: '' + fullPath: '/' preLoaderRoute: typeof groupBLayoutBRouteImport parentRoute: typeof rootRouteImport } '/(group-c)/_layout-c': { id: '/(group-c)/_layout-c' path: '' - fullPath: '' + fullPath: '/' preLoaderRoute: typeof groupCLayoutCRouteImport parentRoute: typeof rootRouteImport } diff --git a/packages/router-generator/tests/generator/route-groups/routeTree.snapshot.ts b/packages/router-generator/tests/generator/route-groups/routeTree.snapshot.ts index e76c675d2c..d3ffbba9e2 100644 --- a/packages/router-generator/tests/generator/route-groups/routeTree.snapshot.ts +++ b/packages/router-generator/tests/generator/route-groups/routeTree.snapshot.ts @@ -76,6 +76,7 @@ const fooAsdfbarLayoutXyzLazyRoute = fooAsdfbarLayoutXyzLazyRouteImport ) export interface FileRoutesByFullPath { + '/': typeof barBarRouteWithChildren '/hello': typeof barBarHelloRoute '/asdf': typeof fooAsdfanotherGroupLayoutRouteWithChildren '/asdf/$id': typeof fooAsdfbarIdRoute @@ -85,6 +86,7 @@ export interface FileRoutesByFullPath { '/asdf/xyz': typeof fooAsdfbarLayoutXyzLazyRoute } export interface FileRoutesByTo { + '/': typeof barBarRouteWithChildren '/hello': typeof barBarHelloRoute '/asdf': typeof fooAsdfanotherGroupLayoutRouteWithChildren '/asdf/$id': typeof fooAsdfbarIdRoute @@ -108,6 +110,7 @@ export interface FileRoutesById { export interface FileRouteTypes { fileRoutesByFullPath: FileRoutesByFullPath fullPaths: + | '/' | '/hello' | '/asdf' | '/asdf/$id' @@ -117,6 +120,7 @@ export interface FileRouteTypes { | '/asdf/xyz' fileRoutesByTo: FileRoutesByTo to: + | '/' | '/hello' | '/asdf' | '/asdf/$id' @@ -151,7 +155,7 @@ declare module '@tanstack/react-router' { '/(bar)/_bar': { id: '/(bar)/_bar' path: '' - fullPath: '' + fullPath: '/' preLoaderRoute: typeof barBarRouteImport parentRoute: typeof rootRouteImport } diff --git a/packages/router-plugin/CHANGELOG.md b/packages/router-plugin/CHANGELOG.md index 5ef324812f..5b18ae7e6a 100644 --- a/packages/router-plugin/CHANGELOG.md +++ b/packages/router-plugin/CHANGELOG.md @@ -1,5 +1,81 @@ # @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 diff --git a/packages/router-plugin/package.json b/packages/router-plugin/package.json index 9e20d6d308..b681bb61a2 100644 --- a/packages/router-plugin/package.json +++ b/packages/router-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-plugin", - "version": "1.168.43", + "version": "1.169.0", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", @@ -114,7 +114,7 @@ "!skills/_artifacts" ], "engines": { - "node": ">=20.19" + "node": "^20.19.0 || >=22.12.0" }, "dependencies": { "@babel/core": "catalog:", @@ -124,7 +124,7 @@ "@tanstack/router-generator": "workspace:*", "@tanstack/router-utils": "workspace:*", "chokidar": "catalog:", - "unplugin": "^3.3.0", + "unplugin": "^3.5.0", "zod": "catalog:" }, "devDependencies": { @@ -139,6 +139,7 @@ "react-dom": "catalog:", "@types/react": "catalog:", "@types/react-dom": "catalog:", + "prettier": "^3.9.6", "@arethetypeswrong/cli": "catalog:", "publint": "catalog:", "rimraf": "catalog:", @@ -147,7 +148,7 @@ "peerDependencies": { "@rsbuild/core": ">=1.0.2 || ^2.0.0", "@tanstack/react-router": "workspace:^", - "vite": ">=5.0.0 || >=6.0.0 || >=7.0.0 || >=8.0.0", + "vite": ">=6.0.0", "vite-plugin-solid": "^2.11.10 || ^3.0.0-0", "webpack": ">=5.92.0" }, diff --git a/packages/router-plugin/skills/router-plugin/SKILL.md b/packages/router-plugin/skills/router-plugin/SKILL.md index 972584dc96..5353b7e8c0 100644 --- a/packages/router-plugin/skills/router-plugin/SKILL.md +++ b/packages/router-plugin/skills/router-plugin/SKILL.md @@ -91,23 +91,23 @@ esbuild.build({ plugins: [ tanstackRouter({ target: 'react', - autoCodeSplitting: true, }), ], }) ``` +> Automatic code splitting is not available with esbuild: the plugin throws when `autoCodeSplitting` is `true`. Use manual code splitting (`.lazy.tsx` files) or another bundler to split routes. + ## Configuration Options ### Core Options -| Option | Type | Default | Description | -| ----------------------- | ----------------------------- | -------------------------- | ------------------------------------------ | -| `target` | `'react' \| 'solid' \| 'vue'` | `'react'` | Target framework | -| `routesDirectory` | `string` | `'./src/routes'` | Directory containing route files | -| `generatedRouteTree` | `string` | `'./src/routeTree.gen.ts'` | Path for generated route tree | -| `autoCodeSplitting` | `boolean` | `undefined` | Enable automatic code splitting | -| `enableRouteGeneration` | `boolean` | `true` | Set to `false` to disable route generation | +| Option | Type | Default | Description | +| -------------------- | ----------------------------- | -------------------------- | -------------------------------- | +| `target` | `'react' \| 'solid' \| 'vue'` | `'react'` | Target framework | +| `routesDirectory` | `string` | `'./src/routes'` | Directory containing route files | +| `generatedRouteTree` | `string` | `'./src/routeTree.gen.ts'` | Path for generated route tree | +| `autoCodeSplitting` | `boolean` | `undefined` | Enable automatic code splitting | ### File Convention Options @@ -246,5 +246,5 @@ Changes to `routeTree.gen.ts` are overwritten and can leave source routes, gener ## Cross-References -- [router-core/code-splitting](../../../router-core/skills/router-core/code-splitting/SKILL.md) — manual code splitting concepts -- [virtual-file-routes](../../../virtual-file-routes/skills/virtual-file-routes/SKILL.md) — programmatic route trees +- `@tanstack/router-core#router-core/code-splitting` — manual code splitting concepts +- `@tanstack/virtual-file-routes#virtual-file-routes` — programmatic route trees diff --git a/packages/router-plugin/src/core/code-splitter/compilers.ts b/packages/router-plugin/src/core/code-splitter/compilers.ts index 89cdae41ad..0cd783a58a 100644 --- a/packages/router-plugin/src/core/code-splitter/compilers.ts +++ b/packages/router-plugin/src/core/code-splitter/compilers.ts @@ -364,6 +364,7 @@ function removeSharedDeclarations(ast: t.File, sharedBindings: Set) { export function compileCodeSplitReferenceRoute( opts: ParseAstOptions & CompileCodeSplitReferenceRouteOptions & { + isProduction?: boolean compilerPlugins?: Array }, ): GeneratorResult | null { @@ -847,8 +848,9 @@ export function compileCodeSplitReferenceRoute( ) console.warn(warningMessage) - // append this warning to the file using a template - if (process.env.NODE_ENV !== 'production') { + // Development builds log it in the page too. The bundler's mode decides, + // not the build process's NODE_ENV, which webpack never sets. + if (!opts.isProduction) { const warningTemplate = template.statement( `console.warn(${JSON.stringify(warningMessage)})`, )() @@ -1285,7 +1287,8 @@ export function compileCodeSplitVirtualRoute( const result = generateFromAst(ast, { sourceMaps: true, - sourceFileName: opts.filename, + // Name the route file, not this module's `?tsr-*` id. + sourceFileName: removeSplitSearchParamFromFilename(opts.filename), filename: opts.filename, }) @@ -1376,7 +1379,8 @@ export function compileCodeSplitSharedRoute( const result = generateFromAst(ast, { sourceMaps: true, - sourceFileName: opts.filename, + // Name the route file, not this module's `?tsr-*` id. + sourceFileName: removeSplitSearchParamFromFilename(opts.filename), filename: opts.filename, }) diff --git a/packages/router-plugin/src/core/code-splitter/plugins.ts b/packages/router-plugin/src/core/code-splitter/plugins.ts index 1e8ada32b5..94444c1aec 100644 --- a/packages/router-plugin/src/core/code-splitter/plugins.ts +++ b/packages/router-plugin/src/core/code-splitter/plugins.ts @@ -1,6 +1,7 @@ import type babel from '@babel/core' import type * as t from '@babel/types' -import type { Config, DeletableNodes, HmrStyle } from '../config' +import type { Config, DeletableNodes } from '../config' +import type { HmrStyle } from '../hmr' import type { CodeSplitGroupings } from '../constants' import type { SplitNodeMeta } from './types' diff --git a/packages/router-plugin/src/core/code-splitter/plugins/framework-plugins.ts b/packages/router-plugin/src/core/code-splitter/plugins/framework-plugins.ts index a0351ad210..cf4b150807 100644 --- a/packages/router-plugin/src/core/code-splitter/plugins/framework-plugins.ts +++ b/packages/router-plugin/src/core/code-splitter/plugins/framework-plugins.ts @@ -2,7 +2,8 @@ import { createReactRefreshIgnoredRouteExportsPlugin } from './react-refresh-ign import { createReactRefreshRouteComponentsPlugin } from './react-refresh-route-components' import { createReactStableHmrSplitRouteComponentsPlugin } from './react-stable-hmr-split-route-components' import type { CodeSplitCompilerPlugin } from '../plugins' -import type { Config, HmrStyle } from '../../config' +import type { Config } from '../../config' +import type { HmrStyle } from '../../hmr' export function getFrameworkHmrCompilerPlugins(opts: { targetFramework: Config['target'] diff --git a/packages/router-plugin/src/core/code-splitter/plugins/react-refresh-ignored-route-exports.ts b/packages/router-plugin/src/core/code-splitter/plugins/react-refresh-ignored-route-exports.ts index cc2be62034..f951d863b3 100644 --- a/packages/router-plugin/src/core/code-splitter/plugins/react-refresh-ignored-route-exports.ts +++ b/packages/router-plugin/src/core/code-splitter/plugins/react-refresh-ignored-route-exports.ts @@ -5,9 +5,8 @@ import type { ReferenceRouteCompilerPlugin } from '../plugins' const buildReactRefreshIgnoredRouteExportsStatements = template.statements( ` -const hot = import.meta.hot -if (hot && typeof window !== 'undefined') { - hot.data ??= {} +if (import.meta.hot && typeof window !== 'undefined') { + import.meta.hot.data ??= {} const tsrReactRefresh = window.__TSR_REACT_REFRESH__ ??= (() => { const ignoredExportsById = new Map() const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports diff --git a/packages/router-plugin/src/core/code-splitter/plugins/react-stable-hmr-split-route-components.ts b/packages/router-plugin/src/core/code-splitter/plugins/react-stable-hmr-split-route-components.ts index 99448f452a..f67a189f40 100644 --- a/packages/router-plugin/src/core/code-splitter/plugins/react-stable-hmr-split-route-components.ts +++ b/packages/router-plugin/src/core/code-splitter/plugins/react-stable-hmr-split-route-components.ts @@ -1,7 +1,7 @@ import * as template from '@babel/template' import * as t from '@babel/types' import { getUniqueProgramIdentifier } from '../../utils' -import type { HmrStyle } from '../../config' +import type { HmrStyle } from '../../hmr' import type { ReferenceRouteCompilerPlugin } from '../plugins' function capitalizeIdentifier(str: string) { diff --git a/packages/router-plugin/src/core/config.ts b/packages/router-plugin/src/core/config.ts index 17c0dd08da..6c11241a01 100644 --- a/packages/router-plugin/src/core/config.ts +++ b/packages/router-plugin/src/core/config.ts @@ -9,7 +9,6 @@ import type { RouteIds, } from '@tanstack/router-core' import type { CodeSplitGroupings } from './constants' -import type { CodeSplitCompilerPlugin } from './code-splitter/plugins' export const splitGroupingsSchema = z .array( @@ -71,25 +70,6 @@ export type CodeSplittingOptions = { * @default true */ addHmr?: boolean - - /** - * Internal compiler plugins used by framework integrations. - * @internal - */ - compilerPlugins?: Array -} - -export type HmrStyle = 'vite' | 'webpack' - -export type HmrOptions = { - /** - * Selects the HMR runtime style to emit code for. - * - `'vite'` (default): ESM `import.meta.hot` with Vite accept-callback semantics. - * - `'webpack'`: `import.meta.webpackHot` with webpack / Rspack `module.hot` re-execution semantics. - * - * Bundler-specific plugin entries (e.g. `rspack.ts`, `webpack.ts`) set this explicitly. - */ - style?: HmrStyle } const codeSplittingOptionsSchema = z.object({ @@ -109,7 +89,6 @@ type FileRouteKeys = keyof (Parameters< export type DeletableNodes = FileRouteKeys | (string & {}) export const configSchema = generatorConfigSchema.extend({ - enableRouteGeneration: z.boolean().optional(), codeSplittingOptions: z .custom((v) => { return codeSplittingOptionsSchema.parse(v) @@ -117,11 +96,6 @@ export const configSchema = generatorConfigSchema.extend({ .optional(), plugin: z .object({ - hmr: z - .object({ - style: z.enum(['vite', 'webpack']).optional(), - }) - .optional(), vite: z .object({ environmentName: z.string().optional(), diff --git a/packages/router-plugin/src/core/hmr/index.ts b/packages/router-plugin/src/core/hmr/index.ts index 4e60f015a1..b3c8545851 100644 --- a/packages/router-plugin/src/core/hmr/index.ts +++ b/packages/router-plugin/src/core/hmr/index.ts @@ -1,5 +1,5 @@ export { createRouteHmrStatement } from './select-adapter' -export type { CreateRouteHmrStatementOpts } from './select-adapter' +export type { CreateRouteHmrStatementOpts, HmrStyle } from './select-adapter' export { createViteHmrStatement } from './vite-adapter' export { createWebpackHmrStatement } from './webpack-adapter' export { getHandleRouteUpdateCode } from './handle-route-update' diff --git a/packages/router-plugin/src/core/hmr/select-adapter.ts b/packages/router-plugin/src/core/hmr/select-adapter.ts index 60395a1534..5ad2646970 100644 --- a/packages/router-plugin/src/core/hmr/select-adapter.ts +++ b/packages/router-plugin/src/core/hmr/select-adapter.ts @@ -1,8 +1,16 @@ import { createViteHmrStatement } from './vite-adapter' import { createWebpackHmrStatement } from './webpack-adapter' -import type { Config, HmrStyle } from '../config' +import type { Config } from '../config' import type * as t from '@babel/types' +/** + * The HMR runtime to emit code for: + * - `'vite'`: ESM `import.meta.hot` with Vite accept-callback semantics. + * - `'webpack'`: `import.meta.webpackHot` with webpack / Rspack `module.hot` + * re-execution semantics. + */ +export type HmrStyle = 'vite' | 'webpack' + export type CreateRouteHmrStatementOpts = { hmrStyle: HmrStyle targetFramework: Config['target'] @@ -10,9 +18,9 @@ export type CreateRouteHmrStatementOpts = { } /** - * Dispatches to the configured HMR adapter. `hmrStyle` is set explicitly by - * the bundler-specific plugin entry (e.g. `rspack.ts` → `'webpack'`), so there - * is no runtime inference based on config string shapes. + * Dispatches to the HMR adapter of the bundler the plugin runs in. `hmrStyle` + * comes from the bundler-specific plugin entry (e.g. `rspack.ts` → + * `'webpack'`), not from user config. */ export function createRouteHmrStatement( stableRouteOptionKeys: Array, diff --git a/packages/router-plugin/src/core/hmr/vite-adapter.ts b/packages/router-plugin/src/core/hmr/vite-adapter.ts index ba8d42a80a..5357c45acf 100644 --- a/packages/router-plugin/src/core/hmr/vite-adapter.ts +++ b/packages/router-plugin/src/core/hmr/vite-adapter.ts @@ -4,7 +4,9 @@ import type * as t from '@babel/types' /** * Emits HMR accept code for Vite / native ESM HMR: `import.meta.hot.accept` - * with a callback that receives the freshly re-imported module. + * with a callback that receives the freshly re-imported module. Vite makes the + * module a hot boundary only when the code spells `import.meta.hot.accept(` + * out, so the call must not go through an alias. * * `targetFramework` is currently unused — Vite's framework-specific fast-refresh * plugins handle component body patching via their own accept boundaries — but @@ -26,8 +28,7 @@ export function createViteHmrStatement( template.statement( ` if (import.meta.hot) { - const hot = import.meta.hot - const hotData = hot.data ??= {} + const hotData = import.meta.hot.data ??= {} const handleRouteUpdate = ${handleRouteUpdateCode} const initialRouteId = ${routeIdFallback} ?? hotData['tsr-route-id'] if (initialRouteId) { @@ -41,7 +42,7 @@ if (import.meta.hot) { handleRouteUpdate(initialRouteId, Route) hotData['tsr-route-update-handled'] = Route } - hot.accept((newModule) => { + import.meta.hot.accept((newModule) => { if (Route && newModule && newModule.Route) { const routeId = hotData['tsr-route-id'] ?? ${routeIdFallback} if (routeId) { diff --git a/packages/router-plugin/src/core/router-code-splitter-plugin.ts b/packages/router-plugin/src/core/router-code-splitter-plugin.ts index f1f75d4f3c..ecc7607d59 100644 --- a/packages/router-plugin/src/core/router-code-splitter-plugin.ts +++ b/packages/router-plugin/src/core/router-code-splitter-plugin.ts @@ -17,7 +17,6 @@ import { getFrameworkHmrCompilerPlugins } from './code-splitter/plugins/framewor import { defaultCodeSplitGroupings, splitRouteIdentNodes, - tsrShared, tsrSplit, } from './constants' import { debug, normalizePath, routeFactoryCallCodeFilter } from './utils' @@ -25,7 +24,8 @@ import { createRouterPluginContext } from './router-plugin-context' import type { CodeSplitGroupings, SplitRouteIdentNodes } from './constants' import type { GetRoutesByFileMapResultValue } from '@tanstack/router-generator' import type { CodeSplitCompilerPlugin } from './code-splitter/plugins' -import type { Config, HmrStyle } from './config' +import type { Config } from './config' +import type { HmrStyle } from './hmr' import type { RouterPluginContext } from './router-plugin-context' import type { UnpluginFactory, @@ -81,11 +81,11 @@ const TRANSFORMATION_PLUGINS_BY_FRAMEWORK: Record< export function createRouterCodeSplitterPlugin( options: Partial Config)> | undefined = {}, routerPluginContext: RouterPluginContext, + hmrStyle: HmrStyle = 'vite', ): ReturnType Config)> | undefined>> { let ROOT: string = process.cwd() let userConfig: Config let addHmr: boolean - let hmrStyle: HmrStyle let compilerPlugins: Array let virtualRouteCompilerPlugins: Array @@ -99,16 +99,12 @@ export function createRouterCodeSplitterPlugin( } addHmr = (userConfig.codeSplittingOptions?.addHmr ?? true) && !isProduction - hmrStyle = userConfig.plugin?.hmr?.style ?? 'vite' - compilerPlugins = [ - ...(addHmr - ? (getFrameworkHmrCompilerPlugins({ - targetFramework: userConfig.target, - hmrStyle, - }) ?? []) - : []), - ...(userConfig.codeSplittingOptions?.compilerPlugins ?? []), - ] + compilerPlugins = addHmr + ? (getFrameworkHmrCompilerPlugins({ + targetFramework: userConfig.target, + hmrStyle, + }) ?? []) + : [] virtualRouteCompilerPlugins = compilerPlugins.filter( (plugin) => plugin.onVirtualRouteSplitNode, ) @@ -186,6 +182,7 @@ export function createRouterCodeSplitterPlugin( targetFramework: userConfig.target, filename: id, id, + isProduction, deleteNodes: userConfig.codeSplittingOptions?.deleteNodes ? new Set(userConfig.codeSplittingOptions.deleteNodes) : undefined, @@ -261,7 +258,6 @@ export function createRouterCodeSplitterPlugin( transform: { filter: { id: { - exclude: [tsrSplit, tsrShared], // this is necessary for webpack / rspack to avoid matching .html files include: /\.(m|c)?(j|t)sx?$/, }, @@ -332,13 +328,13 @@ export function createRouterCodeSplitterPlugin( }, rspack(compiler) { - isProduction = compiler.options.mode === 'production' + isProduction = (compiler.options.mode ?? 'production') === 'production' ROOT = process.cwd() initUserConfig() }, webpack(compiler) { - isProduction = compiler.options.mode === 'production' + isProduction = (compiler.options.mode ?? 'production') === 'production' ROOT = process.cwd() initUserConfig() }, diff --git a/packages/router-plugin/src/core/router-composed-plugin.ts b/packages/router-plugin/src/core/router-composed-plugin.ts index c778e4e8d4..5bcaaf8da9 100644 --- a/packages/router-plugin/src/core/router-composed-plugin.ts +++ b/packages/router-plugin/src/core/router-composed-plugin.ts @@ -4,6 +4,7 @@ import { createRouterCodeSplitterPlugin } from './router-code-splitter-plugin' import { createRouterHmrPlugin } from './router-hmr-plugin' import { createRouterPluginContext } from './router-plugin-context' import type { Config } from './config' +import type { HmrStyle } from './hmr' import type { RspackCompiler, UnpluginFactory, @@ -30,13 +31,18 @@ function applyRspackInlineCssDefaultDefinePlugin(compiler: RspackCompiler) { export const unpluginRouterComposedFactory: UnpluginFactory< Partial Config)> | undefined -> = (options = {}, _meta) => { +> = (options = {}, meta) => { const ROOT: string = process.cwd() const userConfig = getConfig( (typeof options === 'function' ? options() : options) as Partial, ROOT, ) const routerPluginContext = createRouterPluginContext() + // webpack and Rspack share webpack's `import.meta.webpackHot` HMR API. + const hmrStyle: HmrStyle = + meta.framework === 'webpack' || meta.framework === 'rspack' + ? 'webpack' + : 'vite' const getPlugin = (plugin: ReturnType>) => { if (!Array.isArray(plugin)) { @@ -49,7 +55,7 @@ export const unpluginRouterComposedFactory: UnpluginFactory< createRouterGeneratorPlugin(options, routerPluginContext), ) const routerCodeSplitter = getPlugin( - createRouterCodeSplitterPlugin(options, routerPluginContext), + createRouterCodeSplitterPlugin(options, routerPluginContext, hmrStyle), ) const result = [ @@ -89,7 +95,7 @@ export const unpluginRouterComposedFactory: UnpluginFactory< if (!isProduction && !userConfig.autoCodeSplitting) { const routerHmr = getPlugin( - createRouterHmrPlugin(options, routerPluginContext), + createRouterHmrPlugin(options, routerPluginContext, hmrStyle), ) result.push(...routerHmr) } diff --git a/packages/router-plugin/src/core/router-generator-plugin.ts b/packages/router-plugin/src/core/router-generator-plugin.ts index 46dda8c581..50dde9f55c 100644 --- a/packages/router-plugin/src/core/router-generator-plugin.ts +++ b/packages/router-plugin/src/core/router-generator-plugin.ts @@ -19,8 +19,6 @@ export function createRouterGeneratorPlugin( let userConfig: Config let generator: Generator - const routeGenerationDisabled = () => - userConfig.enableRouteGeneration === false const getRoutesDirectoryPath = () => { return isAbsolute(userConfig.routesDirectory) ? userConfig.routesDirectory @@ -46,9 +44,6 @@ export function createRouterGeneratorPlugin( file: string event: 'create' | 'update' | 'delete' }) => { - if (routeGenerationDisabled()) { - return - } let generatorEvent: GeneratorEvent | undefined = undefined if (opts) { const filePath = normalize(opts.file) diff --git a/packages/router-plugin/src/core/router-hmr-plugin.ts b/packages/router-plugin/src/core/router-hmr-plugin.ts index e1dc01a43b..3f14a38be5 100644 --- a/packages/router-plugin/src/core/router-hmr-plugin.ts +++ b/packages/router-plugin/src/core/router-hmr-plugin.ts @@ -7,6 +7,7 @@ import { getConfig } from './config' import { createRouterPluginContext } from './router-plugin-context' import type { UnpluginFactory } from 'unplugin' import type { Config } from './config' +import type { HmrStyle } from './hmr' import type { RouterPluginContext } from './router-plugin-context' /** @@ -18,6 +19,7 @@ import type { RouterPluginContext } from './router-plugin-context' export function createRouterHmrPlugin( options: Partial Config)> | undefined = {}, routerPluginContext: RouterPluginContext, + hmrStyle: HmrStyle = 'vite', ): ReturnType | undefined>> { let ROOT: string = process.cwd() @@ -47,8 +49,6 @@ export function createRouterHmrPlugin( if (debug) console.info('Adding HMR handling to route ', normalizedId) - const hmrStyle = userConfig.plugin?.hmr?.style ?? 'vite' - if (userConfig.target === 'react') { const compilerPlugins = getFrameworkHmrCompilerPlugins({ targetFramework: 'react', diff --git a/packages/router-plugin/src/esbuild.ts b/packages/router-plugin/src/esbuild.ts index 650082964d..e2c184bb3d 100644 --- a/packages/router-plugin/src/esbuild.ts +++ b/packages/router-plugin/src/esbuild.ts @@ -1,7 +1,6 @@ import { createEsbuildPlugin } from 'unplugin' -import { configSchema } from './core/config' -import { createRouterCodeSplitterPlugin } from './core/router-code-splitter-plugin' +import { configSchema, getConfig } from './core/config' import { createRouterGeneratorPlugin } from './core/router-generator-plugin' import { unpluginRouterComposedFactory } from './core/router-composed-plugin' import { createRouterPluginContext } from './core/router-plugin-context' @@ -13,6 +12,20 @@ type RouterPluginOptions = Partial Config)> | undefined const defaultRouterPluginContext = createRouterPluginContext() +const ESBUILD_SPLITTING_ERROR = + '@tanstack/router-plugin: route code splitting (`autoCodeSplitting`) is not supported with esbuild. ' + + 'Use the generator alone (`TanStackRouterGeneratorEsbuild`), or set `autoCodeSplitting: false`.' + +function refuseSplitting(options: RouterPluginOptions) { + const config = + typeof options === 'function' + ? options() + : getConfig(options ?? {}, process.cwd()) + if (config.autoCodeSplitting) { + throw new Error(ESBUILD_SPLITTING_ERROR) + } +} + /** * @example * ```ts @@ -33,22 +46,14 @@ const TanStackRouterGeneratorEsbuild = ( } /** - * @example - * ```ts - * export default { - * plugins: [TanStackRouterCodeSplitterEsbuild()], - * // ... - * } - * ``` + * Route code splitting is not available with esbuild: this entry refuses + * clearly. */ const TanStackRouterCodeSplitterEsbuild = ( - options?: RouterPluginOptions, - routerPluginContext?: RouterPluginContext, -) => { - const pluginContext = routerPluginContext ?? defaultRouterPluginContext - return createEsbuildPlugin((pluginOptions: RouterPluginOptions) => - createRouterCodeSplitterPlugin(pluginOptions, pluginContext), - )(options) + _options?: RouterPluginOptions, + _routerPluginContext?: RouterPluginContext, +): never => { + throw new Error(ESBUILD_SPLITTING_ERROR) } /** @@ -60,7 +65,10 @@ const TanStackRouterCodeSplitterEsbuild = ( * } * ``` */ -const TanStackRouterEsbuild = createEsbuildPlugin(unpluginRouterComposedFactory) +const TanStackRouterEsbuild = (options: RouterPluginOptions = {}) => { + refuseSplitting(options) + return createEsbuildPlugin(unpluginRouterComposedFactory)(options) +} const tanstackRouter = TanStackRouterEsbuild export default TanStackRouterEsbuild diff --git a/packages/router-plugin/src/index.ts b/packages/router-plugin/src/index.ts index 6a6ad158bb..c892c32671 100644 --- a/packages/router-plugin/src/index.ts +++ b/packages/router-plugin/src/index.ts @@ -1,5 +1,4 @@ export { configSchema, getConfig } from './core/config' -export { unpluginRouterCodeSplitterFactory } from './core/router-code-splitter-plugin' export { unpluginRouterGeneratorFactory } from './core/router-generator-plugin' export { createRouterPluginContext } from './core/router-plugin-context' export type { @@ -8,16 +7,8 @@ export type { ConfigOutput, CodeSplittingOptions, DeletableNodes, - HmrOptions, } from './core/config' export type { RouterPluginContext } from './core/router-plugin-context' -export { getObjectPropertyKeyName } from './core/utils' -export type { - CodeSplitCompilerPlugin, - ReferenceRouteCompilerPlugin, - ReferenceRouteCompilerPluginContext, - VirtualRouteSplitNodeCompilerPluginContext, -} from './core/code-splitter/plugins' export { tsrSplit, splitRouteIdentNodes, diff --git a/packages/router-plugin/src/rspack.ts b/packages/router-plugin/src/rspack.ts index a31bde74af..6020179cce 100644 --- a/packages/router-plugin/src/rspack.ts +++ b/packages/router-plugin/src/rspack.ts @@ -12,35 +12,6 @@ type RspackRouterPluginOptions = Partial | (() => Partial) const defaultRouterPluginContext = createRouterPluginContext() -/** - * Rspack uses webpack-compatible `module.hot` / `import.meta.webpackHot` HMR. - * Force `plugin.hmr.style = 'webpack'` so the router HMR adapter emits - * `module.hot`-style accept/dispose code instead of Vite's callback-receive - * variant, regardless of what the user passes (or doesn't pass). - */ -function withWebpackHmrStyle( - options: RspackRouterPluginOptions | undefined, -): RspackRouterPluginOptions { - const mergeHmrStyle = ( - config: Partial | undefined, - ): Partial => ({ - ...config, - plugin: { - ...config?.plugin, - hmr: { - ...config?.plugin?.hmr, - style: 'webpack', - }, - }, - }) - - if (typeof options === 'function') { - return () => mergeHmrStyle(options()) - } - - return mergeHmrStyle(options) -} - /** * @example * ```ts @@ -68,6 +39,9 @@ const TanStackRouterGeneratorRspack = ( } /** + * Rspack uses webpack-compatible `import.meta.webpackHot` HMR, which the + * code splitter emits for it. + * * @example * ```ts * export default defineConfig({ @@ -87,10 +61,9 @@ const TanStackRouterCodeSplitterRspack = ( const pluginContext = routerPluginContext ?? defaultRouterPluginContext return createRspackPlugin((pluginOptions) => createRouterCodeSplitterPlugin( - withWebpackHmrStyle( - pluginOptions as RspackRouterPluginOptions | undefined, - ) as Partial Config)>, + pluginOptions as Partial Config)> | undefined, pluginContext, + 'webpack', ), )(options) } @@ -109,13 +82,7 @@ const TanStackRouterCodeSplitterRspack = ( * ``` */ const TanStackRouterRspack = /* #__PURE__ */ createRspackPlugin( - (options, meta) => - unpluginRouterComposedFactory( - withWebpackHmrStyle( - options as RspackRouterPluginOptions | undefined, - ) as Partial Config)>, - meta, - ), + unpluginRouterComposedFactory, ) const tanstackRouter = TanStackRouterRspack export default TanStackRouterRspack diff --git a/packages/router-plugin/src/webpack.ts b/packages/router-plugin/src/webpack.ts index 712372565e..9a0063fd6f 100644 --- a/packages/router-plugin/src/webpack.ts +++ b/packages/router-plugin/src/webpack.ts @@ -10,26 +10,6 @@ import type { RouterPluginContext } from './core/router-plugin-context' const defaultRouterPluginContext = createRouterPluginContext() -/** - * Webpack uses `module.hot` / `import.meta.webpackHot` HMR. Force - * `plugin.hmr.style = 'webpack'` so the router HMR adapter emits the correct - * accept/dispose shape regardless of user config. - */ -function withWebpackHmrStyle( - options: Partial | undefined, -): Partial { - return { - ...options, - plugin: { - ...options?.plugin, - hmr: { - ...options?.plugin?.hmr, - style: 'webpack', - }, - }, - } -} - /** * @example * ```ts @@ -50,6 +30,8 @@ const TanStackRouterGeneratorWebpack = ( } /** + * Route HMR in development goes through `import.meta.webpackHot`. + * * @example * ```ts * export default { @@ -64,10 +46,7 @@ const TanStackRouterCodeSplitterWebpack = ( ) => { const pluginContext = routerPluginContext ?? defaultRouterPluginContext return createWebpackPlugin((pluginOptions: Partial | undefined) => - createRouterCodeSplitterPlugin( - withWebpackHmrStyle(pluginOptions), - pluginContext, - ), + createRouterCodeSplitterPlugin(pluginOptions, pluginContext, 'webpack'), )(options) } @@ -81,11 +60,7 @@ const TanStackRouterCodeSplitterWebpack = ( * ``` */ const TanStackRouterWebpack = /* #__PURE__ */ createWebpackPlugin( - (options, meta) => - unpluginRouterComposedFactory( - withWebpackHmrStyle(options as Partial | undefined), - meta, - ), + unpluginRouterComposedFactory, ) const tanstackRouter = TanStackRouterWebpack diff --git a/packages/router-plugin/tests/add-hmr.test.ts b/packages/router-plugin/tests/add-hmr.test.ts index 98b3e61a5f..0d89832f3b 100644 --- a/packages/router-plugin/tests/add-hmr.test.ts +++ b/packages/router-plugin/tests/add-hmr.test.ts @@ -1,5 +1,13 @@ -import { readFile, readdir } from 'node:fs/promises' +import { + mkdir, + mkdtemp, + readFile, + readdir, + rm, + writeFile, +} from 'node:fs/promises' import path from 'node:path' +import { createServer } from 'vite' import { describe, expect, it } from 'vitest' import { compileCodeSplitReferenceRoute } from '../src/core/code-splitter/compilers' @@ -7,6 +15,7 @@ import { defaultCodeSplitGroupings } from '../src/core/constants' import { getFrameworkHmrCompilerPlugins } from '../src/core/code-splitter/plugins/framework-plugins' import { createRouteHmrStatement } from '../src/core/hmr' import { frameworks } from './constants' +import { formatSnapshot } from './format-snapshot' function getFrameworkDir(framework: string) { const files = path.resolve(__dirname, `./add-hmr/test-files/${framework}`) @@ -37,7 +46,9 @@ describe('add-hmr works', () => { }), }) - await expect(compileResult?.code || code).toMatchFileSnapshot( + await expect( + await formatSnapshot(compileResult?.code || code, filename), + ).toMatchFileSnapshot( path.join(dirs.snapshots, filename.replace('.tsx', '@true.tsx')), ) }, @@ -58,7 +69,9 @@ describe('add-hmr works', () => { targetFramework: framework, }) - await expect(compileResult?.code || code).toMatchFileSnapshot( + await expect( + await formatSnapshot(compileResult?.code || code, filename), + ).toMatchFileSnapshot( path.join(dirs.snapshots, filename.replace('.tsx', '@false.tsx')), ) }, @@ -87,7 +100,9 @@ describe('add-hmr works', () => { }), }) - await expect(compileResult?.code || code).toMatchFileSnapshot( + await expect( + await formatSnapshot(compileResult?.code || code, filename), + ).toMatchFileSnapshot( path.join( getFrameworkDir(framework).snapshots, filename.replace('.tsx', '@webpack-hot.tsx'), @@ -189,3 +204,174 @@ describe('add-hmr works', () => { expect(output).not.toContain('/__root') }) }) + +/** + * Starts a Vite dev server with the router plugin (and no framework plugin) + * for an app made of `files`, connects an HMR client to it the way the + * browser's `/@vite/client` does, and requests the app's modules from + * `main.ts` on, as a page would. + */ +async function startDevApp( + files: Record, + options: { autoCodeSplitting: boolean }, +) { + // Keep the app inside the package so runtime imports resolve. + const root = await mkdtemp(path.join(__dirname, '.add-hmr-')) + await mkdir(path.join(root, 'routes')) + const allFiles: Record = { + 'index.html': '', + 'main.ts': `import { createRouter } from '@tanstack/react-router' +import { routeTree } from './routeTree.gen' +export const router = createRouter({ routeTree }) +`, + 'routes/__root.tsx': `import { createRootRoute } from '@tanstack/react-router' +export const Route = createRootRoute({}) +`, + ...files, + } + for (const [file, code] of Object.entries(allFiles)) { + await writeFile(path.join(root, file), code) + } + const { tanstackRouter } = await import('../src/vite') + const server = await createServer({ + root, + configFile: false, + logLevel: 'silent', + server: { port: 0, strictPort: false }, + // A dependency optimisation would reload the page on its own. + optimizeDeps: { noDiscovery: true, include: [] }, + plugins: [ + tanstackRouter({ + target: 'react', + routesDirectory: './routes', + generatedRouteTree: './routeTree.gen.ts', + autoCodeSplitting: options.autoCodeSplitting, + }), + ], + }) + const close = async () => { + await server.close() + await rm(root, { recursive: true, force: true }) + } + try { + await server.listen() + const origin = server.resolvedUrls!.local[0]!.replace(/\/$/, '') + const messages: Array<{ type: string }> = [] + const socket = new WebSocket( + `${origin.replace('http', 'ws')}/?token=${server.config.webSocketToken}`, + 'vite-hmr', + ) + socket.addEventListener('message', (event) => { + messages.push(JSON.parse(String(event.data))) + }) + await new Promise((resolve, reject) => { + socket.addEventListener('open', resolve) + socket.addEventListener('error', reject) + }) + const statuses: Record = {} + const served: Record = {} + const queue = ['/main.ts'] + while (queue.length > 0) { + const url = queue.shift()! + if (url in statuses) { + continue + } + const response = await fetch(origin + url) + statuses[url] = response.status + const code = await response.text() + served[url] = code + // Static imports of the app's own modules + for (const [, imported] of code.matchAll( + /^import\s[^'"]*?["'](\/(?!@|node_modules)[^"'?]+)["']/gm, + )) { + queue.push(imported!) + } + } + return { + statuses, + served, + /** Writes `code` to `file`; resolves with Vite's first reaction. */ + async edit(file: string, code: string) { + const seen = messages.length + await writeFile(path.join(root, file), code) + const deadline = Date.now() + 10_000 + while (Date.now() < deadline) { + const reaction = messages + .slice(seen) + .find( + (message) => + message.type === 'update' || message.type === 'full-reload', + ) + if (reaction) { + return reaction.type + } + await new Promise((resolve) => setTimeout(resolve, 50)) + } + return 'nothing' + }, + async close() { + socket.close() + await close() + }, + } + } catch (error) { + await close() + throw error + } +} + +describe('route HMR in a Vite dev server', () => { + // Vite makes a module a hot boundary only when its code spells + // `import.meta.hot.accept(` out. Route modules no framework plugin accepts + // (a `.ts` route file, or an app without `@vitejs/plugin-react`) reloaded + // the page on every edit. + it.each([ + { + name: 'a .ts route file', + file: 'routes/index.ts', + code: `import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/')({ loader: () => 'data v1' }) +`, + autoCodeSplitting: true, + }, + { + name: 'a route component, without a framework plugin', + file: 'routes/index.tsx', + code: `import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/')({ component: () =>

page v1

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

{hot}

}) +`, + }, + // Unsplit, so the binding stays in the module the HMR code goes into + { autoCodeSplitting: false }, + ) + try { + expect(app.statuses['/routes/index.tsx']).toBe(200) + expect(app.served['/routes/index.tsx']).toMatch(/const hot = ["']hot["']/) + } finally { + await app.close() + } + }, 30_000) +}) diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@false.tsx index 48e3768224..994c89e7b2 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@false.tsx @@ -1,9 +1,10 @@ -const $$splitComponentImporter = () => import('arrow-function.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; -import { fetchPosts } from '../posts'; +const $$splitComponentImporter = () => + import('arrow-function.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' +import { fetchPosts } from '../posts' export const Route = createFileRoute('/posts')({ loader: fetchPosts, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@true.tsx index 4f32369e8f..e45f8b634a 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@true.tsx @@ -1,109 +1,115 @@ -const $$splitComponentImporter = () => import('arrow-function.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; -import { fetchPosts } from '../posts'; +const $$splitComponentImporter = () => + import('arrow-function.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' +import { fetchPosts } from '../posts' const TSRSplitComponent = (() => { - const hot = import.meta.hot; - const hotData = hot ? hot.data ??= {} : undefined; - return hotData?.["tsr-split-component:component"] ?? lazyRouteComponent($$splitComponentImporter, "component"); -})(); + const hot = import.meta.hot + const hotData = hot ? (hot.data ??= {}) : undefined + return ( + hotData?.['tsr-split-component:component'] ?? + lazyRouteComponent($$splitComponentImporter, 'component') + ) +})() if (import.meta.hot) { - (import.meta.hot.data ??= {})["tsr-split-component:component"] = TSRSplitComponent; + ;(import.meta.hot.data ??= {})['tsr-split-component:component'] = + TSRSplitComponent } export const Route = createFileRoute('/posts')({ loader: fetchPosts, - component: TSRSplitComponent -}); -const hot = import.meta.hot; -if (hot && typeof window !== 'undefined') { - hot.data ??= {}; - const tsrReactRefresh = window.__TSR_REACT_REFRESH__ ??= (() => { - const ignoredExportsById = new Map(); - const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports; - window.__getReactRefreshIgnoredExports = ctx => { - const ignoredExports = previousGetIgnoredExports?.(ctx) ?? []; - const moduleIgnored = ignoredExportsById.get(ctx.id) ?? []; - return [...ignoredExports, ...moduleIgnored]; - }; - return { - ignoredExportsById - }; - })(); - tsrReactRefresh.ignoredExportsById.set("arrow-function.tsx", ['Route']); + component: TSRSplitComponent, +}) +if (import.meta.hot && typeof window !== 'undefined') { + import.meta.hot.data ??= {} + const tsrReactRefresh = (window.__TSR_REACT_REFRESH__ ??= (() => { + const ignoredExportsById = new Map() + const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports + window.__getReactRefreshIgnoredExports = (ctx) => { + const ignoredExports = previousGetIgnoredExports?.(ctx) ?? [] + const moduleIgnored = ignoredExportsById.get(ctx.id) ?? [] + return [...ignoredExports, ...moduleIgnored] + } + return { ignoredExportsById } + })()) + tsrReactRefresh.ignoredExportsById.set('arrow-function.tsx', ['Route']) } export function TSRFastRefreshAnchor() { - return null; + return null } if (import.meta.hot) { - const hot = import.meta.hot; - const hotData = hot.data ??= {}; + const hotData = (import.meta.hot.data ??= {}) const handleRouteUpdate = function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = ["component", "shellComponent", "pendingComponent", "errorComponent", "notFoundComponent"]; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [ + 'component', + 'shellComponent', + 'pendingComponent', + 'errorComponent', + 'notFoundComponent', + ] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - }; - const initialRouteId = Route.id ?? hotData['tsr-route-id']; + } + const initialRouteId = Route.id ?? hotData['tsr-route-id'] if (initialRouteId) { - hotData['tsr-route-id'] = initialRouteId; + hotData['tsr-route-id'] = initialRouteId } - const existingRoute = typeof window !== 'undefined' && initialRouteId ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] : undefined; + const existingRoute = + typeof window !== 'undefined' && initialRouteId + ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] + : undefined if (initialRouteId && existingRoute && existingRoute !== Route) { - handleRouteUpdate(initialRouteId, Route); - hotData['tsr-route-update-handled'] = Route; + handleRouteUpdate(initialRouteId, Route) + hotData['tsr-route-update-handled'] = Route } - hot.accept(newModule => { + import.meta.hot.accept((newModule) => { if (Route && newModule && newModule.Route) { - const routeId = hotData['tsr-route-id'] ?? Route.id; + const routeId = hotData['tsr-route-id'] ?? Route.id if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } if (hotData['tsr-route-update-handled'] === newModule.Route) { - delete hotData['tsr-route-update-handled']; - return; + delete hotData['tsr-route-update-handled'] + return } - handleRouteUpdate(routeId, newModule.Route); + handleRouteUpdate(routeId, newModule.Route) } - }); -} \ No newline at end of file + }) +} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@webpack-hot.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@webpack-hot.tsx index 12e47f429e..eb655d0287 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@webpack-hot.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/arrow-function@webpack-hot.tsx @@ -1,87 +1,107 @@ -const $$splitComponentImporter = () => import('arrow-function.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; -import { fetchPosts } from '../posts'; +const $$splitComponentImporter = () => + import('arrow-function.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' +import { fetchPosts } from '../posts' const TSRSplitComponent = (() => { - const hot = import.meta.webpackHot; - const hotData = hot ? hot.data ??= {} : undefined; - return hotData?.["tsr-split-component:component"] ?? lazyRouteComponent($$splitComponentImporter, "component"); -})(); + const hot = import.meta.webpackHot + const hotData = hot ? (hot.data ??= {}) : undefined + return ( + hotData?.['tsr-split-component:component'] ?? + lazyRouteComponent($$splitComponentImporter, 'component') + ) +})() if (import.meta.webpackHot) { - (import.meta.webpackHot.data ??= {})["tsr-split-component:component"] = TSRSplitComponent; + ;(import.meta.webpackHot.data ??= {})['tsr-split-component:component'] = + TSRSplitComponent } export const Route = createFileRoute('/posts')({ loader: fetchPosts, - component: TSRSplitComponent -}); + component: TSRSplitComponent, +}) if (import.meta.webpackHot) { - const hot = import.meta.webpackHot; - const hotData = hot.data ??= {}; - const routeId = hotData['tsr-route-id'] ?? Route.id ?? (Route.isRoot ? '__root__' : undefined); + const hot = import.meta.webpackHot + const hotData = (hot.data ??= {}) + const routeId = + hotData['tsr-route-id'] ?? + Route.id ?? + (Route.isRoot ? '__root__' : undefined) if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } - const existingRoute = typeof window !== 'undefined' && routeId ? window.__TSR_ROUTER__?.routesById?.[routeId] : undefined; + const existingRoute = + typeof window !== 'undefined' && routeId + ? window.__TSR_ROUTER__?.routesById?.[routeId] + : undefined if (routeId && existingRoute && existingRoute !== Route) { - (function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + ;(function handleRouteUpdate(routeId, newRoute) { + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = ["component", "shellComponent", "pendingComponent", "errorComponent", "notFoundComponent"]; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [ + 'component', + 'shellComponent', + 'pendingComponent', + 'errorComponent', + 'notFoundComponent', + ] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - })(routeId, Route); + })(routeId, Route) try { - const tsrReactRefreshUtils = typeof __react_refresh_utils__ !== 'undefined' ? __react_refresh_utils__ : undefined; - const tsrEnqueueUpdate = tsrReactRefreshUtils && typeof tsrReactRefreshUtils.enqueueUpdate === 'function' ? tsrReactRefreshUtils.enqueueUpdate : undefined; + const tsrReactRefreshUtils = + typeof __react_refresh_utils__ !== 'undefined' + ? __react_refresh_utils__ + : undefined + const tsrEnqueueUpdate = + tsrReactRefreshUtils && + typeof tsrReactRefreshUtils.enqueueUpdate === 'function' + ? tsrReactRefreshUtils.enqueueUpdate + : undefined if (tsrEnqueueUpdate) { - tsrEnqueueUpdate(() => {}); + tsrEnqueueUpdate(() => {}) } } catch (_err) {} } - hot.dispose(data => { + hot.dispose((data) => { if (routeId) { - data['tsr-route-id'] = routeId; + data['tsr-route-id'] = routeId } - }); - hot.accept(); -} \ No newline at end of file + }) + hot.accept() +} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/createFileRoute-lowercase-components@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/createFileRoute-lowercase-components@false.tsx index a2983e31bd..e0b52f6ad6 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/createFileRoute-lowercase-components@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/createFileRoute-lowercase-components@false.tsx @@ -1,12 +1,17 @@ -const $$splitComponentImporter = () => import('createFileRoute-lowercase-components.tsx?tsr-split=component'); -const $$splitErrorComponentImporter = () => import('createFileRoute-lowercase-components.tsx?tsr-split=errorComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('createFileRoute-lowercase-components.tsx?tsr-split=component') +const $$splitErrorComponentImporter = () => + import('createFileRoute-lowercase-components.tsx?tsr-split=errorComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/lowercase-components')({ pendingComponent: pendingComponent, - errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); + errorComponent: lazyRouteComponent( + $$splitErrorComponentImporter, + 'errorComponent', + ), + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) function pendingComponent() { - return
Pending
; -} \ No newline at end of file + return
Pending
+} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/createFileRoute-lowercase-components@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/createFileRoute-lowercase-components@true.tsx index 70c428363e..441852d762 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/createFileRoute-lowercase-components@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/createFileRoute-lowercase-components@true.tsx @@ -1,120 +1,134 @@ -const $$splitComponentImporter = () => import('createFileRoute-lowercase-components.tsx?tsr-split=component'); -const $$splitErrorComponentImporter = () => import('createFileRoute-lowercase-components.tsx?tsr-split=errorComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('createFileRoute-lowercase-components.tsx?tsr-split=component') +const $$splitErrorComponentImporter = () => + import('createFileRoute-lowercase-components.tsx?tsr-split=errorComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' const TSRSplitErrorComponent = (() => { - const hot = import.meta.hot; - const hotData = hot ? hot.data ??= {} : undefined; - return hotData?.["tsr-split-component:errorComponent"] ?? lazyRouteComponent($$splitErrorComponentImporter, "errorComponent"); -})(); + const hot = import.meta.hot + const hotData = hot ? (hot.data ??= {}) : undefined + return ( + hotData?.['tsr-split-component:errorComponent'] ?? + lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') + ) +})() if (import.meta.hot) { - (import.meta.hot.data ??= {})["tsr-split-component:errorComponent"] = TSRSplitErrorComponent; + ;(import.meta.hot.data ??= {})['tsr-split-component:errorComponent'] = + TSRSplitErrorComponent } const TSRSplitComponent = (() => { - const hot = import.meta.hot; - const hotData = hot ? hot.data ??= {} : undefined; - return hotData?.["tsr-split-component:component"] ?? lazyRouteComponent($$splitComponentImporter, "component"); -})(); + const hot = import.meta.hot + const hotData = hot ? (hot.data ??= {}) : undefined + return ( + hotData?.['tsr-split-component:component'] ?? + lazyRouteComponent($$splitComponentImporter, 'component') + ) +})() if (import.meta.hot) { - (import.meta.hot.data ??= {})["tsr-split-component:component"] = TSRSplitComponent; + ;(import.meta.hot.data ??= {})['tsr-split-component:component'] = + TSRSplitComponent } export const Route = createFileRoute('/lowercase-components')({ pendingComponent: TSRPendingComponent, errorComponent: TSRSplitErrorComponent, - component: TSRSplitComponent -}); + component: TSRSplitComponent, +}) function TSRPendingComponent() { - return
Pending
; + return
Pending
} -const hot = import.meta.hot; -if (hot && typeof window !== 'undefined') { - hot.data ??= {}; - const tsrReactRefresh = window.__TSR_REACT_REFRESH__ ??= (() => { - const ignoredExportsById = new Map(); - const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports; - window.__getReactRefreshIgnoredExports = ctx => { - const ignoredExports = previousGetIgnoredExports?.(ctx) ?? []; - const moduleIgnored = ignoredExportsById.get(ctx.id) ?? []; - return [...ignoredExports, ...moduleIgnored]; - }; - return { - ignoredExportsById - }; - })(); - tsrReactRefresh.ignoredExportsById.set("createFileRoute-lowercase-components.tsx", ['Route']); +if (import.meta.hot && typeof window !== 'undefined') { + import.meta.hot.data ??= {} + const tsrReactRefresh = (window.__TSR_REACT_REFRESH__ ??= (() => { + const ignoredExportsById = new Map() + const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports + window.__getReactRefreshIgnoredExports = (ctx) => { + const ignoredExports = previousGetIgnoredExports?.(ctx) ?? [] + const moduleIgnored = ignoredExportsById.get(ctx.id) ?? [] + return [...ignoredExports, ...moduleIgnored] + } + return { ignoredExportsById } + })()) + tsrReactRefresh.ignoredExportsById.set( + 'createFileRoute-lowercase-components.tsx', + ['Route'], + ) } export function TSRFastRefreshAnchor() { - return null; + return null } if (import.meta.hot) { - const hot = import.meta.hot; - const hotData = hot.data ??= {}; + const hotData = (import.meta.hot.data ??= {}) const handleRouteUpdate = function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = ["component", "shellComponent", "pendingComponent", "errorComponent", "notFoundComponent"]; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [ + 'component', + 'shellComponent', + 'pendingComponent', + 'errorComponent', + 'notFoundComponent', + ] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - }; - const initialRouteId = Route.id ?? hotData['tsr-route-id']; + } + const initialRouteId = Route.id ?? hotData['tsr-route-id'] if (initialRouteId) { - hotData['tsr-route-id'] = initialRouteId; + hotData['tsr-route-id'] = initialRouteId } - const existingRoute = typeof window !== 'undefined' && initialRouteId ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] : undefined; + const existingRoute = + typeof window !== 'undefined' && initialRouteId + ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] + : undefined if (initialRouteId && existingRoute && existingRoute !== Route) { - handleRouteUpdate(initialRouteId, Route); - hotData['tsr-route-update-handled'] = Route; + handleRouteUpdate(initialRouteId, Route) + hotData['tsr-route-update-handled'] = Route } - hot.accept(newModule => { + import.meta.hot.accept((newModule) => { if (Route && newModule && newModule.Route) { - const routeId = hotData['tsr-route-id'] ?? Route.id; + const routeId = hotData['tsr-route-id'] ?? Route.id if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } if (hotData['tsr-route-update-handled'] === newModule.Route) { - delete hotData['tsr-route-update-handled']; - return; + delete hotData['tsr-route-update-handled'] + return } - handleRouteUpdate(routeId, newModule.Route); + handleRouteUpdate(routeId, newModule.Route) } - }); -} \ No newline at end of file + }) +} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-inline-component@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-inline-component@false.tsx index 5daf018617..7e3ad124ae 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-inline-component@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-inline-component@false.tsx @@ -1,6 +1,3 @@ import * as React from 'react' import { createRootRoute } from '@tanstack/react-router' - -export const Route = createRootRoute({ - component: () =>
root hmr
, -}) +export const Route = createRootRoute({ component: () =>
root hmr
}) diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-inline-component@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-inline-component@true.tsx index e5a473dc14..f45186bdd9 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-inline-component@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-inline-component@true.tsx @@ -1,98 +1,100 @@ -import * as React from 'react'; -import { createRootRoute } from '@tanstack/react-router'; -const TSRComponent = () =>
root hmr
; -export const Route = createRootRoute({ - component: TSRComponent -}); -const hot = import.meta.hot; -if (hot && typeof window !== 'undefined') { - hot.data ??= {}; - const tsrReactRefresh = window.__TSR_REACT_REFRESH__ ??= (() => { - const ignoredExportsById = new Map(); - const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports; - window.__getReactRefreshIgnoredExports = ctx => { - const ignoredExports = previousGetIgnoredExports?.(ctx) ?? []; - const moduleIgnored = ignoredExportsById.get(ctx.id) ?? []; - return [...ignoredExports, ...moduleIgnored]; - }; - return { - ignoredExportsById - }; - })(); - tsrReactRefresh.ignoredExportsById.set("createRootRoute-inline-component.tsx", ['Route']); +import * as React from 'react' +import { createRootRoute } from '@tanstack/react-router' +const TSRComponent = () =>
root hmr
+export const Route = createRootRoute({ component: TSRComponent }) +if (import.meta.hot && typeof window !== 'undefined') { + import.meta.hot.data ??= {} + const tsrReactRefresh = (window.__TSR_REACT_REFRESH__ ??= (() => { + const ignoredExportsById = new Map() + const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports + window.__getReactRefreshIgnoredExports = (ctx) => { + const ignoredExports = previousGetIgnoredExports?.(ctx) ?? [] + const moduleIgnored = ignoredExportsById.get(ctx.id) ?? [] + return [...ignoredExports, ...moduleIgnored] + } + return { ignoredExportsById } + })()) + tsrReactRefresh.ignoredExportsById.set( + 'createRootRoute-inline-component.tsx', + ['Route'], + ) } export function TSRFastRefreshAnchor() { - return null; + return null } if (import.meta.hot) { - const hot = import.meta.hot; - const hotData = hot.data ??= {}; + const hotData = (import.meta.hot.data ??= {}) const handleRouteUpdate = function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = ["component", "shellComponent", "pendingComponent", "errorComponent", "notFoundComponent"]; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [ + 'component', + 'shellComponent', + 'pendingComponent', + 'errorComponent', + 'notFoundComponent', + ] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - }; - const initialRouteId = Route.id ?? hotData['tsr-route-id']; + } + const initialRouteId = Route.id ?? hotData['tsr-route-id'] if (initialRouteId) { - hotData['tsr-route-id'] = initialRouteId; + hotData['tsr-route-id'] = initialRouteId } - const existingRoute = typeof window !== 'undefined' && initialRouteId ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] : undefined; + const existingRoute = + typeof window !== 'undefined' && initialRouteId + ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] + : undefined if (initialRouteId && existingRoute && existingRoute !== Route) { - handleRouteUpdate(initialRouteId, Route); - hotData['tsr-route-update-handled'] = Route; + handleRouteUpdate(initialRouteId, Route) + hotData['tsr-route-update-handled'] = Route } - hot.accept(newModule => { + import.meta.hot.accept((newModule) => { if (Route && newModule && newModule.Route) { - const routeId = hotData['tsr-route-id'] ?? Route.id; + const routeId = hotData['tsr-route-id'] ?? Route.id if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } if (hotData['tsr-route-update-handled'] === newModule.Route) { - delete hotData['tsr-route-update-handled']; - return; + delete hotData['tsr-route-update-handled'] + return } - handleRouteUpdate(routeId, newModule.Route); + handleRouteUpdate(routeId, newModule.Route) } - }); -} \ No newline at end of file + }) +} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-lowercase-components@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-lowercase-components@false.tsx index 20c9a07798..6fac4df1f1 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-lowercase-components@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-lowercase-components@false.tsx @@ -1,25 +1,20 @@ import * as React from 'react' import { createRootRoute } from '@tanstack/react-router' - export const Route = createRootRoute({ shellComponent: shellComponent, pendingComponent: pendingComponent, errorComponent: errorComponent, component: component, }) - function shellComponent({ children }: { children: React.ReactNode }) { return {children} } - function pendingComponent() { return
Pending
} - function errorComponent() { return
Error
} - function component() { return
Hello
} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-lowercase-components@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-lowercase-components@true.tsx index cb5014cd35..f9a6875fe7 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-lowercase-components@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute-lowercase-components@true.tsx @@ -1,116 +1,116 @@ -import * as React from 'react'; -import { createRootRoute } from '@tanstack/react-router'; +import * as React from 'react' +import { createRootRoute } from '@tanstack/react-router' export const Route = createRootRoute({ shellComponent: TSRShellComponent, pendingComponent: TSRPendingComponent, errorComponent: TSRErrorComponent, - component: TSRComponent -}); -function TSRShellComponent({ - children -}: { - children: React.ReactNode; -}) { - return {children}; + component: TSRComponent, +}) +function TSRShellComponent({ children }: { children: React.ReactNode }) { + return {children} } function TSRPendingComponent() { - return
Pending
; + return
Pending
} function TSRErrorComponent() { - return
Error
; + return
Error
} function TSRComponent() { - return
Hello
; + return
Hello
} -const hot = import.meta.hot; -if (hot && typeof window !== 'undefined') { - hot.data ??= {}; - const tsrReactRefresh = window.__TSR_REACT_REFRESH__ ??= (() => { - const ignoredExportsById = new Map(); - const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports; - window.__getReactRefreshIgnoredExports = ctx => { - const ignoredExports = previousGetIgnoredExports?.(ctx) ?? []; - const moduleIgnored = ignoredExportsById.get(ctx.id) ?? []; - return [...ignoredExports, ...moduleIgnored]; - }; - return { - ignoredExportsById - }; - })(); - tsrReactRefresh.ignoredExportsById.set("createRootRoute-lowercase-components.tsx", ['Route']); +if (import.meta.hot && typeof window !== 'undefined') { + import.meta.hot.data ??= {} + const tsrReactRefresh = (window.__TSR_REACT_REFRESH__ ??= (() => { + const ignoredExportsById = new Map() + const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports + window.__getReactRefreshIgnoredExports = (ctx) => { + const ignoredExports = previousGetIgnoredExports?.(ctx) ?? [] + const moduleIgnored = ignoredExportsById.get(ctx.id) ?? [] + return [...ignoredExports, ...moduleIgnored] + } + return { ignoredExportsById } + })()) + tsrReactRefresh.ignoredExportsById.set( + 'createRootRoute-lowercase-components.tsx', + ['Route'], + ) } export function TSRFastRefreshAnchor() { - return null; + return null } if (import.meta.hot) { - const hot = import.meta.hot; - const hotData = hot.data ??= {}; + const hotData = (import.meta.hot.data ??= {}) const handleRouteUpdate = function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = ["component", "shellComponent", "pendingComponent", "errorComponent", "notFoundComponent"]; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [ + 'component', + 'shellComponent', + 'pendingComponent', + 'errorComponent', + 'notFoundComponent', + ] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - }; - const initialRouteId = Route.id ?? hotData['tsr-route-id']; + } + const initialRouteId = Route.id ?? hotData['tsr-route-id'] if (initialRouteId) { - hotData['tsr-route-id'] = initialRouteId; + hotData['tsr-route-id'] = initialRouteId } - const existingRoute = typeof window !== 'undefined' && initialRouteId ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] : undefined; + const existingRoute = + typeof window !== 'undefined' && initialRouteId + ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] + : undefined if (initialRouteId && existingRoute && existingRoute !== Route) { - handleRouteUpdate(initialRouteId, Route); - hotData['tsr-route-update-handled'] = Route; + handleRouteUpdate(initialRouteId, Route) + hotData['tsr-route-update-handled'] = Route } - hot.accept(newModule => { + import.meta.hot.accept((newModule) => { if (Route && newModule && newModule.Route) { - const routeId = hotData['tsr-route-id'] ?? Route.id; + const routeId = hotData['tsr-route-id'] ?? Route.id if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } if (hotData['tsr-route-update-handled'] === newModule.Route) { - delete hotData['tsr-route-update-handled']; - return; + delete hotData['tsr-route-update-handled'] + return } - handleRouteUpdate(routeId, newModule.Route); + handleRouteUpdate(routeId, newModule.Route) } - }); -} \ No newline at end of file + }) +} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute@false.tsx index e967791f8d..5c779d9876 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute@false.tsx @@ -1,10 +1,6 @@ import * as React from 'react' import { createRootRoute } from '@tanstack/react-router' - -export const Route = createRootRoute({ - component: RootComponent, -}) - +export const Route = createRootRoute({ component: RootComponent }) function RootComponent() { return
Hello
} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute@true.tsx index 7ba271c212..3bde5adf5c 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRoute@true.tsx @@ -1,100 +1,99 @@ -import * as React from 'react'; -import { createRootRoute } from '@tanstack/react-router'; -export const Route = createRootRoute({ - component: RootComponent -}); +import * as React from 'react' +import { createRootRoute } from '@tanstack/react-router' +export const Route = createRootRoute({ component: RootComponent }) function RootComponent() { - return
Hello
; + return
Hello
} -const hot = import.meta.hot; -if (hot && typeof window !== 'undefined') { - hot.data ??= {}; - const tsrReactRefresh = window.__TSR_REACT_REFRESH__ ??= (() => { - const ignoredExportsById = new Map(); - const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports; - window.__getReactRefreshIgnoredExports = ctx => { - const ignoredExports = previousGetIgnoredExports?.(ctx) ?? []; - const moduleIgnored = ignoredExportsById.get(ctx.id) ?? []; - return [...ignoredExports, ...moduleIgnored]; - }; - return { - ignoredExportsById - }; - })(); - tsrReactRefresh.ignoredExportsById.set("createRootRoute.tsx", ['Route']); +if (import.meta.hot && typeof window !== 'undefined') { + import.meta.hot.data ??= {} + const tsrReactRefresh = (window.__TSR_REACT_REFRESH__ ??= (() => { + const ignoredExportsById = new Map() + const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports + window.__getReactRefreshIgnoredExports = (ctx) => { + const ignoredExports = previousGetIgnoredExports?.(ctx) ?? [] + const moduleIgnored = ignoredExportsById.get(ctx.id) ?? [] + return [...ignoredExports, ...moduleIgnored] + } + return { ignoredExportsById } + })()) + tsrReactRefresh.ignoredExportsById.set('createRootRoute.tsx', ['Route']) } export function TSRFastRefreshAnchor() { - return null; + return null } if (import.meta.hot) { - const hot = import.meta.hot; - const hotData = hot.data ??= {}; + const hotData = (import.meta.hot.data ??= {}) const handleRouteUpdate = function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = ["component", "shellComponent", "pendingComponent", "errorComponent", "notFoundComponent"]; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [ + 'component', + 'shellComponent', + 'pendingComponent', + 'errorComponent', + 'notFoundComponent', + ] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - }; - const initialRouteId = Route.id ?? hotData['tsr-route-id']; + } + const initialRouteId = Route.id ?? hotData['tsr-route-id'] if (initialRouteId) { - hotData['tsr-route-id'] = initialRouteId; + hotData['tsr-route-id'] = initialRouteId } - const existingRoute = typeof window !== 'undefined' && initialRouteId ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] : undefined; + const existingRoute = + typeof window !== 'undefined' && initialRouteId + ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] + : undefined if (initialRouteId && existingRoute && existingRoute !== Route) { - handleRouteUpdate(initialRouteId, Route); - hotData['tsr-route-update-handled'] = Route; + handleRouteUpdate(initialRouteId, Route) + hotData['tsr-route-update-handled'] = Route } - hot.accept(newModule => { + import.meta.hot.accept((newModule) => { if (Route && newModule && newModule.Route) { - const routeId = hotData['tsr-route-id'] ?? Route.id; + const routeId = hotData['tsr-route-id'] ?? Route.id if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } if (hotData['tsr-route-update-handled'] === newModule.Route) { - delete hotData['tsr-route-update-handled']; - return; + delete hotData['tsr-route-update-handled'] + return } - handleRouteUpdate(routeId, newModule.Route); + handleRouteUpdate(routeId, newModule.Route) } - }); -} \ No newline at end of file + }) +} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRouteWithContext-type-args@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRouteWithContext-type-args@false.tsx index 0feadacab5..43f27087a6 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRouteWithContext-type-args@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRouteWithContext-type-args@false.tsx @@ -1,14 +1,11 @@ import * as React from 'react' import { createRootRouteWithContext } from '@tanstack/react-router' - interface MyRouterContext { auth: boolean } - export const Route = createRootRouteWithContext()({ component: RootComponent, }) - function RootComponent() { return
Hello
} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRouteWithContext-type-args@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRouteWithContext-type-args@true.tsx index b66449aebf..c96d6f01a5 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRouteWithContext-type-args@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/createRootRouteWithContext-type-args@true.tsx @@ -1,103 +1,107 @@ -import * as React from 'react'; -import { createRootRouteWithContext } from '@tanstack/react-router'; +import * as React from 'react' +import { createRootRouteWithContext } from '@tanstack/react-router' interface MyRouterContext { - auth: boolean; + auth: boolean } export const Route = createRootRouteWithContext()({ - component: RootComponent -}); + component: RootComponent, +}) function RootComponent() { - return
Hello
; + return
Hello
} -const hot = import.meta.hot; -if (hot && typeof window !== 'undefined') { - hot.data ??= {}; - const tsrReactRefresh = window.__TSR_REACT_REFRESH__ ??= (() => { - const ignoredExportsById = new Map(); - const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports; - window.__getReactRefreshIgnoredExports = ctx => { - const ignoredExports = previousGetIgnoredExports?.(ctx) ?? []; - const moduleIgnored = ignoredExportsById.get(ctx.id) ?? []; - return [...ignoredExports, ...moduleIgnored]; - }; - return { - ignoredExportsById - }; - })(); - tsrReactRefresh.ignoredExportsById.set("createRootRouteWithContext-type-args.tsx", ['Route']); +if (import.meta.hot && typeof window !== 'undefined') { + import.meta.hot.data ??= {} + const tsrReactRefresh = (window.__TSR_REACT_REFRESH__ ??= (() => { + const ignoredExportsById = new Map() + const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports + window.__getReactRefreshIgnoredExports = (ctx) => { + const ignoredExports = previousGetIgnoredExports?.(ctx) ?? [] + const moduleIgnored = ignoredExportsById.get(ctx.id) ?? [] + return [...ignoredExports, ...moduleIgnored] + } + return { ignoredExportsById } + })()) + tsrReactRefresh.ignoredExportsById.set( + 'createRootRouteWithContext-type-args.tsx', + ['Route'], + ) } export function TSRFastRefreshAnchor() { - return null; + return null } if (import.meta.hot) { - const hot = import.meta.hot; - const hotData = hot.data ??= {}; + const hotData = (import.meta.hot.data ??= {}) const handleRouteUpdate = function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = ["component", "shellComponent", "pendingComponent", "errorComponent", "notFoundComponent"]; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [ + 'component', + 'shellComponent', + 'pendingComponent', + 'errorComponent', + 'notFoundComponent', + ] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - }; - const initialRouteId = Route.id ?? hotData['tsr-route-id']; + } + const initialRouteId = Route.id ?? hotData['tsr-route-id'] if (initialRouteId) { - hotData['tsr-route-id'] = initialRouteId; + hotData['tsr-route-id'] = initialRouteId } - const existingRoute = typeof window !== 'undefined' && initialRouteId ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] : undefined; + const existingRoute = + typeof window !== 'undefined' && initialRouteId + ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] + : undefined if (initialRouteId && existingRoute && existingRoute !== Route) { - handleRouteUpdate(initialRouteId, Route); - hotData['tsr-route-update-handled'] = Route; + handleRouteUpdate(initialRouteId, Route) + hotData['tsr-route-update-handled'] = Route } - hot.accept(newModule => { + import.meta.hot.accept((newModule) => { if (Route && newModule && newModule.Route) { - const routeId = hotData['tsr-route-id'] ?? Route.id; + const routeId = hotData['tsr-route-id'] ?? Route.id if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } if (hotData['tsr-route-update-handled'] === newModule.Route) { - delete hotData['tsr-route-update-handled']; - return; + delete hotData['tsr-route-update-handled'] + return } - handleRouteUpdate(routeId, newModule.Route); + handleRouteUpdate(routeId, newModule.Route) } - }); -} \ No newline at end of file + }) +} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/destructuring@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/destructuring@false.tsx index d80f17484f..112fded569 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/destructuring@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/destructuring@false.tsx @@ -1,11 +1,9 @@ import thing from 'thing' - export function test() { const { foo: { bar: { destructured }, }, } = thing - return destructured } diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/destructuring@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/destructuring@true.tsx index d80f17484f..112fded569 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/destructuring@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/destructuring@true.tsx @@ -1,11 +1,9 @@ import thing from 'thing' - export function test() { const { foo: { bar: { destructured }, }, } = thing - return destructured } diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/explicit-undefined-component@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/explicit-undefined-component@false.tsx index 4fdd9d1c68..8109a89624 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/explicit-undefined-component@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/explicit-undefined-component@false.tsx @@ -1,6 +1,3 @@ import React from 'react' import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/')({ - component: undefined, -}) +export const Route = createFileRoute('/')({ component: undefined }) diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/explicit-undefined-component@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/explicit-undefined-component@true.tsx index fee0b2f2e6..99674604fa 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/explicit-undefined-component@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/explicit-undefined-component@true.tsx @@ -1,97 +1,98 @@ -import React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; -export const Route = createFileRoute('/')({ - component: undefined -}); -const hot = import.meta.hot; -if (hot && typeof window !== 'undefined') { - hot.data ??= {}; - const tsrReactRefresh = window.__TSR_REACT_REFRESH__ ??= (() => { - const ignoredExportsById = new Map(); - const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports; - window.__getReactRefreshIgnoredExports = ctx => { - const ignoredExports = previousGetIgnoredExports?.(ctx) ?? []; - const moduleIgnored = ignoredExportsById.get(ctx.id) ?? []; - return [...ignoredExports, ...moduleIgnored]; - }; - return { - ignoredExportsById - }; - })(); - tsrReactRefresh.ignoredExportsById.set("explicit-undefined-component.tsx", ['Route']); +import React from 'react' +import { createFileRoute } from '@tanstack/react-router' +export const Route = createFileRoute('/')({ component: undefined }) +if (import.meta.hot && typeof window !== 'undefined') { + import.meta.hot.data ??= {} + const tsrReactRefresh = (window.__TSR_REACT_REFRESH__ ??= (() => { + const ignoredExportsById = new Map() + const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports + window.__getReactRefreshIgnoredExports = (ctx) => { + const ignoredExports = previousGetIgnoredExports?.(ctx) ?? [] + const moduleIgnored = ignoredExportsById.get(ctx.id) ?? [] + return [...ignoredExports, ...moduleIgnored] + } + return { ignoredExportsById } + })()) + tsrReactRefresh.ignoredExportsById.set('explicit-undefined-component.tsx', [ + 'Route', + ]) } export function TSRFastRefreshAnchor() { - return null; + return null } if (import.meta.hot) { - const hot = import.meta.hot; - const hotData = hot.data ??= {}; + const hotData = (import.meta.hot.data ??= {}) const handleRouteUpdate = function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = ["component", "shellComponent", "pendingComponent", "errorComponent", "notFoundComponent"]; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [ + 'component', + 'shellComponent', + 'pendingComponent', + 'errorComponent', + 'notFoundComponent', + ] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - }; - const initialRouteId = Route.id ?? hotData['tsr-route-id']; + } + const initialRouteId = Route.id ?? hotData['tsr-route-id'] if (initialRouteId) { - hotData['tsr-route-id'] = initialRouteId; + hotData['tsr-route-id'] = initialRouteId } - const existingRoute = typeof window !== 'undefined' && initialRouteId ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] : undefined; + const existingRoute = + typeof window !== 'undefined' && initialRouteId + ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] + : undefined if (initialRouteId && existingRoute && existingRoute !== Route) { - handleRouteUpdate(initialRouteId, Route); - hotData['tsr-route-update-handled'] = Route; + handleRouteUpdate(initialRouteId, Route) + hotData['tsr-route-update-handled'] = Route } - hot.accept(newModule => { + import.meta.hot.accept((newModule) => { if (Route && newModule && newModule.Route) { - const routeId = hotData['tsr-route-id'] ?? Route.id; + const routeId = hotData['tsr-route-id'] ?? Route.id if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } if (hotData['tsr-route-update-handled'] === newModule.Route) { - delete hotData['tsr-route-update-handled']; - return; + delete hotData['tsr-route-update-handled'] + return } - handleRouteUpdate(routeId, newModule.Route); + handleRouteUpdate(routeId, newModule.Route) } - }); -} \ No newline at end of file + }) +} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/function-declaration@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/function-declaration@false.tsx index 5d7e2181f5..e2b672f7b8 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/function-declaration@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/function-declaration@false.tsx @@ -1,9 +1,10 @@ -const $$splitComponentImporter = () => import('function-declaration.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; -import { fetchPosts } from '../posts'; +const $$splitComponentImporter = () => + import('function-declaration.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' +import { fetchPosts } from '../posts' export const Route = createFileRoute('/posts')({ loader: fetchPosts, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/function-declaration@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/function-declaration@true.tsx index 4a925828e2..614c38c954 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/function-declaration@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/function-declaration@true.tsx @@ -1,109 +1,115 @@ -const $$splitComponentImporter = () => import('function-declaration.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; -import { fetchPosts } from '../posts'; +const $$splitComponentImporter = () => + import('function-declaration.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' +import { fetchPosts } from '../posts' const TSRSplitComponent = (() => { - const hot = import.meta.hot; - const hotData = hot ? hot.data ??= {} : undefined; - return hotData?.["tsr-split-component:component"] ?? lazyRouteComponent($$splitComponentImporter, "component"); -})(); + const hot = import.meta.hot + const hotData = hot ? (hot.data ??= {}) : undefined + return ( + hotData?.['tsr-split-component:component'] ?? + lazyRouteComponent($$splitComponentImporter, 'component') + ) +})() if (import.meta.hot) { - (import.meta.hot.data ??= {})["tsr-split-component:component"] = TSRSplitComponent; + ;(import.meta.hot.data ??= {})['tsr-split-component:component'] = + TSRSplitComponent } export const Route = createFileRoute('/posts')({ loader: fetchPosts, - component: TSRSplitComponent -}); -const hot = import.meta.hot; -if (hot && typeof window !== 'undefined') { - hot.data ??= {}; - const tsrReactRefresh = window.__TSR_REACT_REFRESH__ ??= (() => { - const ignoredExportsById = new Map(); - const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports; - window.__getReactRefreshIgnoredExports = ctx => { - const ignoredExports = previousGetIgnoredExports?.(ctx) ?? []; - const moduleIgnored = ignoredExportsById.get(ctx.id) ?? []; - return [...ignoredExports, ...moduleIgnored]; - }; - return { - ignoredExportsById - }; - })(); - tsrReactRefresh.ignoredExportsById.set("function-declaration.tsx", ['Route']); + component: TSRSplitComponent, +}) +if (import.meta.hot && typeof window !== 'undefined') { + import.meta.hot.data ??= {} + const tsrReactRefresh = (window.__TSR_REACT_REFRESH__ ??= (() => { + const ignoredExportsById = new Map() + const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports + window.__getReactRefreshIgnoredExports = (ctx) => { + const ignoredExports = previousGetIgnoredExports?.(ctx) ?? [] + const moduleIgnored = ignoredExportsById.get(ctx.id) ?? [] + return [...ignoredExports, ...moduleIgnored] + } + return { ignoredExportsById } + })()) + tsrReactRefresh.ignoredExportsById.set('function-declaration.tsx', ['Route']) } export function TSRFastRefreshAnchor() { - return null; + return null } if (import.meta.hot) { - const hot = import.meta.hot; - const hotData = hot.data ??= {}; + const hotData = (import.meta.hot.data ??= {}) const handleRouteUpdate = function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = ["component", "shellComponent", "pendingComponent", "errorComponent", "notFoundComponent"]; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [ + 'component', + 'shellComponent', + 'pendingComponent', + 'errorComponent', + 'notFoundComponent', + ] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - }; - const initialRouteId = Route.id ?? hotData['tsr-route-id']; + } + const initialRouteId = Route.id ?? hotData['tsr-route-id'] if (initialRouteId) { - hotData['tsr-route-id'] = initialRouteId; + hotData['tsr-route-id'] = initialRouteId } - const existingRoute = typeof window !== 'undefined' && initialRouteId ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] : undefined; + const existingRoute = + typeof window !== 'undefined' && initialRouteId + ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] + : undefined if (initialRouteId && existingRoute && existingRoute !== Route) { - handleRouteUpdate(initialRouteId, Route); - hotData['tsr-route-update-handled'] = Route; + handleRouteUpdate(initialRouteId, Route) + hotData['tsr-route-update-handled'] = Route } - hot.accept(newModule => { + import.meta.hot.accept((newModule) => { if (Route && newModule && newModule.Route) { - const routeId = hotData['tsr-route-id'] ?? Route.id; + const routeId = hotData['tsr-route-id'] ?? Route.id if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } if (hotData['tsr-route-update-handled'] === newModule.Route) { - delete hotData['tsr-route-update-handled']; - return; + delete hotData['tsr-route-update-handled'] + return } - handleRouteUpdate(routeId, newModule.Route); + handleRouteUpdate(routeId, newModule.Route) } - }); -} \ No newline at end of file + }) +} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/multi-component@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/multi-component@false.tsx index 653c0c21f5..456134aadc 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/multi-component@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/multi-component@false.tsx @@ -1,11 +1,16 @@ -const $$splitErrorComponentImporter = () => import('multi-component.tsx?tsr-split=errorComponent'); -const $$splitComponentImporter = () => import('multi-component.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; -import { fetchPosts } from '../posts'; +const $$splitErrorComponentImporter = () => + import('multi-component.tsx?tsr-split=errorComponent') +const $$splitComponentImporter = () => + import('multi-component.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' +import { fetchPosts } from '../posts' export const Route = createFileRoute('/posts')({ loader: fetchPosts, component: lazyRouteComponent($$splitComponentImporter, 'component'), - errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') -}); \ No newline at end of file + errorComponent: lazyRouteComponent( + $$splitErrorComponentImporter, + 'errorComponent', + ), +}) diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/multi-component@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/multi-component@true.tsx index ca2a7ab2e2..871bf352e0 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/multi-component@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/multi-component@true.tsx @@ -1,119 +1,130 @@ -const $$splitErrorComponentImporter = () => import('multi-component.tsx?tsr-split=errorComponent'); -const $$splitComponentImporter = () => import('multi-component.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; -import { fetchPosts } from '../posts'; +const $$splitErrorComponentImporter = () => + import('multi-component.tsx?tsr-split=errorComponent') +const $$splitComponentImporter = () => + import('multi-component.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' +import { fetchPosts } from '../posts' const TSRSplitComponent = (() => { - const hot = import.meta.hot; - const hotData = hot ? hot.data ??= {} : undefined; - return hotData?.["tsr-split-component:component"] ?? lazyRouteComponent($$splitComponentImporter, "component"); -})(); + const hot = import.meta.hot + const hotData = hot ? (hot.data ??= {}) : undefined + return ( + hotData?.['tsr-split-component:component'] ?? + lazyRouteComponent($$splitComponentImporter, 'component') + ) +})() if (import.meta.hot) { - (import.meta.hot.data ??= {})["tsr-split-component:component"] = TSRSplitComponent; + ;(import.meta.hot.data ??= {})['tsr-split-component:component'] = + TSRSplitComponent } const TSRSplitErrorComponent = (() => { - const hot = import.meta.hot; - const hotData = hot ? hot.data ??= {} : undefined; - return hotData?.["tsr-split-component:errorComponent"] ?? lazyRouteComponent($$splitErrorComponentImporter, "errorComponent"); -})(); + const hot = import.meta.hot + const hotData = hot ? (hot.data ??= {}) : undefined + return ( + hotData?.['tsr-split-component:errorComponent'] ?? + lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') + ) +})() if (import.meta.hot) { - (import.meta.hot.data ??= {})["tsr-split-component:errorComponent"] = TSRSplitErrorComponent; + ;(import.meta.hot.data ??= {})['tsr-split-component:errorComponent'] = + TSRSplitErrorComponent } export const Route = createFileRoute('/posts')({ loader: fetchPosts, component: TSRSplitComponent, - errorComponent: TSRSplitErrorComponent -}); -const hot = import.meta.hot; -if (hot && typeof window !== 'undefined') { - hot.data ??= {}; - const tsrReactRefresh = window.__TSR_REACT_REFRESH__ ??= (() => { - const ignoredExportsById = new Map(); - const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports; - window.__getReactRefreshIgnoredExports = ctx => { - const ignoredExports = previousGetIgnoredExports?.(ctx) ?? []; - const moduleIgnored = ignoredExportsById.get(ctx.id) ?? []; - return [...ignoredExports, ...moduleIgnored]; - }; - return { - ignoredExportsById - }; - })(); - tsrReactRefresh.ignoredExportsById.set("multi-component.tsx", ['Route']); + errorComponent: TSRSplitErrorComponent, +}) +if (import.meta.hot && typeof window !== 'undefined') { + import.meta.hot.data ??= {} + const tsrReactRefresh = (window.__TSR_REACT_REFRESH__ ??= (() => { + const ignoredExportsById = new Map() + const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports + window.__getReactRefreshIgnoredExports = (ctx) => { + const ignoredExports = previousGetIgnoredExports?.(ctx) ?? [] + const moduleIgnored = ignoredExportsById.get(ctx.id) ?? [] + return [...ignoredExports, ...moduleIgnored] + } + return { ignoredExportsById } + })()) + tsrReactRefresh.ignoredExportsById.set('multi-component.tsx', ['Route']) } export function TSRFastRefreshAnchor() { - return null; + return null } if (import.meta.hot) { - const hot = import.meta.hot; - const hotData = hot.data ??= {}; + const hotData = (import.meta.hot.data ??= {}) const handleRouteUpdate = function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = ["component", "shellComponent", "pendingComponent", "errorComponent", "notFoundComponent"]; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [ + 'component', + 'shellComponent', + 'pendingComponent', + 'errorComponent', + 'notFoundComponent', + ] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - }; - const initialRouteId = Route.id ?? hotData['tsr-route-id']; + } + const initialRouteId = Route.id ?? hotData['tsr-route-id'] if (initialRouteId) { - hotData['tsr-route-id'] = initialRouteId; + hotData['tsr-route-id'] = initialRouteId } - const existingRoute = typeof window !== 'undefined' && initialRouteId ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] : undefined; + const existingRoute = + typeof window !== 'undefined' && initialRouteId + ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] + : undefined if (initialRouteId && existingRoute && existingRoute !== Route) { - handleRouteUpdate(initialRouteId, Route); - hotData['tsr-route-update-handled'] = Route; + handleRouteUpdate(initialRouteId, Route) + hotData['tsr-route-update-handled'] = Route } - hot.accept(newModule => { + import.meta.hot.accept((newModule) => { if (Route && newModule && newModule.Route) { - const routeId = hotData['tsr-route-id'] ?? Route.id; + const routeId = hotData['tsr-route-id'] ?? Route.id if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } if (hotData['tsr-route-update-handled'] === newModule.Route) { - delete hotData['tsr-route-update-handled']; - return; + delete hotData['tsr-route-update-handled'] + return } - handleRouteUpdate(routeId, newModule.Route); + handleRouteUpdate(routeId, newModule.Route) } - }); -} \ No newline at end of file + }) +} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/string-literal-keys@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/string-literal-keys@false.tsx index 4fc3129e14..cfb23b03d2 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/string-literal-keys@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/string-literal-keys@false.tsx @@ -1,11 +1,16 @@ -const $$splitErrorComponentImporter = () => import('string-literal-keys.tsx?tsr-split=errorComponent'); -const $$splitComponentImporter = () => import('string-literal-keys.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; -import { fetchPosts } from '../posts'; +const $$splitErrorComponentImporter = () => + import('string-literal-keys.tsx?tsr-split=errorComponent') +const $$splitComponentImporter = () => + import('string-literal-keys.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' +import { fetchPosts } from '../posts' export const Route = createFileRoute('/posts')({ loader: fetchPosts, - 'component': lazyRouteComponent($$splitComponentImporter, 'component'), - 'errorComponent': lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), + errorComponent: lazyRouteComponent( + $$splitErrorComponentImporter, + 'errorComponent', + ), +}) diff --git a/packages/router-plugin/tests/add-hmr/snapshots/react/string-literal-keys@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/react/string-literal-keys@true.tsx index b6f67e67b1..6d5b2a1fd3 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/react/string-literal-keys@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/react/string-literal-keys@true.tsx @@ -1,119 +1,130 @@ -const $$splitErrorComponentImporter = () => import('string-literal-keys.tsx?tsr-split=errorComponent'); -const $$splitComponentImporter = () => import('string-literal-keys.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; -import { fetchPosts } from '../posts'; +const $$splitErrorComponentImporter = () => + import('string-literal-keys.tsx?tsr-split=errorComponent') +const $$splitComponentImporter = () => + import('string-literal-keys.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' +import { fetchPosts } from '../posts' const TSRSplitComponent = (() => { - const hot = import.meta.hot; - const hotData = hot ? hot.data ??= {} : undefined; - return hotData?.["tsr-split-component:component"] ?? lazyRouteComponent($$splitComponentImporter, "component"); -})(); + const hot = import.meta.hot + const hotData = hot ? (hot.data ??= {}) : undefined + return ( + hotData?.['tsr-split-component:component'] ?? + lazyRouteComponent($$splitComponentImporter, 'component') + ) +})() if (import.meta.hot) { - (import.meta.hot.data ??= {})["tsr-split-component:component"] = TSRSplitComponent; + ;(import.meta.hot.data ??= {})['tsr-split-component:component'] = + TSRSplitComponent } const TSRSplitErrorComponent = (() => { - const hot = import.meta.hot; - const hotData = hot ? hot.data ??= {} : undefined; - return hotData?.["tsr-split-component:errorComponent"] ?? lazyRouteComponent($$splitErrorComponentImporter, "errorComponent"); -})(); + const hot = import.meta.hot + const hotData = hot ? (hot.data ??= {}) : undefined + return ( + hotData?.['tsr-split-component:errorComponent'] ?? + lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') + ) +})() if (import.meta.hot) { - (import.meta.hot.data ??= {})["tsr-split-component:errorComponent"] = TSRSplitErrorComponent; + ;(import.meta.hot.data ??= {})['tsr-split-component:errorComponent'] = + TSRSplitErrorComponent } export const Route = createFileRoute('/posts')({ loader: fetchPosts, - 'component': TSRSplitComponent, - 'errorComponent': TSRSplitErrorComponent -}); -const hot = import.meta.hot; -if (hot && typeof window !== 'undefined') { - hot.data ??= {}; - const tsrReactRefresh = window.__TSR_REACT_REFRESH__ ??= (() => { - const ignoredExportsById = new Map(); - const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports; - window.__getReactRefreshIgnoredExports = ctx => { - const ignoredExports = previousGetIgnoredExports?.(ctx) ?? []; - const moduleIgnored = ignoredExportsById.get(ctx.id) ?? []; - return [...ignoredExports, ...moduleIgnored]; - }; - return { - ignoredExportsById - }; - })(); - tsrReactRefresh.ignoredExportsById.set("string-literal-keys.tsx", ['Route']); + component: TSRSplitComponent, + errorComponent: TSRSplitErrorComponent, +}) +if (import.meta.hot && typeof window !== 'undefined') { + import.meta.hot.data ??= {} + const tsrReactRefresh = (window.__TSR_REACT_REFRESH__ ??= (() => { + const ignoredExportsById = new Map() + const previousGetIgnoredExports = window.__getReactRefreshIgnoredExports + window.__getReactRefreshIgnoredExports = (ctx) => { + const ignoredExports = previousGetIgnoredExports?.(ctx) ?? [] + const moduleIgnored = ignoredExportsById.get(ctx.id) ?? [] + return [...ignoredExports, ...moduleIgnored] + } + return { ignoredExportsById } + })()) + tsrReactRefresh.ignoredExportsById.set('string-literal-keys.tsx', ['Route']) } export function TSRFastRefreshAnchor() { - return null; + return null } if (import.meta.hot) { - const hot = import.meta.hot; - const hotData = hot.data ??= {}; + const hotData = (import.meta.hot.data ??= {}) const handleRouteUpdate = function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = ["component", "shellComponent", "pendingComponent", "errorComponent", "notFoundComponent"]; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [ + 'component', + 'shellComponent', + 'pendingComponent', + 'errorComponent', + 'notFoundComponent', + ] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - }; - const initialRouteId = Route.id ?? hotData['tsr-route-id']; + } + const initialRouteId = Route.id ?? hotData['tsr-route-id'] if (initialRouteId) { - hotData['tsr-route-id'] = initialRouteId; + hotData['tsr-route-id'] = initialRouteId } - const existingRoute = typeof window !== 'undefined' && initialRouteId ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] : undefined; + const existingRoute = + typeof window !== 'undefined' && initialRouteId + ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] + : undefined if (initialRouteId && existingRoute && existingRoute !== Route) { - handleRouteUpdate(initialRouteId, Route); - hotData['tsr-route-update-handled'] = Route; + handleRouteUpdate(initialRouteId, Route) + hotData['tsr-route-update-handled'] = Route } - hot.accept(newModule => { + import.meta.hot.accept((newModule) => { if (Route && newModule && newModule.Route) { - const routeId = hotData['tsr-route-id'] ?? Route.id; + const routeId = hotData['tsr-route-id'] ?? Route.id if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } if (hotData['tsr-route-update-handled'] === newModule.Route) { - delete hotData['tsr-route-update-handled']; - return; + delete hotData['tsr-route-update-handled'] + return } - handleRouteUpdate(routeId, newModule.Route); + handleRouteUpdate(routeId, newModule.Route) } - }); -} \ No newline at end of file + }) +} diff --git a/packages/router-plugin/tests/add-hmr/snapshots/solid/arrow-function@false.tsx b/packages/router-plugin/tests/add-hmr/snapshots/solid/arrow-function@false.tsx index b09548da57..10bedc87f0 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/solid/arrow-function@false.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/solid/arrow-function@false.tsx @@ -1,8 +1,9 @@ -const $$splitComponentImporter = () => import('arrow-function.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/solid-router'; -import { createFileRoute } from '@tanstack/solid-router'; -import { fetchPosts } from '../posts'; +const $$splitComponentImporter = () => + import('arrow-function.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/solid-router' +import { createFileRoute } from '@tanstack/solid-router' +import { fetchPosts } from '../posts' export const Route = createFileRoute('/posts')({ loader: fetchPosts, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/add-hmr/snapshots/solid/arrow-function@true.tsx b/packages/router-plugin/tests/add-hmr/snapshots/solid/arrow-function@true.tsx index 754da5c902..bc531f9000 100644 --- a/packages/router-plugin/tests/add-hmr/snapshots/solid/arrow-function@true.tsx +++ b/packages/router-plugin/tests/add-hmr/snapshots/solid/arrow-function@true.tsx @@ -1,80 +1,79 @@ -const $$splitComponentImporter = () => import('arrow-function.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/solid-router'; -import { createFileRoute } from '@tanstack/solid-router'; -import { fetchPosts } from '../posts'; +const $$splitComponentImporter = () => + import('arrow-function.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/solid-router' +import { createFileRoute } from '@tanstack/solid-router' +import { fetchPosts } from '../posts' export const Route = createFileRoute('/posts')({ loader: fetchPosts, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) if (import.meta.hot) { - const hot = import.meta.hot; - const hotData = hot.data ??= {}; + const hotData = (import.meta.hot.data ??= {}) const handleRouteUpdate = function handleRouteUpdate(routeId, newRoute) { - const router = window.__TSR_ROUTER__; - const oldRoute = router.routesById[routeId]; + const router = window.__TSR_ROUTER__ + const oldRoute = router.routesById[routeId] if (!oldRoute) { - return; + return } - ; - const generatedRouteOptionKeys = new Set(["id", "path", "getParentRoute"]); - const generatedRouteOptions = {}; - generatedRouteOptionKeys.forEach(key => { + const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute']) + const generatedRouteOptions = {} + generatedRouteOptionKeys.forEach((key) => { if (key in oldRoute.options) { - generatedRouteOptions[key] = oldRoute.options[key]; + generatedRouteOptions[key] = oldRoute.options[key] } - }); - const oldHasShellComponent = "shellComponent" in oldRoute.options; - const newHasShellComponent = "shellComponent" in newRoute.options; - const preserveComponentIdentity = oldHasShellComponent === newHasShellComponent; - const componentKeys = []; + }) + const oldHasShellComponent = 'shellComponent' in oldRoute.options + const newHasShellComponent = 'shellComponent' in newRoute.options + const preserveComponentIdentity = + oldHasShellComponent === newHasShellComponent + const componentKeys = [] if (preserveComponentIdentity) { - componentKeys.forEach(key => { + componentKeys.forEach((key) => { if (key in oldRoute.options && key in newRoute.options) { - newRoute.options[key] = oldRoute.options[key]; + newRoute.options[key] = oldRoute.options[key] } - }); + }) } - ; - const nextOptions = { - ...newRoute.options, - ...generatedRouteOptions - }; - oldRoute.options = nextOptions; - oldRoute.update(nextOptions); - router._replaceRouteChunk(oldRoute, newRoute.lazyFn); - router.setRoutes(router.buildRouteTree()); - syncHotRouteExport(oldRoute); - router.resolvePathCache.clear(); - void router._refreshRoute?.(); + const nextOptions = { ...newRoute.options, ...generatedRouteOptions } + oldRoute.options = nextOptions + oldRoute.update(nextOptions) + router._replaceRouteChunk(oldRoute, newRoute.lazyFn) + router.setRoutes(router.buildRouteTree()) + syncHotRouteExport(oldRoute) + router.resolvePathCache.clear() + void router._refreshRoute?.() function syncHotRouteExport(liveRoute) { - newRoute.options = liveRoute.options; - newRoute.parentRoute = liveRoute.parentRoute; - newRoute._path = liveRoute._path; - newRoute._id = liveRoute._id; - newRoute._fullPath = liveRoute._fullPath; - newRoute._to = liveRoute._to; + newRoute.options = liveRoute.options + newRoute.parentRoute = liveRoute.parentRoute + newRoute._path = liveRoute._path + newRoute._id = liveRoute._id + newRoute._fullPath = liveRoute._fullPath + newRoute._to = liveRoute._to } - }; - const initialRouteId = Route.id ?? hotData['tsr-route-id']; + } + const initialRouteId = Route.id ?? hotData['tsr-route-id'] if (initialRouteId) { - hotData['tsr-route-id'] = initialRouteId; + hotData['tsr-route-id'] = initialRouteId } - const existingRoute = typeof window !== 'undefined' && initialRouteId ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] : undefined; + const existingRoute = + typeof window !== 'undefined' && initialRouteId + ? window.__TSR_ROUTER__?.routesById?.[initialRouteId] + : undefined if (initialRouteId && existingRoute && existingRoute !== Route) { - handleRouteUpdate(initialRouteId, Route); - hotData['tsr-route-update-handled'] = Route; + handleRouteUpdate(initialRouteId, Route) + hotData['tsr-route-update-handled'] = Route } - hot.accept(newModule => { + import.meta.hot.accept((newModule) => { if (Route && newModule && newModule.Route) { - const routeId = hotData['tsr-route-id'] ?? Route.id; + const routeId = hotData['tsr-route-id'] ?? Route.id if (routeId) { - hotData['tsr-route-id'] = routeId; + hotData['tsr-route-id'] = routeId } if (hotData['tsr-route-update-handled'] === newModule.Route) { - delete hotData['tsr-route-update-handled']; - return; + delete hotData['tsr-route-update-handled'] + return } - handleRouteUpdate(routeId, newModule.Route); + handleRouteUpdate(routeId, newModule.Route) } - }); -} \ No newline at end of file + }) +} diff --git a/packages/router-plugin/tests/code-splitter-imports-exports.test.ts b/packages/router-plugin/tests/code-splitter-imports-exports.test.ts index b679782bdc..e7c7a504d3 100644 --- a/packages/router-plugin/tests/code-splitter-imports-exports.test.ts +++ b/packages/router-plugin/tests/code-splitter-imports-exports.test.ts @@ -1,6 +1,7 @@ import { transformWithOxc } from 'vite' import { describe, expect, it } from 'vitest' import { + buildAndRun, compileRouteModules, componentChunk, declarationOf, @@ -327,4 +328,32 @@ export const Route = createFileRoute('/')({ component: () =>
}) `).modules expect(reference).toMatch(/@observable\s+export class Store\b/) }) + + it('compiles a decorator after `export`', async () => { + // TypeScript accepts `export @dec class` with or without + // `experimentalDecorators`; the tsconfig makes Vite lower the decorator + // so the built app runs in Node. The route file is read and its + // component split. + const result = await buildAndRun( + `${head}function tag(value: any) { + value.label = 'decorated' + return value +} +export @tag class Store {} +export const Route = createFileRoute('/')({ + component: () =>

{(Store as any).label}

, +}) +`, + `const component = entry.Route.options.component +return [entry.Store.label, typeof component.preload, await entry.render(component)]`, + { + files: { + 'tsconfig.json': JSON.stringify({ + compilerOptions: { experimentalDecorators: true }, + }), + }, + }, + ) + expect(result).toEqual(['decorated', 'function', '

decorated

']) + }) }) diff --git a/packages/router-plugin/tests/code-splitter-plugin-pipeline.test.ts b/packages/router-plugin/tests/code-splitter-plugin-pipeline.test.ts index a0a0eeed67..dca96bfa28 100644 --- a/packages/router-plugin/tests/code-splitter-plugin-pipeline.test.ts +++ b/packages/router-plugin/tests/code-splitter-plugin-pipeline.test.ts @@ -10,6 +10,7 @@ import { } from './regression-helpers' import { getModuleErrors } from './validate-module' import type { Config } from '../src/core/config' +import type { HmrStyle } from '../src/core/hmr' const routeSource = (name: string) => ` import { createFileRoute } from '@tanstack/react-router' @@ -191,6 +192,7 @@ export const Route = createFileRoute('/unshared')({ describe('route HMR plugin without code splitting', () => { function transformWith( options: Partial & { target: 'solid' | 'vue' }, + hmrStyle?: HmrStyle, ) { const code = ` import { createFileRoute } from '@tanstack/${options.target}-router' @@ -198,10 +200,12 @@ export const Route = createFileRoute('/hmr')({ component: () =>

hmr

, }) ` - return transformWithRouteHmrPlugin(code, options, { - file: routeFile('hmr'), - routeId: '/hmr', - }) + return transformWithRouteHmrPlugin( + code, + options, + { file: routeFile('hmr'), routeId: '/hmr' }, + hmrStyle, + ) } it.each(['solid', 'vue'] as const)( @@ -217,10 +221,7 @@ export const Route = createFileRoute('/hmr')({ ) it('uses webpack HMR with the generated route id for non-React routes', async () => { - const output = transformWith({ - target: 'solid', - plugin: { hmr: { style: 'webpack' } }, - }) + const output = transformWith({ target: 'solid' }, 'webpack') expect(output).toContain('import.meta.webpackHot') expect(output).not.toContain('import.meta.hot.') expect(output).toContain('"/hmr"') diff --git a/packages/router-plugin/tests/code-splitter.test.ts b/packages/router-plugin/tests/code-splitter.test.ts index 967f102e4d..96807e4d42 100644 --- a/packages/router-plugin/tests/code-splitter.test.ts +++ b/packages/router-plugin/tests/code-splitter.test.ts @@ -22,6 +22,7 @@ import { createIdentifier } from '@tanstack/router-utils' import { defaultCodeSplitGroupings } from '../src/core/constants' import { getFrameworkHmrCompilerPlugins } from '../src/core/code-splitter/plugins/framework-plugins' import { frameworks } from './constants' +import { formatSnapshot } from './format-snapshot' import type { CodeSplitGroupings } from '../src/core/constants' function getFrameworkDir(framework: string) { @@ -87,7 +88,9 @@ describe('code-splitter works', () => { sharedBindings.size > 0 ? sharedBindings : undefined, }) - await expect(compileResult?.code || code).toMatchFileSnapshot( + await expect( + await formatSnapshot(compileResult?.code || code, filename), + ).toMatchFileSnapshot( path.join(dirs.snapshots, groupName, filename), ) }, @@ -120,9 +123,9 @@ describe('code-splitter works', () => { groupName, `${filename.replace('.tsx', '')}@${ident}.tsx`, ) - await expect(splitResult.code).toMatchFileSnapshot( - snapshotFilename, - ) + await expect( + await formatSnapshot(splitResult.code, filename), + ).toMatchFileSnapshot(snapshotFilename) } }, ) @@ -156,9 +159,9 @@ describe('code-splitter works', () => { filename: `${filename}?tsr-shared=1`, }) - await expect(sharedResult.code).toMatchFileSnapshot( - snapshotFilename, - ) + await expect( + await formatSnapshot(sharedResult.code, filename), + ).toMatchFileSnapshot(snapshotFilename) }, ) }, diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/arrow-function.tsx index 48e3768224..994c89e7b2 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/arrow-function.tsx @@ -1,9 +1,10 @@ -const $$splitComponentImporter = () => import('arrow-function.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; -import { fetchPosts } from '../posts'; +const $$splitComponentImporter = () => + import('arrow-function.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' +import { fetchPosts } from '../posts' export const Route = createFileRoute('/posts')({ loader: fetchPosts, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/arrow-function@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/arrow-function@component.tsx index 7fe3edee11..e36e48f495 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/arrow-function@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/arrow-function@component.tsx @@ -1,27 +1,31 @@ -import * as React from 'react'; -import { Link, Outlet } from '@tanstack/react-router'; -import { Route } from "arrow-function.tsx"; +import * as React from 'react' +import { Link, Outlet } from '@tanstack/react-router' +import { Route } from 'arrow-function.tsx' const PostsComponent = () => { - const posts = Route.useLoaderData(); - return
+ const posts = Route.useLoaderData() + return ( +
    - {[...posts, { - id: 'i-do-not-exist', - title: 'Non-existent Post' - }]?.map(post => { - return
  • - + {[...posts, { id: 'i-do-not-exist', title: 'Non-existent Post' }]?.map( + (post) => { + return ( +
  • +
    {post.title.substring(0, 20)}
    -
  • ; - })} + + ) + }, + )}

-
; -}; -export { PostsComponent as component }; \ No newline at end of file +
+ ) +} +export { PostsComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/arrow-function@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/arrow-function@errorComponent.tsx index 5f67a6fff1..371dc65868 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/arrow-function@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/arrow-function@errorComponent.tsx @@ -1 +1 @@ -import * as React from 'react'; \ No newline at end of file +import * as React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/arrow-function@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/arrow-function@notFoundComponent.tsx index 5f67a6fff1..371dc65868 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/arrow-function@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/arrow-function@notFoundComponent.tsx @@ -1 +1 @@ -import * as React from 'react'; \ No newline at end of file +import * as React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/boolean-null-literals.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/boolean-null-literals.tsx index 771fd14f8b..5544bb15d4 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/boolean-null-literals.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/boolean-null-literals.tsx @@ -1,13 +1,11 @@ -const $$splitComponentImporter = () => import('boolean-null-literals.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/router'; - +const $$splitComponentImporter = () => + import('boolean-null-literals.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/router' // Test errorComponent with false literal export const Route = createFileRoute('/test')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), errorComponent: false, pendingComponent: null, - loader: async () => ({ - data: 'test' - }) -}); \ No newline at end of file + loader: async () => ({ data: 'test' }), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/boolean-null-literals@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/boolean-null-literals@component.tsx index c49c9e93a3..557105b6a3 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/boolean-null-literals@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/boolean-null-literals@component.tsx @@ -1,3 +1,3 @@ // Test errorComponent with false literal -const SplitComponent = () =>
Test Component
; -export { SplitComponent as component }; \ No newline at end of file +const SplitComponent = () =>
Test Component
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/chinese.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/chinese.tsx index 2ffcfaa9a2..35a6bda2b1 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/chinese.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/chinese.tsx @@ -1,10 +1,10 @@ -const $$splitComponentImporter = () => import('chinese.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => import('chinese.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) interface DemoProps { - title: string; -} \ No newline at end of file + title: string +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/chinese@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/chinese@component.tsx index 003ca944a1..2ac1fa54ff 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/chinese@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/chinese@component.tsx @@ -1,23 +1,27 @@ -import * as React from 'react'; +import * as React from 'react' function HomeComponent() { - return
+ return ( +
-
; +
+ ) } interface DemoProps { - title: string; + title: string } -function Demo({ - title -}: DemoProps) { - return

+function Demo({ title }: DemoProps) { + return ( +

{title} -

; + + ) } -export { HomeComponent as component }; \ No newline at end of file +export { HomeComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/chinese@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/chinese@errorComponent.tsx index b4de370f4e..cbcea8cc40 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/chinese@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/chinese@errorComponent.tsx @@ -1,4 +1,4 @@ -import * as React from 'react'; +import * as React from 'react' interface DemoProps { - title: string; -} \ No newline at end of file + title: string +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/chinese@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/chinese@notFoundComponent.tsx index b4de370f4e..cbcea8cc40 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/chinese@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/chinese@notFoundComponent.tsx @@ -1,4 +1,4 @@ -import * as React from 'react'; +import * as React from 'react' interface DemoProps { - title: string; -} \ No newline at end of file + title: string +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/circular-reference-arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/circular-reference-arrow-function.tsx index 6ec23e8d1c..d367391005 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/circular-reference-arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/circular-reference-arrow-function.tsx @@ -1,6 +1,7 @@ -const $$splitComponentImporter = () => import('circular-reference-arrow-function.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('circular-reference-arrow-function.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/circular-reference-arrow-function@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/circular-reference-arrow-function@component.tsx index 39ace71ebe..59c5b5eec2 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/circular-reference-arrow-function@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/circular-reference-arrow-function@component.tsx @@ -1,19 +1,17 @@ function getComponentName(obj: Record): string { - return Object.keys(obj)[0]; + return Object.keys(obj)[0] } const App = () => { - const componentName = getComponentName({ - App - }); - return
+ const componentName = getComponentName({ App }) + return ( +
Component Name is {componentName} -
; -}; -function OtherComponent() { - const componentName = getComponentName({ - App - }); - return
App component name is {componentName}
; +
+ ) } -export { App as component }; \ No newline at end of file +function OtherComponent() { + const componentName = getComponentName({ App }) + return
App component name is {componentName}
+} +export { App as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/circular-reference-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/circular-reference-function.tsx index 202ef21eb3..f2e0c96476 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/circular-reference-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/circular-reference-function.tsx @@ -1,6 +1,7 @@ -const $$splitComponentImporter = () => import('circular-reference-function.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('circular-reference-function.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/circular-reference-function@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/circular-reference-function@component.tsx index 96a753ad8a..22fbb8669f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/circular-reference-function@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/circular-reference-function@component.tsx @@ -1,19 +1,17 @@ function getComponentName(obj: Record): string { - return Object.keys(obj)[0]; + return Object.keys(obj)[0] } function App() { - const componentName = getComponentName({ - App - }); - return
+ const componentName = getComponentName({ App }) + return ( +
Component Name is {componentName} -
; +
+ ) } function OtherComponent() { - const componentName = getComponentName({ - App - }); - return
App component name is {componentName}
; + const componentName = getComponentName({ App }) + return
App component name is {componentName}
} -export { App as component }; \ No newline at end of file +export { App as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/conditional-properties.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/conditional-properties.tsx index 70385cd749..927bb2e738 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/conditional-properties.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/conditional-properties.tsx @@ -1,10 +1,11 @@ -const $$splitComponentImporter = () => import('conditional-properties.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -import { isEnabled } from '@features/feature-flags'; -import TrueImport from '@modules/true-component'; -import { falseLoader } from '@modules/false-component'; +const $$splitComponentImporter = () => + import('conditional-properties.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +import { isEnabled } from '@features/feature-flags' +import TrueImport from '@modules/true-component' +import { falseLoader } from '@modules/false-component' export const Route = createFileRoute('/posts')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: isEnabled ? TrueImport.loader : falseLoader -}); \ No newline at end of file + loader: isEnabled ? TrueImport.loader : falseLoader, +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/conditional-properties@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/conditional-properties@component.tsx index aaf3410c69..e460c54467 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/conditional-properties@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/conditional-properties@component.tsx @@ -1,5 +1,5 @@ -import { isEnabled } from '@features/feature-flags'; -import TrueImport from '@modules/true-component'; -import { FalseComponent } from '@modules/false-component'; -const SplitComponent = isEnabled ? TrueImport.Component : FalseComponent; -export { SplitComponent as component }; \ No newline at end of file +import { isEnabled } from '@features/feature-flags' +import TrueImport from '@modules/true-component' +import { FalseComponent } from '@modules/false-component' +const SplitComponent = isEnabled ? TrueImport.Component : FalseComponent +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export-multiple.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export-multiple.tsx index dcf67bfcb4..31c6033aae 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export-multiple.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export-multiple.tsx @@ -1,15 +1,13 @@ -const $$splitComponentImporter = () => import('destructured-export-multiple.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('destructured-export-multiple.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const getConfig = () => ({ baseUrl: 'https://api.example.com', - timeout: 5000 -}); -export const { - baseUrl, - timeout -} = getConfig(); -export const [first, second] = [1, 2]; + timeout: 5000, +}) +export const { baseUrl, timeout } = getConfig() +export const [first, second] = [1, 2] export const Route = createFileRoute('/about')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export-multiple@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export-multiple@component.tsx index 9441b5a689..6a15a59c0a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export-multiple@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export-multiple@component.tsx @@ -1,8 +1,10 @@ -import { baseUrl, timeout } from "destructured-export-multiple.tsx"; +import { baseUrl, timeout } from 'destructured-export-multiple.tsx' function AboutComponent() { - return
+ return ( +

Base URL: {baseUrl}

Timeout: {timeout}

-
; +
+ ) } -export { AboutComponent as component }; \ No newline at end of file +export { AboutComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export-nested.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export-nested.tsx index 6793123b2f..5022580478 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export-nested.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export-nested.tsx @@ -1,19 +1,16 @@ -const $$splitComponentImporter = () => import('destructured-export-nested.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('destructured-export-nested.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' const getConfig = () => ({ - api: { - baseUrl: 'https://api.example.com' - }, + api: { baseUrl: 'https://api.example.com' }, timeout: 5000, - extra: 'data' -}); + extra: 'data', +}) export const { - api: { - baseUrl - }, + api: { baseUrl }, ...rest -} = getConfig(); +} = getConfig() export const Route = createFileRoute('/about')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export-nested@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export-nested@component.tsx index 8ba46e33e1..9bc538525f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export-nested@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export-nested@component.tsx @@ -1,7 +1,9 @@ -import { baseUrl } from "destructured-export-nested.tsx"; +import { baseUrl } from 'destructured-export-nested.tsx' function AboutComponent() { - return
+ return ( +

Base URL: {baseUrl}

-
; +
+ ) } -export { AboutComponent as component }; \ No newline at end of file +export { AboutComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export.tsx index 31b1bfbe8b..282110d045 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export.tsx @@ -1,17 +1,11 @@ -const $$splitComponentImporter = () => import('destructured-export.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('destructured-export.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export function getObjectCallback() { - return { - getObject: () => ({ - constA: 10, - constB: 5 - }) - }; + return { getObject: () => ({ constA: 10, constB: 5 }) } } -export const { - getObject -} = getObjectCallback(); +export const { getObject } = getObjectCallback() export const Route = createFileRoute('/about')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export@component.tsx index f58942d5af..b0abbd2e6e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export@component.tsx @@ -1,14 +1,11 @@ export function getObjectCallback() { - return { - getObject: () => ({ - constA: 10, - constB: 5 - }) - }; + return { getObject: () => ({ constA: 10, constB: 5 }) } } function AboutComponent() { - return
+ return ( +

About

-
; +
+ ) } -export { AboutComponent as component }; \ No newline at end of file +export { AboutComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export@errorComponent.tsx index 45fb19eecd..024e0e620e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export@errorComponent.tsx @@ -1,8 +1,3 @@ export function getObjectCallback() { - return { - getObject: () => ({ - constA: 10, - constB: 5 - }) - }; -} \ No newline at end of file + return { getObject: () => ({ constA: 10, constB: 5 }) } +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export@notFoundComponent.tsx index 45fb19eecd..024e0e620e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-export@notFoundComponent.tsx @@ -1,8 +1,3 @@ export function getObjectCallback() { - return { - getObject: () => ({ - constA: 10, - constB: 5 - }) - }; -} \ No newline at end of file + return { getObject: () => ({ constA: 10, constB: 5 }) } +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-react-memo-imported-component.tsx index ee2af1cf9b..9ae1904cf4 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-react-memo-imported-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-react-memo-imported-component.tsx @@ -1,8 +1,9 @@ -const $$splitComponentImporter = () => import('destructured-react-memo-imported-component.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -import { importedLoader } from '../../shared/imported'; +const $$splitComponentImporter = () => + import('destructured-react-memo-imported-component.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +import { importedLoader } from '../../shared/imported' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: importedLoader -}); \ No newline at end of file + loader: importedLoader, +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-react-memo-imported-component@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-react-memo-imported-component@component.tsx index 446d55e26b..88dcdf6e48 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-react-memo-imported-component@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-react-memo-imported-component@component.tsx @@ -1,6 +1,6 @@ -import { memo } from 'react'; +import { memo } from 'react' function Component() { - return
Component
; + return
Component
} -const SplitComponent = memo(Component); -export { SplitComponent as component }; \ No newline at end of file +const SplitComponent = memo(Component) +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-route-options-defaults.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-route-options-defaults.tsx index 7c54a2c145..c789ea861e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-route-options-defaults.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-route-options-defaults.tsx @@ -1,8 +1,9 @@ -import { loader } from "destructured-route-options-defaults.tsx?tsr-shared=1"; -const $$splitComponentImporter = () => import('destructured-route-options-defaults.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +import { loader } from 'destructured-route-options-defaults.tsx?tsr-shared=1' +const $$splitComponentImporter = () => + import('destructured-route-options-defaults.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/about')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader -}); \ No newline at end of file + loader, +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-route-options-defaults@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-route-options-defaults@component.tsx index c73696ff32..c26d6be33d 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-route-options-defaults@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-route-options-defaults@component.tsx @@ -1,2 +1,2 @@ -import { MyComponent } from "destructured-route-options-defaults.tsx?tsr-shared=1"; -export { MyComponent as component }; \ No newline at end of file +import { MyComponent } from 'destructured-route-options-defaults.tsx?tsr-shared=1' +export { MyComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-route-options-defaults@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-route-options-defaults@shared.tsx index fdc9acef5b..a7dee6af52 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-route-options-defaults@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructured-route-options-defaults@shared.tsx @@ -1,22 +1,23 @@ function defaultLoader() { - return { - message: 'default' - }; + return { message: 'default' } } function DefaultComponent() { - return
Default
; + return
Default
} const createBits = () => ({ component: ActualComponent, - loader: () => ({ - message: 'hello' - }) -}); -const { - component: MyComponent = DefaultComponent, - loader = defaultLoader -} = createBits(); + loader: () => ({ message: 'hello' }), +}) +const { component: MyComponent = DefaultComponent, loader = defaultLoader } = + createBits() function ActualComponent() { - return
About
; + return
About
+} +export { + ActualComponent, + createBits, + DefaultComponent, + defaultLoader, + loader, + MyComponent, } -export { ActualComponent, createBits, DefaultComponent, defaultLoader, loader, MyComponent }; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructuring.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructuring.tsx index d80f17484f..112fded569 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructuring.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructuring.tsx @@ -1,11 +1,9 @@ import thing from 'thing' - export function test() { const { foo: { bar: { destructured }, }, } = thing - return destructured } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructuring@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructuring@component.tsx index 858c5c0e05..112fded569 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructuring@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructuring@component.tsx @@ -1,11 +1,9 @@ -import thing from 'thing'; +import thing from 'thing' export function test() { const { foo: { - bar: { - destructured - } - } - } = thing; - return destructured; -} \ No newline at end of file + bar: { destructured }, + }, + } = thing + return destructured +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructuring@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructuring@errorComponent.tsx index 858c5c0e05..112fded569 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructuring@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructuring@errorComponent.tsx @@ -1,11 +1,9 @@ -import thing from 'thing'; +import thing from 'thing' export function test() { const { foo: { - bar: { - destructured - } - } - } = thing; - return destructured; -} \ No newline at end of file + bar: { destructured }, + }, + } = thing + return destructured +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructuring@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructuring@notFoundComponent.tsx index 858c5c0e05..112fded569 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructuring@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/destructuring@notFoundComponent.tsx @@ -1,11 +1,9 @@ -import thing from 'thing'; +import thing from 'thing' export function test() { const { foo: { - bar: { - destructured - } - } - } = thing; - return destructured; -} \ No newline at end of file + bar: { destructured }, + }, + } = thing + return destructured +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/directive-prologue.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/directive-prologue.tsx index 68f8be0364..5a116073c1 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/directive-prologue.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/directive-prologue.tsx @@ -1,8 +1,8 @@ -'use client'; - -const $$splitComponentImporter = () => import('directive-prologue.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +'use client' +const $$splitComponentImporter = () => + import('directive-prologue.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/directive')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/directive-prologue@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/directive-prologue@component.tsx index ce7cd5e5ee..9ee4bd8f4c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/directive-prologue@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/directive-prologue@component.tsx @@ -1,6 +1,5 @@ -'use client'; - +'use client' const SplitComponent = () => { - return
directive preserved
; -}; -export { SplitComponent as component }; \ No newline at end of file + return
directive preserved
+} +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/explicit-undefined-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/explicit-undefined-component.tsx index 4fdd9d1c68..8109a89624 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/explicit-undefined-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/explicit-undefined-component.tsx @@ -1,6 +1,3 @@ import React from 'react' import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/')({ - component: undefined, -}) +export const Route = createFileRoute('/')({ component: undefined }) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/explicit-undefined-component@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/explicit-undefined-component@component.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/explicit-undefined-component@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/explicit-undefined-component@component.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/explicit-undefined-component@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/explicit-undefined-component@errorComponent.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/explicit-undefined-component@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/explicit-undefined-component@errorComponent.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/explicit-undefined-component@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/explicit-undefined-component@notFoundComponent.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/explicit-undefined-component@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/explicit-undefined-component@notFoundComponent.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component-and-normal-notFound.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component-and-normal-notFound.tsx index da4daa9a3f..7154b79acd 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component-and-normal-notFound.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component-and-normal-notFound.tsx @@ -1,15 +1,23 @@ -console.warn("[tanstack-router] These exports from \"export-default-component-and-normal-notFound.tsx\" will not be code-split and will increase your bundle size:\n- Home\nFor the best optimization, these items should either have their export statements removed, or be imported from another location that is not a route file."); -const $$splitNotFoundComponentImporter = () => import('export-default-component-and-normal-notFound.tsx?tsr-split=notFoundComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import React, { useState } from 'react'; -import { createFileRoute } from '@tanstack/react-router'; +console.warn( + '[tanstack-router] These exports from "export-default-component-and-normal-notFound.tsx" will not be code-split and will increase your bundle size:\n- Home\nFor the best optimization, these items should either have their export statements removed, or be imported from another location that is not a route file.', +) +const $$splitNotFoundComponentImporter = () => + import('export-default-component-and-normal-notFound.tsx?tsr-split=notFoundComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import React, { useState } from 'react' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/home')({ component: Home, - notFoundComponent: lazyRouteComponent($$splitNotFoundComponentImporter, 'notFoundComponent') -}); + notFoundComponent: lazyRouteComponent( + $$splitNotFoundComponentImporter, + 'notFoundComponent', + ), +}) export default function Home() { - const [one, setOne] = useState('this is from a state'); - return
+ const [one, setOne] = useState('this is from a state') + return ( +

{one}

-
; -} \ No newline at end of file +
+ ) +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component-and-normal-notFound@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component-and-normal-notFound@component.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component-and-normal-notFound@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component-and-normal-notFound@component.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component-and-normal-notFound@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component-and-normal-notFound@errorComponent.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component-and-normal-notFound@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component-and-normal-notFound@errorComponent.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component-and-normal-notFound@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component-and-normal-notFound@notFoundComponent.tsx index 62cd0a1036..3da924c04c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component-and-normal-notFound@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component-and-normal-notFound@notFoundComponent.tsx @@ -1,5 +1,5 @@ -import React from 'react'; +import React from 'react' function NotFoundComponent() { - return
Not Found
; + return
Not Found
} -export { NotFoundComponent as notFoundComponent }; \ No newline at end of file +export { NotFoundComponent as notFoundComponent } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component.tsx index c5198b9e00..de2d748c91 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component.tsx @@ -1,13 +1,8 @@ import React, { useState } from 'react' import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/home')({ - component: Home, -}) - +export const Route = createFileRoute('/home')({ component: Home }) export default function Home() { const [one, setOne] = useState('this is from a state') - return (

{one}

diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component@component.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component@component.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component@errorComponent.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component@errorComponent.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component@notFoundComponent.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/export-default-component@notFoundComponent.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-as-parameter.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-as-parameter.tsx index 3ae9710cd5..817b89d69a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-as-parameter.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-as-parameter.tsx @@ -1,29 +1,20 @@ import * as React from 'react' // @ts-expect-error import { useMemo } from 'tan-react' - const useUsedVar = 'i-am-unused' - const ReactUseMemoCall1 = React.useMemo(function performAction() { return 'true' }, []) - console.info(ReactUseMemoCall1) - const ReactUseMemoCall2 = React.useMemo(() => { return 'true' }, []) - console.info(ReactUseMemoCall2) - const UseMemoCall1 = useMemo(function performAction() { return 'true' }, []) - console.info(UseMemoCall1) - const UseMemoCall2 = useMemo(() => { return 'true' }, []) - console.info(UseMemoCall2) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-as-parameter@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-as-parameter@component.tsx index 23e2cd0f03..817b89d69a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-as-parameter@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-as-parameter@component.tsx @@ -1,20 +1,20 @@ -import * as React from 'react'; +import * as React from 'react' // @ts-expect-error -import { useMemo } from 'tan-react'; -const useUsedVar = 'i-am-unused'; +import { useMemo } from 'tan-react' +const useUsedVar = 'i-am-unused' const ReactUseMemoCall1 = React.useMemo(function performAction() { - return 'true'; -}, []); -console.info(ReactUseMemoCall1); + return 'true' +}, []) +console.info(ReactUseMemoCall1) const ReactUseMemoCall2 = React.useMemo(() => { - return 'true'; -}, []); -console.info(ReactUseMemoCall2); + return 'true' +}, []) +console.info(ReactUseMemoCall2) const UseMemoCall1 = useMemo(function performAction() { - return 'true'; -}, []); -console.info(UseMemoCall1); + return 'true' +}, []) +console.info(UseMemoCall1) const UseMemoCall2 = useMemo(() => { - return 'true'; -}, []); -console.info(UseMemoCall2); \ No newline at end of file + return 'true' +}, []) +console.info(UseMemoCall2) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-as-parameter@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-as-parameter@errorComponent.tsx index 23e2cd0f03..817b89d69a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-as-parameter@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-as-parameter@errorComponent.tsx @@ -1,20 +1,20 @@ -import * as React from 'react'; +import * as React from 'react' // @ts-expect-error -import { useMemo } from 'tan-react'; -const useUsedVar = 'i-am-unused'; +import { useMemo } from 'tan-react' +const useUsedVar = 'i-am-unused' const ReactUseMemoCall1 = React.useMemo(function performAction() { - return 'true'; -}, []); -console.info(ReactUseMemoCall1); + return 'true' +}, []) +console.info(ReactUseMemoCall1) const ReactUseMemoCall2 = React.useMemo(() => { - return 'true'; -}, []); -console.info(ReactUseMemoCall2); + return 'true' +}, []) +console.info(ReactUseMemoCall2) const UseMemoCall1 = useMemo(function performAction() { - return 'true'; -}, []); -console.info(UseMemoCall1); + return 'true' +}, []) +console.info(UseMemoCall1) const UseMemoCall2 = useMemo(() => { - return 'true'; -}, []); -console.info(UseMemoCall2); \ No newline at end of file + return 'true' +}, []) +console.info(UseMemoCall2) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-as-parameter@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-as-parameter@notFoundComponent.tsx index 23e2cd0f03..817b89d69a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-as-parameter@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-as-parameter@notFoundComponent.tsx @@ -1,20 +1,20 @@ -import * as React from 'react'; +import * as React from 'react' // @ts-expect-error -import { useMemo } from 'tan-react'; -const useUsedVar = 'i-am-unused'; +import { useMemo } from 'tan-react' +const useUsedVar = 'i-am-unused' const ReactUseMemoCall1 = React.useMemo(function performAction() { - return 'true'; -}, []); -console.info(ReactUseMemoCall1); + return 'true' +}, []) +console.info(ReactUseMemoCall1) const ReactUseMemoCall2 = React.useMemo(() => { - return 'true'; -}, []); -console.info(ReactUseMemoCall2); + return 'true' +}, []) +console.info(ReactUseMemoCall2) const UseMemoCall1 = useMemo(function performAction() { - return 'true'; -}, []); -console.info(UseMemoCall1); + return 'true' +}, []) +console.info(UseMemoCall1) const UseMemoCall2 = useMemo(() => { - return 'true'; -}, []); -console.info(UseMemoCall2); \ No newline at end of file + return 'true' +}, []) +console.info(UseMemoCall2) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-declaration.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-declaration.tsx index 5d7e2181f5..e2b672f7b8 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-declaration.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-declaration.tsx @@ -1,9 +1,10 @@ -const $$splitComponentImporter = () => import('function-declaration.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; -import { fetchPosts } from '../posts'; +const $$splitComponentImporter = () => + import('function-declaration.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' +import { fetchPosts } from '../posts' export const Route = createFileRoute('/posts')({ loader: fetchPosts, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-declaration@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-declaration@component.tsx index 3476c52d54..a0ebf07dee 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-declaration@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-declaration@component.tsx @@ -1,27 +1,31 @@ -import * as React from 'react'; -import { Link, Outlet } from '@tanstack/react-router'; -import { Route } from "function-declaration.tsx"; +import * as React from 'react' +import { Link, Outlet } from '@tanstack/react-router' +import { Route } from 'function-declaration.tsx' function PostsComponent() { - const posts = Route.useLoaderData(); - return
+ const posts = Route.useLoaderData() + return ( +
    - {[...posts, { - id: 'i-do-not-exist', - title: 'Non-existent Post' - }]?.map(post => { - return
  • - + {[...posts, { id: 'i-do-not-exist', title: 'Non-existent Post' }]?.map( + (post) => { + return ( +
  • +
    {post.title.substring(0, 20)}
    -
  • ; - })} + + ) + }, + )}

-
; +
+ ) } -export { PostsComponent as component }; \ No newline at end of file +export { PostsComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-declaration@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-declaration@errorComponent.tsx index 5f67a6fff1..371dc65868 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-declaration@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-declaration@errorComponent.tsx @@ -1 +1 @@ -import * as React from 'react'; \ No newline at end of file +import * as React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-declaration@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-declaration@notFoundComponent.tsx index 5f67a6fff1..371dc65868 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-declaration@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/function-declaration@notFoundComponent.tsx @@ -1 +1 @@ -import * as React from 'react'; \ No newline at end of file +import * as React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/importAttribute.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/importAttribute.tsx index df71217488..82d7bb0cad 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/importAttribute.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/importAttribute.tsx @@ -1,6 +1,7 @@ -const $$splitComponentImporter = () => import('importAttribute.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('importAttribute.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/importAttribute@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/importAttribute@component.tsx index f34d3c6408..88abef0c00 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/importAttribute@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/importAttribute@component.tsx @@ -1,3 +1,3 @@ -import { test } from './test' with { type: 'macro' }; -const SplitComponent = () => test; -export { SplitComponent as component }; \ No newline at end of file +import { test } from './test' with { type: 'macro' } +const SplitComponent = () => test +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-default-component-destructured-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-default-component-destructured-loader.tsx index 2271ab4454..4818827c9c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-default-component-destructured-loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-default-component-destructured-loader.tsx @@ -1,8 +1,9 @@ -const $$splitComponentImporter = () => import('imported-default-component-destructured-loader.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -import { importedLoader } from '../../shared/imported'; +const $$splitComponentImporter = () => + import('imported-default-component-destructured-loader.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +import { importedLoader } from '../../shared/imported' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: importedLoader -}); \ No newline at end of file + loader: importedLoader, +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-default-component-destructured-loader@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-default-component-destructured-loader@component.tsx index d21b198c98..9350cda9e8 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-default-component-destructured-loader@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-default-component-destructured-loader@component.tsx @@ -1,3 +1,3 @@ -import importedComponent from '../../shared/imported'; -const SplitComponent = importedComponent; -export { SplitComponent as component }; \ No newline at end of file +import importedComponent from '../../shared/imported' +const SplitComponent = importedComponent +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-default-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-default-component.tsx index dcd6f3d5e0..d213c7c5af 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-default-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-default-component.tsx @@ -1,6 +1,7 @@ -const $$splitComponentImporter = () => import('imported-default-component.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('imported-default-component.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-default-component@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-default-component@component.tsx index 31ccf07c52..d356227040 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-default-component@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-default-component@component.tsx @@ -1,3 +1,3 @@ -import ImportedDefaultComponent from '../../shared/imported'; -const SplitComponent = ImportedDefaultComponent; -export { SplitComponent as component }; \ No newline at end of file +import ImportedDefaultComponent from '../../shared/imported' +const SplitComponent = ImportedDefaultComponent +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-errorComponent.tsx index 898e1b3618..e3702ed63b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-errorComponent.tsx @@ -1,8 +1,13 @@ -const $$splitErrorComponentImporter = () => import('imported-errorComponent.tsx?tsr-split=errorComponent'); -const $$splitComponentImporter = () => import('imported-errorComponent.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitErrorComponentImporter = () => + import('imported-errorComponent.tsx?tsr-split=errorComponent') +const $$splitComponentImporter = () => + import('imported-errorComponent.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') -}); \ No newline at end of file + errorComponent: lazyRouteComponent( + $$splitErrorComponentImporter, + 'errorComponent', + ), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-errorComponent@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-errorComponent@component.tsx index 31ccf07c52..d356227040 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-errorComponent@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-errorComponent@component.tsx @@ -1,3 +1,3 @@ -import ImportedDefaultComponent from '../../shared/imported'; -const SplitComponent = ImportedDefaultComponent; -export { SplitComponent as component }; \ No newline at end of file +import ImportedDefaultComponent from '../../shared/imported' +const SplitComponent = ImportedDefaultComponent +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-errorComponent@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-errorComponent@errorComponent.tsx index 7a8654fb94..3f20c3e485 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-errorComponent@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-errorComponent@errorComponent.tsx @@ -1,3 +1,3 @@ -import { importedErrorComponent } from '../../shared/imported'; -const SplitErrorComponent = importedErrorComponent; -export { SplitErrorComponent as errorComponent }; \ No newline at end of file +import { importedErrorComponent } from '../../shared/imported' +const SplitErrorComponent = importedErrorComponent +export { SplitErrorComponent as errorComponent } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-notFoundComponent.tsx index 4c5c19cfcf..0a203d3cf9 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-notFoundComponent.tsx @@ -1,8 +1,13 @@ -const $$splitNotFoundComponentImporter = () => import('imported-notFoundComponent.tsx?tsr-split=notFoundComponent'); -const $$splitComponentImporter = () => import('imported-notFoundComponent.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitNotFoundComponentImporter = () => + import('imported-notFoundComponent.tsx?tsr-split=notFoundComponent') +const $$splitComponentImporter = () => + import('imported-notFoundComponent.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - notFoundComponent: lazyRouteComponent($$splitNotFoundComponentImporter, 'notFoundComponent') -}); \ No newline at end of file + notFoundComponent: lazyRouteComponent( + $$splitNotFoundComponentImporter, + 'notFoundComponent', + ), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-notFoundComponent@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-notFoundComponent@component.tsx index 31ccf07c52..d356227040 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-notFoundComponent@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-notFoundComponent@component.tsx @@ -1,3 +1,3 @@ -import ImportedDefaultComponent from '../../shared/imported'; -const SplitComponent = ImportedDefaultComponent; -export { SplitComponent as component }; \ No newline at end of file +import ImportedDefaultComponent from '../../shared/imported' +const SplitComponent = ImportedDefaultComponent +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-notFoundComponent@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-notFoundComponent@notFoundComponent.tsx index c6cfd9797f..bfe9d4e1c9 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-notFoundComponent@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-notFoundComponent@notFoundComponent.tsx @@ -1,3 +1,3 @@ -import { importedNotFoundComponent } from '../../shared/imported'; -const SplitNotFoundComponent = importedNotFoundComponent; -export { SplitNotFoundComponent as notFoundComponent }; \ No newline at end of file +import { importedNotFoundComponent } from '../../shared/imported' +const SplitNotFoundComponent = importedNotFoundComponent +export { SplitNotFoundComponent as notFoundComponent } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-pendingComponent.tsx index 17adf19f06..751e1c9a50 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-pendingComponent.tsx @@ -1,8 +1,9 @@ -const $$splitComponentImporter = () => import('imported-pendingComponent.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -import { importedPendingComponent } from '../../shared/imported'; +const $$splitComponentImporter = () => + import('imported-pendingComponent.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +import { importedPendingComponent } from '../../shared/imported' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - pendingComponent: importedPendingComponent -}); \ No newline at end of file + pendingComponent: importedPendingComponent, +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-pendingComponent@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-pendingComponent@component.tsx index 31ccf07c52..d356227040 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-pendingComponent@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported-pendingComponent@component.tsx @@ -1,3 +1,3 @@ -import ImportedDefaultComponent from '../../shared/imported'; -const SplitComponent = ImportedDefaultComponent; -export { SplitComponent as component }; \ No newline at end of file +import ImportedDefaultComponent from '../../shared/imported' +const SplitComponent = ImportedDefaultComponent +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported.tsx index e92f76cf98..6ead4fbb5e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported.tsx @@ -1,8 +1,9 @@ -const $$splitComponentImporter = () => import('imported.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -import { importedLoader } from '../../shared'; +const $$splitComponentImporter = () => + import('imported.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +import { importedLoader } from '../../shared' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: importedLoader -}); \ No newline at end of file + loader: importedLoader, +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported@component.tsx index 5bc9da8d43..e3c06dbe9e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/imported@component.tsx @@ -1,3 +1,3 @@ -import { importedComponent } from '../../shared'; -const SplitComponent = importedComponent; -export { SplitComponent as component }; \ No newline at end of file +import { importedComponent } from '../../shared' +const SplitComponent = importedComponent +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/inline.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/inline.tsx index c2b4dae416..7b39974d3a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/inline.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/inline.tsx @@ -1,9 +1,9 @@ -const $$splitComponentImporter = () => import('inline.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => import('inline.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); -Route.addChildren([]); -export const test = 'test'; \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) +Route.addChildren([]) +export const test = 'test' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/inline@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/inline@component.tsx index 58ccfb2903..d28b872634 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/inline@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/inline@component.tsx @@ -1,18 +1,18 @@ -import * as React from 'react'; -import * as styles from '../style.css'; -import { TEST_DATA } from '../test.const'; -const Button = (props: { - children: any; -}) => { - return ; -}; -import { Route } from "inline.tsx"; -import { test } from "inline.tsx"; +import * as React from 'react' +import * as styles from '../style.css' +import { TEST_DATA } from '../test.const' +const Button = (props: { children: any }) => { + return +} +import { Route } from 'inline.tsx' +import { test } from 'inline.tsx' const SplitComponent = () => { - return
- {test} -

{TEST_DATA.welcome}

- -
; -}; -export { SplitComponent as component }; \ No newline at end of file + return ( +
+ {test} +

{TEST_DATA.welcome}

+ +
+ ) +} +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/inline@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/inline@errorComponent.tsx index 9236af6021..23fab71edc 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/inline@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/inline@errorComponent.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -import { Route } from "inline.tsx"; \ No newline at end of file +import * as React from 'react' +import { Route } from 'inline.tsx' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/inline@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/inline@notFoundComponent.tsx index 9236af6021..23fab71edc 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/inline@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/inline@notFoundComponent.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -import { Route } from "inline.tsx"; \ No newline at end of file +import * as React from 'react' +import { Route } from 'inline.tsx' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/lowercase-function-declaration.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/lowercase-function-declaration.tsx index b2f908ab45..13cb142f27 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/lowercase-function-declaration.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/lowercase-function-declaration.tsx @@ -1,12 +1,17 @@ -const $$splitErrorComponentImporter = () => import('lowercase-function-declaration.tsx?tsr-split=errorComponent'); -const $$splitComponentImporter = () => import('lowercase-function-declaration.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitErrorComponentImporter = () => + import('lowercase-function-declaration.tsx?tsr-split=errorComponent') +const $$splitComponentImporter = () => + import('lowercase-function-declaration.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), pendingComponent, - errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') -}); + errorComponent: lazyRouteComponent( + $$splitErrorComponentImporter, + 'errorComponent', + ), +}) function pendingComponent() { - return
lowercase pending function declaration
; -} \ No newline at end of file + return
lowercase pending function declaration
+} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/lowercase-function-declaration@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/lowercase-function-declaration@component.tsx index 65735a0f20..e53a2acebf 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/lowercase-function-declaration@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/lowercase-function-declaration@component.tsx @@ -1,4 +1,4 @@ function component() { - return
lowercase function declaration
; + return
lowercase function declaration
} -export { component }; \ No newline at end of file +export { component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/lowercase-function-declaration@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/lowercase-function-declaration@errorComponent.tsx index acc1c0be8d..9d411c1f0f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/lowercase-function-declaration@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/lowercase-function-declaration@errorComponent.tsx @@ -1,4 +1,4 @@ function errorComponent() { - return
lowercase error function declaration
; + return
lowercase error function declaration
} -export { errorComponent }; \ No newline at end of file +export { errorComponent } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/random-number.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/random-number.tsx index 0cb0a2e13b..c9e47e1145 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/random-number.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/random-number.tsx @@ -1,32 +1,45 @@ -const $$splitComponentImporter = () => import('random-number.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { Await, Link, createFileRoute, defer } from '@tanstack/react-router'; -import { Carbon } from '~/components/Carbon'; -import { twMerge } from 'tailwind-merge'; -import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa'; -import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg'; -import { Footer } from '~/components/Footer'; -import SponsorPack from '~/components/SponsorPack'; -import { LogoColor } from '~/components/LogoColor'; -import { getSponsorsForSponsorPack } from '~/server/sponsors'; -import agGridImage from '~/images/ag-grid.png'; -import nozzleImage from '~/images/nozzle.png'; -import bytesImage from '~/images/bytes.svg'; -import bytesUidotdevImage from '~/images/bytes-uidotdev.png'; -export const textColors = [`text-rose-500`, `text-yellow-500`, `text-teal-500`, `text-blue-500`]; -export const gradients = [`from-rose-500 to-yellow-500`, `from-yellow-500 to-teal-500`, `from-teal-500 to-violet-500`, `from-blue-500 to-pink-500`]; -const courses = [{ - name: 'The Official TanStack React Query Course', - cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, - href: 'https://query.gg/?s=tanstack', - description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.` -}]; +const $$splitComponentImporter = () => + import('random-number.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { Await, Link, createFileRoute, defer } from '@tanstack/react-router' +import { Carbon } from '~/components/Carbon' +import { twMerge } from 'tailwind-merge' +import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa' +import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg' +import { Footer } from '~/components/Footer' +import SponsorPack from '~/components/SponsorPack' +import { LogoColor } from '~/components/LogoColor' +import { getSponsorsForSponsorPack } from '~/server/sponsors' +import agGridImage from '~/images/ag-grid.png' +import nozzleImage from '~/images/nozzle.png' +import bytesImage from '~/images/bytes.svg' +import bytesUidotdevImage from '~/images/bytes-uidotdev.png' +export const textColors = [ + `text-rose-500`, + `text-yellow-500`, + `text-teal-500`, + `text-blue-500`, +] +export const gradients = [ + `from-rose-500 to-yellow-500`, + `from-yellow-500 to-teal-500`, + `from-teal-500 to-violet-500`, + `from-blue-500 to-pink-500`, +] +const courses = [ + { + name: 'The Official TanStack React Query Course', + cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, + href: 'https://query.gg/?s=tanstack', + description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.`, + }, +] export const Route = createFileRoute('/')({ loader: () => { return { randomNumber: Math.random(), - sponsorsPromise: defer(getSponsorsForSponsorPack()) - }; + sponsorsPromise: defer(getSponsorsForSponsorPack()), + } }, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/random-number@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/random-number@component.tsx index 9ed6d15184..26a9f9c142 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/random-number@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/random-number@component.tsx @@ -1,61 +1,48 @@ -import { Await, Link } from '@tanstack/react-router'; -import { Carbon } from '~/components/Carbon'; -import { twMerge } from 'tailwind-merge'; -import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa'; -import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg'; -import { Footer } from '~/components/Footer'; -import SponsorPack from '~/components/SponsorPack'; -import { LogoColor } from '~/components/LogoColor'; -import discordImage from '~/images/discord-logo-white.svg'; -import agGridImage from '~/images/ag-grid.png'; -import nozzleImage from '~/images/nozzle.png'; -import bytesImage from '~/images/bytes.svg'; -import bytesUidotdevImage from '~/images/bytes-uidotdev.png'; -import { useMutation } from '~/hooks/useMutation'; -import { sample } from '~/utils/utils'; -import { textColors } from "random-number.tsx"; -import { gradients } from "random-number.tsx"; -const courses = [{ - name: 'The Official TanStack React Query Course', - cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, - href: 'https://query.gg/?s=tanstack', - description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.` -}]; -import { Route } from "random-number.tsx"; -async function bytesSignupServerFn({ - email -}: { - email: string; -}) { - 'use server'; - +import { Await, Link } from '@tanstack/react-router' +import { Carbon } from '~/components/Carbon' +import { twMerge } from 'tailwind-merge' +import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa' +import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg' +import { Footer } from '~/components/Footer' +import SponsorPack from '~/components/SponsorPack' +import { LogoColor } from '~/components/LogoColor' +import discordImage from '~/images/discord-logo-white.svg' +import agGridImage from '~/images/ag-grid.png' +import nozzleImage from '~/images/nozzle.png' +import bytesImage from '~/images/bytes.svg' +import bytesUidotdevImage from '~/images/bytes-uidotdev.png' +import { useMutation } from '~/hooks/useMutation' +import { sample } from '~/utils/utils' +import { textColors } from 'random-number.tsx' +import { gradients } from 'random-number.tsx' +const courses = [ + { + name: 'The Official TanStack React Query Course', + cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, + href: 'https://query.gg/?s=tanstack', + description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.`, + }, +] +import { Route } from 'random-number.tsx' +async function bytesSignupServerFn({ email }: { email: string }) { + 'use server' return fetch(`https://bytes.dev/api/bytes-optin-cors`, { method: 'POST', - body: JSON.stringify({ - email, - influencer: 'tanstack' - }), - headers: { - Accept: 'application/json', - 'Content-Type': 'application/json' - } - }); + body: JSON.stringify({ email, influencer: 'tanstack' }), + headers: { Accept: 'application/json', 'Content-Type': 'application/json' }, + }) } function Index() { - const bytesSignupMutation = useMutation({ - fn: bytesSignupServerFn - }); - const { - sponsorsPromise, - randomNumber, - testing2 - } = Route.useLoaderData(); - const gradient = sample(gradients, randomNumber); - const textColor = sample(textColors, randomNumber); - return <> + const bytesSignupMutation = useMutation({ fn: bytesSignupServerFn }) + const { sponsorsPromise, randomNumber, testing2 } = Route.useLoaderData() + const gradient = sample(gradients, randomNumber) + const textColor = sample(textColors, randomNumber) + return ( + <> {discordImage} {gradient} {textColor} - ; + + ) } -export { Index as component }; \ No newline at end of file +export { Index as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/random-number@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/random-number@errorComponent.tsx index cdf4d37891..8e156eca17 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/random-number@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/random-number@errorComponent.tsx @@ -1,18 +1,20 @@ -import { Await, Link } from '@tanstack/react-router'; -import { Carbon } from '~/components/Carbon'; -import { twMerge } from 'tailwind-merge'; -import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa'; -import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg'; -import { Footer } from '~/components/Footer'; -import SponsorPack from '~/components/SponsorPack'; -import { LogoColor } from '~/components/LogoColor'; -import agGridImage from '~/images/ag-grid.png'; -import nozzleImage from '~/images/nozzle.png'; -import bytesImage from '~/images/bytes.svg'; -import bytesUidotdevImage from '~/images/bytes-uidotdev.png'; -const courses = [{ - name: 'The Official TanStack React Query Course', - cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, - href: 'https://query.gg/?s=tanstack', - description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.` -}]; \ No newline at end of file +import { Await, Link } from '@tanstack/react-router' +import { Carbon } from '~/components/Carbon' +import { twMerge } from 'tailwind-merge' +import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa' +import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg' +import { Footer } from '~/components/Footer' +import SponsorPack from '~/components/SponsorPack' +import { LogoColor } from '~/components/LogoColor' +import agGridImage from '~/images/ag-grid.png' +import nozzleImage from '~/images/nozzle.png' +import bytesImage from '~/images/bytes.svg' +import bytesUidotdevImage from '~/images/bytes-uidotdev.png' +const courses = [ + { + name: 'The Official TanStack React Query Course', + cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, + href: 'https://query.gg/?s=tanstack', + description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.`, + }, +] diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/random-number@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/random-number@notFoundComponent.tsx index cdf4d37891..8e156eca17 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/random-number@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/random-number@notFoundComponent.tsx @@ -1,18 +1,20 @@ -import { Await, Link } from '@tanstack/react-router'; -import { Carbon } from '~/components/Carbon'; -import { twMerge } from 'tailwind-merge'; -import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa'; -import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg'; -import { Footer } from '~/components/Footer'; -import SponsorPack from '~/components/SponsorPack'; -import { LogoColor } from '~/components/LogoColor'; -import agGridImage from '~/images/ag-grid.png'; -import nozzleImage from '~/images/nozzle.png'; -import bytesImage from '~/images/bytes.svg'; -import bytesUidotdevImage from '~/images/bytes-uidotdev.png'; -const courses = [{ - name: 'The Official TanStack React Query Course', - cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, - href: 'https://query.gg/?s=tanstack', - description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.` -}]; \ No newline at end of file +import { Await, Link } from '@tanstack/react-router' +import { Carbon } from '~/components/Carbon' +import { twMerge } from 'tailwind-merge' +import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa' +import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg' +import { Footer } from '~/components/Footer' +import SponsorPack from '~/components/SponsorPack' +import { LogoColor } from '~/components/LogoColor' +import agGridImage from '~/images/ag-grid.png' +import nozzleImage from '~/images/nozzle.png' +import bytesImage from '~/images/bytes.svg' +import bytesUidotdevImage from '~/images/bytes-uidotdev.png' +const courses = [ + { + name: 'The Official TanStack React Query Course', + cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, + href: 'https://query.gg/?s=tanstack', + description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.`, + }, +] diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/react-memo-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/react-memo-component.tsx index 5fd96f8da1..229a2d0f80 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/react-memo-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/react-memo-component.tsx @@ -1,8 +1,9 @@ -const $$splitComponentImporter = () => import('react-memo-component.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -import { importedLoader } from '../../shared/imported'; +const $$splitComponentImporter = () => + import('react-memo-component.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +import { importedLoader } from '../../shared/imported' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: importedLoader -}); \ No newline at end of file + loader: importedLoader, +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/react-memo-component@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/react-memo-component@component.tsx index dfef29c9e3..6bdb537fe9 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/react-memo-component@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/react-memo-component@component.tsx @@ -1,6 +1,6 @@ -import React from 'react'; +import React from 'react' function Component() { - return
Component
; + return
Component
} -const SplitComponent = React.memo(Component); -export { SplitComponent as component }; \ No newline at end of file +const SplitComponent = React.memo(Component) +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/react-memo-imported-component.tsx index 69df0886db..701826b3f6 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/react-memo-imported-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/react-memo-imported-component.tsx @@ -1,8 +1,9 @@ -const $$splitComponentImporter = () => import('react-memo-imported-component.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -import { importedLoader } from '../../shared/imported'; +const $$splitComponentImporter = () => + import('react-memo-imported-component.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +import { importedLoader } from '../../shared/imported' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: importedLoader -}); \ No newline at end of file + loader: importedLoader, +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/react-memo-imported-component@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/react-memo-imported-component@component.tsx index 540812230e..d162a1aeaf 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/react-memo-imported-component@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/react-memo-imported-component@component.tsx @@ -1,4 +1,4 @@ -import React from 'react'; -import { importedComponent } from '../../shared/imported'; -const SplitComponent = React.memo(importedComponent); -export { SplitComponent as component }; \ No newline at end of file +import React from 'react' +import { importedComponent } from '../../shared/imported' +const SplitComponent = React.memo(importedComponent) +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-export-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-export-component.tsx index 1ae234de6f..f2078a1757 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-export-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-export-component.tsx @@ -4,7 +4,6 @@ import { importedComponent as ImportedComponent, importedLoader, } from '../../shared/imported' - export function Layout() { return (
@@ -22,12 +21,10 @@ export function Layout() {
) } - export const Route = createFileRoute('/_layout')({ component: Layout, loader: importedLoader, }) - const HEADER_HEIGHT = '63px' export const SIDEBAR_WIDTH = '150px' const SIDEBAR_MINI_WIDTH = '80px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-export-component@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-export-component@component.tsx index 5bb0ab5451..8fb12f0c6b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-export-component@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-export-component@component.tsx @@ -1,3 +1,3 @@ -import * as React from 'react'; -const SIDEBAR_MINI_WIDTH = '80px'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const SIDEBAR_MINI_WIDTH = '80px' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-export-component@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-export-component@errorComponent.tsx index 5bb0ab5451..8fb12f0c6b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-export-component@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-export-component@errorComponent.tsx @@ -1,3 +1,3 @@ -import * as React from 'react'; -const SIDEBAR_MINI_WIDTH = '80px'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const SIDEBAR_MINI_WIDTH = '80px' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-export-component@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-export-component@notFoundComponent.tsx index 5bb0ab5451..8fb12f0c6b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-export-component@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-export-component@notFoundComponent.tsx @@ -1,3 +1,3 @@ -import * as React from 'react'; -const SIDEBAR_MINI_WIDTH = '80px'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const SIDEBAR_MINI_WIDTH = '80px' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-const.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-const.tsx index f256b01a83..d674dbb799 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-const.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-const.tsx @@ -4,11 +4,9 @@ import { importedComponent as ImportedComponent, importedLoader, } from '../../shared/imported' - export const loaderFn = () => { return importedLoader() } - const Layout = () => { return (
@@ -26,15 +24,12 @@ const Layout = () => {
) } - export const Route = createFileRoute('/_layout')({ component: Layout, loader: loaderFn, }) - const HEADER_HEIGHT = '63px' export const SIDEBAR_WIDTH = '150px' export const SIDEBAR_MINI_WIDTH = '80px' const ASIDE_WIDTH = '250px' - export default Layout diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-const@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-const@component.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-const@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-const@component.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-const@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-const@errorComponent.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-const@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-const@errorComponent.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-const@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-const@notFoundComponent.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-const@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-const@notFoundComponent.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-destructured.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-destructured.tsx index 0e3175116f..89c23305a0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-destructured.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-destructured.tsx @@ -1,18 +1,12 @@ import { createFileRoute } from '@tanstack/react-router' - const createBits = () => ({ component: AboutComponentImpl, - loader: () => ({ - message: 'hello', - }), + loader: () => ({ message: 'hello' }), }) - export const { component: AboutComponent, loader } = createBits() - function AboutComponentImpl() { return
About
} - export const Route = createFileRoute('/about')({ component: AboutComponent, loader, diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-destructured@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-destructured@component.tsx index a6d57afe77..d64b42fdcc 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-destructured@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-destructured@component.tsx @@ -1,2 +1,2 @@ -import { AboutComponent } from "retain-exports-destructured.tsx?tsr-shared=1"; -export { AboutComponent as component }; \ No newline at end of file +import { AboutComponent } from 'retain-exports-destructured.tsx?tsr-shared=1' +export { AboutComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-destructured@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-destructured@shared.tsx index b03a4eb83a..6eff1ff083 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-destructured@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-destructured@shared.tsx @@ -1,14 +1,9 @@ const createBits = () => ({ component: AboutComponentImpl, - loader: () => ({ - message: 'hello' - }) -}); -const { - component: AboutComponent, - loader -} = createBits(); + loader: () => ({ message: 'hello' }), +}) +const { component: AboutComponent, loader } = createBits() function AboutComponentImpl() { - return
About
; + return
About
} -export { AboutComponent, AboutComponentImpl, createBits, loader }; \ No newline at end of file +export { AboutComponent, AboutComponentImpl, createBits, loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-function.tsx index 298c388e65..83b3dd4eb5 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-function.tsx @@ -4,11 +4,9 @@ import { importedComponent as ImportedComponent, importedLoader, } from '../../shared/imported' - export function loaderFn() { return importedLoader() } - function Layout() { return (
@@ -26,15 +24,12 @@ function Layout() {
) } - export const Route = createFileRoute('/_layout')({ component: Layout, loader: loaderFn, }) - const HEADER_HEIGHT = '63px' export const SIDEBAR_WIDTH = '150px' export const SIDEBAR_MINI_WIDTH = '80px' const ASIDE_WIDTH = '250px' - export default Layout diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-function@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-function@component.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-function@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-function@component.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-function@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-function@errorComponent.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-function@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-function@errorComponent.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-function@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-function@notFoundComponent.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-function@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-function@notFoundComponent.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-loader.tsx index 88cd35f704..16357edc27 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-loader.tsx @@ -1,16 +1,15 @@ -const $$splitComponentImporter = () => import('retain-exports-loader.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('retain-exports-loader.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' export function loaderFn() { - return { - foo: 'bar' - }; + return { foo: 'bar' } } export const Route = createFileRoute('/_layout')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: loaderFn -}); -export const SIDEBAR_WIDTH = '150px'; -export const SIDEBAR_MINI_WIDTH = '80px'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file + loader: loaderFn, +}) +export const SIDEBAR_WIDTH = '150px' +export const SIDEBAR_MINI_WIDTH = '80px' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-loader@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-loader@component.tsx index 9f54ae0dc5..604be4dc69 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-loader@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-loader@component.tsx @@ -1,11 +1,10 @@ -import * as React from 'react'; -import { Outlet } from '@tanstack/react-router'; -import { importedComponent as ImportedComponent } from '../../shared/imported'; +import * as React from 'react' +import { Outlet } from '@tanstack/react-router' +import { importedComponent as ImportedComponent } from '../../shared/imported' function Layout() { - return
-
+ return ( +
+
-
; +
+ ) } -const HEADER_HEIGHT = '63px'; -const ASIDE_WIDTH = '250px'; -export { Layout as component }; \ No newline at end of file +const HEADER_HEIGHT = '63px' +const ASIDE_WIDTH = '250px' +export { Layout as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-loader@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-loader@errorComponent.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-loader@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-loader@errorComponent.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-loader@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-loader@notFoundComponent.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-loader@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/retain-exports-loader@notFoundComponent.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-class.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-class.tsx index 6e2f0229e4..19509e3bdd 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-class.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-class.tsx @@ -1,10 +1,11 @@ -import { store } from "shared-class.tsx?tsr-shared=1"; -const $$splitComponentImporter = () => import('shared-class.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +import { store } from 'shared-class.tsx?tsr-shared=1' +const $$splitComponentImporter = () => + import('shared-class.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/store')({ loader: async () => { - store.set('items', await fetch('/api')); + store.set('items', await fetch('/api')) }, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-class@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-class@component.tsx index 6a38b10ff8..e0e187fb1d 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-class@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-class@component.tsx @@ -1,3 +1,3 @@ -import { store } from "shared-class.tsx?tsr-shared=1"; -const SplitComponent = () =>
{store.get('items')}
; -export { SplitComponent as component }; \ No newline at end of file +import { store } from 'shared-class.tsx?tsr-shared=1' +const SplitComponent = () =>
{store.get('items')}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-class@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-class@shared.tsx index 18c40bafb6..0abc282ecc 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-class@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-class@shared.tsx @@ -1,11 +1,11 @@ class DataStore { - data = new Map(); + data = new Map() get(k: string) { - return this.data.get(k); + return this.data.get(k) } set(k: string, v: unknown) { - this.data.set(k, v); + this.data.set(k, v) } } -const store = new DataStore(); -export { DataStore, store }; \ No newline at end of file +const store = new DataStore() +export { DataStore, store } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured-export.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured-export.tsx index 9453dbfbda..dc4d2d383f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured-export.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured-export.tsx @@ -1,9 +1,10 @@ -import { apiUrl } from "shared-destructured-export.tsx?tsr-shared=1"; -const $$splitComponentImporter = () => import('shared-destructured-export.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +import { apiUrl } from 'shared-destructured-export.tsx?tsr-shared=1' +const $$splitComponentImporter = () => + import('shared-destructured-export.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/config')({ loader: async () => fetch(apiUrl), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); -export { apiUrl, timeout } from "shared-destructured-export.tsx?tsr-shared=1"; \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) +export { apiUrl, timeout } from 'shared-destructured-export.tsx?tsr-shared=1' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured-export@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured-export@component.tsx index 16b288ac5f..8cd0f14a27 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured-export@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured-export@component.tsx @@ -1,3 +1,3 @@ -import { timeout } from "shared-destructured-export.tsx?tsr-shared=1"; -const SplitComponent = () =>
Timeout: {timeout}
; -export { SplitComponent as component }; \ No newline at end of file +import { timeout } from 'shared-destructured-export.tsx?tsr-shared=1' +const SplitComponent = () =>
Timeout: {timeout}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured-export@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured-export@shared.tsx index f0bfd70add..ae9324acc9 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured-export@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured-export@shared.tsx @@ -1,11 +1,5 @@ -const { - apiUrl, - timeout -} = getConfig(); +const { apiUrl, timeout } = getConfig() function getConfig() { - return { - apiUrl: '/api', - timeout: 5000 - }; + return { apiUrl: '/api', timeout: 5000 } } -export { apiUrl, getConfig, timeout }; \ No newline at end of file +export { apiUrl, getConfig, timeout } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured.tsx index 3019454516..b1d4f96065 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured.tsx @@ -1,8 +1,9 @@ -import { apiUrl } from "shared-destructured.tsx?tsr-shared=1"; -const $$splitComponentImporter = () => import('shared-destructured.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +import { apiUrl } from 'shared-destructured.tsx?tsr-shared=1' +const $$splitComponentImporter = () => + import('shared-destructured.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/config')({ loader: async () => fetch(apiUrl), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured@component.tsx index 5c0182e61a..3d7933a573 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured@component.tsx @@ -1,3 +1,3 @@ -import { timeout } from "shared-destructured.tsx?tsr-shared=1"; -const SplitComponent = () =>
Timeout: {timeout}
; -export { SplitComponent as component }; \ No newline at end of file +import { timeout } from 'shared-destructured.tsx?tsr-shared=1' +const SplitComponent = () =>
Timeout: {timeout}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured@shared.tsx index f0bfd70add..ae9324acc9 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-destructured@shared.tsx @@ -1,11 +1,5 @@ -const { - apiUrl, - timeout -} = getConfig(); +const { apiUrl, timeout } = getConfig() function getConfig() { - return { - apiUrl: '/api', - timeout: 5000 - }; + return { apiUrl: '/api', timeout: 5000 } } -export { apiUrl, getConfig, timeout }; \ No newline at end of file +export { apiUrl, getConfig, timeout } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-exported.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-exported.tsx index c2eb8b1012..aa9730bec7 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-exported.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-exported.tsx @@ -1,13 +1,12 @@ -import { queryOptions } from "shared-exported.tsx?tsr-shared=1"; -const $$splitComponentImporter = () => import('shared-exported.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +import { queryOptions } from 'shared-exported.tsx?tsr-shared=1' +const $$splitComponentImporter = () => + import('shared-exported.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/query')({ loader: async () => { - return { - staleTime: queryOptions.staleTime - }; + return { staleTime: queryOptions.staleTime } }, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); -export { queryOptions } from "shared-exported.tsx?tsr-shared=1"; \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) +export { queryOptions } from 'shared-exported.tsx?tsr-shared=1' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-exported@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-exported@component.tsx index b020b5cadf..9fe61942dd 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-exported@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-exported@component.tsx @@ -1,3 +1,3 @@ -import { queryOptions } from "shared-exported.tsx?tsr-shared=1"; -const SplitComponent = () =>
GC: {queryOptions.gcTime}
; -export { SplitComponent as component }; \ No newline at end of file +import { queryOptions } from 'shared-exported.tsx?tsr-shared=1' +const SplitComponent = () =>
GC: {queryOptions.gcTime}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-exported@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-exported@shared.tsx index a3f91b85bb..3a1ff108bb 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-exported@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-exported@shared.tsx @@ -1,5 +1,2 @@ -const queryOptions = { - staleTime: 5000, - gcTime: 10000 -}; -export { queryOptions }; \ No newline at end of file +const queryOptions = { staleTime: 5000, gcTime: 10000 } +export { queryOptions } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-function.tsx index 7372ff4b07..d4f3d89f2d 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-function.tsx @@ -1,14 +1,15 @@ -import { getCached, cache } from "shared-function.tsx?tsr-shared=1"; -const $$splitComponentImporter = () => import('shared-function.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +import { getCached, cache } from 'shared-function.tsx?tsr-shared=1' +const $$splitComponentImporter = () => + import('shared-function.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' function setCached(key: string, val: unknown) { - cache.set(key, val); + cache.set(key, val) } export const Route = createFileRoute('/cached')({ loader: async () => { - setCached('data', await fetch('/api').then(r => r.json())); - return getCached('data'); + setCached('data', await fetch('/api').then((r) => r.json())) + return getCached('data') }, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-function@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-function@component.tsx index 571bd9356a..1c327523af 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-function@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-function@component.tsx @@ -1,3 +1,3 @@ -import { getCached } from "shared-function.tsx?tsr-shared=1"; -const SplitComponent = () =>
{JSON.stringify(getCached('data'))}
; -export { SplitComponent as component }; \ No newline at end of file +import { getCached } from 'shared-function.tsx?tsr-shared=1' +const SplitComponent = () =>
{JSON.stringify(getCached('data'))}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-function@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-function@shared.tsx index 27d2cf03f1..243ac23a66 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-function@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-function@shared.tsx @@ -1,5 +1,5 @@ -const cache = new Map(); +const cache = new Map() function getCached(key: string) { - return cache.get(key); + return cache.get(key) } -export { cache, getCached }; \ No newline at end of file +export { cache, getCached } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-imported-binding.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-imported-binding.tsx index c3e284c081..da3387c5fd 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-imported-binding.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-imported-binding.tsx @@ -1,8 +1,9 @@ -const $$splitComponentImporter = () => import('shared-imported-binding.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -import { sharedUtil } from '../utils'; +const $$splitComponentImporter = () => + import('shared-imported-binding.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +import { sharedUtil } from '../utils' export const Route = createFileRoute('/imported')({ loader: async () => sharedUtil('load'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-imported-binding@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-imported-binding@component.tsx index 0a835ae063..e3c8a0f5d8 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-imported-binding@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-imported-binding@component.tsx @@ -1,3 +1,3 @@ -import { sharedUtil } from '../utils'; -const SplitComponent = () =>
{sharedUtil('render')}
; -export { SplitComponent as component }; \ No newline at end of file +import { sharedUtil } from '../utils' +const SplitComponent = () =>
{sharedUtil('render')}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-indirect-ref.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-indirect-ref.tsx index 889dd57cf0..244f566066 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-indirect-ref.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-indirect-ref.tsx @@ -1,13 +1,12 @@ -import { state, getCount } from "shared-indirect-ref.tsx?tsr-shared=1"; -const $$splitComponentImporter = () => import('shared-indirect-ref.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +import { state, getCount } from 'shared-indirect-ref.tsx?tsr-shared=1' +const $$splitComponentImporter = () => + import('shared-indirect-ref.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/shared-indirect')({ loader: () => { - state.count++; - return { - count: getCount() - }; + state.count++ + return { count: getCount() } }, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-indirect-ref@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-indirect-ref@component.tsx index 62995e7fd8..64bb6ab567 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-indirect-ref@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-indirect-ref@component.tsx @@ -1,7 +1,9 @@ -import { state, getCount } from "shared-indirect-ref.tsx?tsr-shared=1"; +import { state, getCount } from 'shared-indirect-ref.tsx?tsr-shared=1' function SharedComponent() { - return
+ return ( +
{getCount()} - {state.count} -
; +
+ ) } -export { SharedComponent as component }; \ No newline at end of file +export { SharedComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-indirect-ref@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-indirect-ref@shared.tsx index 7e7e811ba8..b4910d2fd1 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-indirect-ref@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-indirect-ref@shared.tsx @@ -1,7 +1,5 @@ -const state = { - count: 0 -}; +const state = { count: 0 } function getCount() { - return state.count; + return state.count } -export { getCount, state }; \ No newline at end of file +export { getCount, state } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-jsx-component-ref.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-jsx-component-ref.tsx index 728caca361..6b29c09f33 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-jsx-component-ref.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-jsx-component-ref.tsx @@ -1,9 +1,10 @@ -import { shared } from "shared-jsx-component-ref.tsx?tsr-shared=1"; -const $$splitComponentImporter = () => import('shared-jsx-component-ref.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; +import { shared } from 'shared-jsx-component-ref.tsx?tsr-shared=1' +const $$splitComponentImporter = () => + import('shared-jsx-component-ref.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' // @ts-nocheck -import { createFileRoute } from '@tanstack/react-router'; +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/jsx')({ loader: () => shared, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-jsx-component-ref@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-jsx-component-ref@component.tsx index 52ecb6d474..845e1db45c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-jsx-component-ref@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-jsx-component-ref@component.tsx @@ -1,5 +1,5 @@ -import { shared } from "shared-jsx-component-ref.tsx?tsr-shared=1"; // @ts-nocheck +import { shared } from 'shared-jsx-component-ref.tsx?tsr-shared=1' // @ts-nocheck function SharedComponent() { - return
{shared}
; + return
{shared}
} -export { SharedComponent as component }; \ No newline at end of file +export { SharedComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-jsx-component-ref@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-jsx-component-ref@shared.tsx index d5cc2cf990..60ae1006a1 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-jsx-component-ref@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-jsx-component-ref@shared.tsx @@ -1,4 +1,3 @@ // @ts-nocheck - -const shared = 1; -export { shared }; \ No newline at end of file +const shared = 1 +export { shared } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-none.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-none.tsx index dd352bfc41..6d0ece44ba 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-none.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-none.tsx @@ -1,8 +1,9 @@ -const $$splitComponentImporter = () => import('shared-none.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -const loaderHelper = () => fetch('/api'); +const $$splitComponentImporter = () => + import('shared-none.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +const loaderHelper = () => fetch('/api') export const Route = createFileRoute('/clean')({ loader: async () => loaderHelper(), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-none@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-none@component.tsx index 701deeedeb..1bfd4eb63f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-none@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-none@component.tsx @@ -1,5 +1,7 @@ -const ComponentHelper = () => helper; -const SplitComponent = () =>
- -
; -export { SplitComponent as component }; \ No newline at end of file +const ComponentHelper = () => helper +const SplitComponent = () => ( +
+ +
+) +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-referencing-route.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-referencing-route.tsx index f82ac5b900..1ac3428ebc 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-referencing-route.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-referencing-route.tsx @@ -1,16 +1,15 @@ -import { HEADER } from "shared-referencing-route.tsx?tsr-shared=1"; -const $$splitComponentImporter = () => import('shared-referencing-route.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +import { HEADER } from 'shared-referencing-route.tsx?tsr-shared=1' +const $$splitComponentImporter = () => + import('shared-referencing-route.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' function usePageTitle() { - return `${HEADER} - ${Route.fullPath}`; + return `${HEADER} - ${Route.fullPath}` } export const Route = createFileRoute('/about')({ loader: async () => { - const title = usePageTitle(); - return { - title - }; + const title = usePageTitle() + return { title } }, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-referencing-route@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-referencing-route@component.tsx index 2cb2cdb68c..b2c4630c90 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-referencing-route@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-referencing-route@component.tsx @@ -1,10 +1,10 @@ -import { HEADER } from "shared-referencing-route.tsx?tsr-shared=1"; +import { HEADER } from 'shared-referencing-route.tsx?tsr-shared=1' function usePageTitle() { - return `${HEADER} - ${Route.fullPath}`; + return `${HEADER} - ${Route.fullPath}` } -import { Route } from "shared-referencing-route.tsx"; +import { Route } from 'shared-referencing-route.tsx' const SplitComponent = () => { - const title = usePageTitle(); - return
{title}
; -}; -export { SplitComponent as component }; \ No newline at end of file + const title = usePageTitle() + return
{title}
+} +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-referencing-route@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-referencing-route@shared.tsx index cc2d01424c..34b9c4ca41 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-referencing-route@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-referencing-route@shared.tsx @@ -1,2 +1,2 @@ -const HEADER = 'Page'; -export { HEADER }; \ No newline at end of file +const HEADER = 'Page' +export { HEADER } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime.tsx index c230b4d37f..17d70ca9bd 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime.tsx @@ -1,23 +1,25 @@ -import { state, createState, createSeed, increment } from "shared-runtime.tsx?tsr-shared=1"; -const $$splitComponentImporter = () => import('shared-runtime.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -console.log('shared-runtime:reference'); +import { + state, + createState, + createSeed, + increment, +} from 'shared-runtime.tsx?tsr-shared=1' +const $$splitComponentImporter = () => + import('shared-runtime.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +console.log('shared-runtime:reference') export const Route = createFileRoute('/shared-runtime')({ beforeLoad: () => state, loader: () => { - increment(); - return state; + increment() + return state }, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); -function createState(initialState: { - count: number; -}): { - state: { - count: number; - }; - increment: () => number; -}; -export { state as firstState, state as secondState, state as 'odd-name' }; -export default createSeed; \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) +function createState(initialState: { count: number }): { + state: { count: number } + increment: () => number +} +export { state as firstState, state as secondState, state as 'odd-name' } +export default createSeed diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@component.tsx index fbccf6c90b..5245f6d9eb 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@component.tsx @@ -1,23 +1,24 @@ -import { state, createState, createSeed, Labels } from "shared-runtime.tsx?tsr-shared=1"; -const label = createComponentLabel(); -function createState(initialState: { - count: number; -}): { - state: { - count: number; - }; - increment: () => number; -}; -function createComponentLabel() { - console.log('shared-runtime:component'); - return Labels.component; +import { + state, + createState, + createSeed, + Labels, +} from 'shared-runtime.tsx?tsr-shared=1' +const label = createComponentLabel() +function createState(initialState: { count: number }): { + state: { count: number } + increment: () => number } -export { state as firstState, state as secondState, state as 'odd-name' }; -export default createSeed; +function createComponentLabel() { + console.log('shared-runtime:component') + return Labels.component +} +export { state as firstState, state as secondState, state as 'odd-name' } +export default createSeed const SplitComponent = () => { if (state.count === 3) { - throw new Error('route source-map contract'); + throw new Error('route source-map contract') } - return `${label}:${state.count}`; -}; -export { SplitComponent as component }; \ No newline at end of file + return `${label}:${state.count}` +} +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@errorComponent.tsx index d890a562c9..03cacac5b3 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@errorComponent.tsx @@ -1,11 +1,7 @@ -import { state, createState, createSeed } from "shared-runtime.tsx?tsr-shared=1"; -function createState(initialState: { - count: number; -}): { - state: { - count: number; - }; - increment: () => number; -}; -export { state as firstState, state as secondState, state as 'odd-name' }; -export default createSeed; \ No newline at end of file +import { state, createState, createSeed } from 'shared-runtime.tsx?tsr-shared=1' +function createState(initialState: { count: number }): { + state: { count: number } + increment: () => number +} +export { state as firstState, state as secondState, state as 'odd-name' } +export default createSeed diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@notFoundComponent.tsx index d890a562c9..03cacac5b3 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@notFoundComponent.tsx @@ -1,11 +1,7 @@ -import { state, createState, createSeed } from "shared-runtime.tsx?tsr-shared=1"; -function createState(initialState: { - count: number; -}): { - state: { - count: number; - }; - increment: () => number; -}; -export { state as firstState, state as secondState, state as 'odd-name' }; -export default createSeed; \ No newline at end of file +import { state, createState, createSeed } from 'shared-runtime.tsx?tsr-shared=1' +function createState(initialState: { count: number }): { + state: { count: number } + increment: () => number +} +export { state as firstState, state as secondState, state as 'odd-name' } +export default createSeed diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@shared.tsx index 54239b6cc5..c53a7e1568 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-runtime@shared.tsx @@ -1,28 +1,13 @@ -const Count = { - Initial: 0 -}; -const Labels = { - component: 'count' -}; -const seed = createSeed(); -const { - state, - increment -} = createState(seed); +const Count = { Initial: 0 } +const Labels = { component: 'count' } +const seed = createSeed() +const { state, increment } = createState(seed) function createSeed() { - console.log('shared-runtime:seed'); - return { - count: Count.Initial, - label: Labels.component - }; + console.log('shared-runtime:seed') + return { count: Count.Initial, label: Labels.component } } -function createState(initialState: { - count: number; -}) { - console.log('shared-runtime:state'); - return { - state: initialState, - increment: () => initialState.count++ - }; +function createState(initialState: { count: number }) { + console.log('shared-runtime:state') + return { state: initialState, increment: () => initialState.count++ } } -export { Count, createSeed, createState, increment, Labels, seed, state }; \ No newline at end of file +export { Count, createSeed, createState, increment, Labels, seed, state } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-transitive.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-transitive.tsx index ce5a10c47c..3860bd4688 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-transitive.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-transitive.tsx @@ -1,11 +1,12 @@ -import { config } from "shared-transitive.tsx?tsr-shared=1"; -const $$splitComponentImporter = () => import('shared-transitive.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -const fetcher = (path: string) => fetch(`${config.url}${path}`); +import { config } from 'shared-transitive.tsx?tsr-shared=1' +const $$splitComponentImporter = () => + import('shared-transitive.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +const fetcher = (path: string) => fetch(`${config.url}${path}`) export const Route = createFileRoute('/api')({ loader: async () => { - return fetcher('/data'); + return fetcher('/data') }, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-transitive@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-transitive@component.tsx index 7a3a74048e..c237a03583 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-transitive@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-transitive@component.tsx @@ -1,3 +1,3 @@ -import { config } from "shared-transitive.tsx?tsr-shared=1"; -const SplitComponent = () =>
Timeout: {config.timeout}
; -export { SplitComponent as component }; \ No newline at end of file +import { config } from 'shared-transitive.tsx?tsr-shared=1' +const SplitComponent = () =>
Timeout: {config.timeout}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-transitive@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-transitive@shared.tsx index 8bec4a1d55..ac44498714 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-transitive@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-transitive@shared.tsx @@ -1,6 +1,3 @@ -const BASE_URL = 'https://api.example.com'; -const config = { - url: BASE_URL, - timeout: 5000 -}; -export { BASE_URL, config }; \ No newline at end of file +const BASE_URL = 'https://api.example.com' +const config = { url: BASE_URL, timeout: 5000 } +export { BASE_URL, config } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-variable.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-variable.tsx index c0c02cec46..f7b7b51f4d 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-variable.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-variable.tsx @@ -1,13 +1,12 @@ -import { collection } from "shared-variable.tsx?tsr-shared=1"; -const $$splitComponentImporter = () => import('shared-variable.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +import { collection } from 'shared-variable.tsx?tsr-shared=1' +const $$splitComponentImporter = () => + import('shared-variable.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/todos')({ loader: async () => { - await collection.preload(); - return { - data: 'loaded' - }; + await collection.preload() + return { data: 'loaded' } }, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-variable@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-variable@component.tsx index d149922fbc..10325aa95e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-variable@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-variable@component.tsx @@ -1,3 +1,3 @@ -import { collection } from "shared-variable.tsx?tsr-shared=1"; -const SplitComponent = () =>
{collection.name}
; -export { SplitComponent as component }; \ No newline at end of file +import { collection } from 'shared-variable.tsx?tsr-shared=1' +const SplitComponent = () =>
{collection.name}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-variable@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-variable@shared.tsx index 8a0560d5b9..10421dac09 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-variable@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-variable@shared.tsx @@ -1,5 +1,2 @@ -const collection = { - name: 'todos', - preload: async () => {} -}; -export { collection }; \ No newline at end of file +const collection = { name: 'todos', preload: async () => {} } +export { collection } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-with-side-effect.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-with-side-effect.tsx index cba0c7770b..39bbc717d9 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-with-side-effect.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-with-side-effect.tsx @@ -1,11 +1,12 @@ -import { registry } from "shared-with-side-effect.tsx?tsr-shared=1"; -const $$splitComponentImporter = () => import('shared-with-side-effect.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -console.log('registry created'); +import { registry } from 'shared-with-side-effect.tsx?tsr-shared=1' +const $$splitComponentImporter = () => + import('shared-with-side-effect.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +console.log('registry created') export const Route = createFileRoute('/fx')({ loader: async () => { - registry.set('loaded', true); + registry.set('loaded', true) }, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-with-side-effect@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-with-side-effect@component.tsx index d953af00fa..3ede22c8be 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-with-side-effect@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-with-side-effect@component.tsx @@ -1,3 +1,3 @@ -import { registry } from "shared-with-side-effect.tsx?tsr-shared=1"; -const SplitComponent = () =>
{registry.size}
; -export { SplitComponent as component }; \ No newline at end of file +import { registry } from 'shared-with-side-effect.tsx?tsr-shared=1' +const SplitComponent = () =>
{registry.size}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-with-side-effect@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-with-side-effect@shared.tsx index f26c656fdd..a59298f9e0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-with-side-effect@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/shared-with-side-effect@shared.tsx @@ -1,2 +1,2 @@ -const registry = new Map(); -export { registry }; \ No newline at end of file +const registry = new Map() +export { registry } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/undefined-literals.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/undefined-literals.tsx index 0c6e4f01aa..88b0bf1ba8 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/undefined-literals.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/undefined-literals.tsx @@ -1,5 +1,4 @@ import { createFileRoute } from '@tanstack/react-router' - export const Route = createFileRoute('/undefined-test')({ component: undefined, errorComponent: undefined, diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/useStateDestructure.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/useStateDestructure.tsx index d0de09bf8b..b5b3ecade6 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/useStateDestructure.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/useStateDestructure.tsx @@ -1,5 +1,4 @@ import * as React from 'react' - import { CgCornerUpLeft, CgSpinner } from 'react-icons/cg' import { FaBolt, @@ -21,7 +20,6 @@ import { startProject } from '~/projects/start' import { createFileRoute } from '@tanstack/react-router' import { Framework, getBranch } from '~/projects' import { seo } from '~/utils/seo' - const menu = [ { label: ( @@ -72,31 +70,22 @@ const menu = [ to: `https://cottonbureau.com/people/tanstack`, }, ] - export const Route = createFileRoute('/_libraries/start/$version/')({ component: VersionIndex, meta: () => - seo({ - title: startProject.name, - description: startProject.description, - }), + seo({ title: startProject.name, description: startProject.description }), }) - const librariesRouteApi = getRouteApi('/_libraries') - export default function VersionIndex() { const { sponsorsPromise } = librariesRouteApi.useLoaderData() const { version } = Route.useParams() const branch = getBranch(startProject, version) const [framework, setFramework] = React.useState('react') const [isDark, setIsDark] = React.useState(true) - React.useEffect(() => { setIsDark(window.matchMedia?.(`(prefers-color-scheme: dark)`).matches) }, []) - const gradientText = `inline-block text-transparent bg-clip-text bg-gradient-to-r ${startProject.colorFrom} ${startProject.colorTo}` - return (
{item.label}
) - return (
{item.to.startsWith('http') ? ( @@ -269,7 +257,6 @@ Check it out at https://tanstack.com/start/`,
*/} - {/*

@@ -315,7 +302,6 @@ Check it out at https://tanstack.com/start/`, })}

*/} - {/*
Trusted in Production by @@ -358,7 +344,6 @@ Check it out at https://tanstack.com/start/`,
*/} -

Partners @@ -388,16 +373,13 @@ Check it out at https://tanstack.com/start/`,

-

Sponsors

-
@@ -429,7 +410,6 @@ Check it out at https://tanstack.com/start/`, rage-quit OSS. Yay money! 😉
- {/*

@@ -468,7 +448,6 @@ Check it out at https://tanstack.com/start/`,

*/} - {/* {[''].includes(framework) ? (
@@ -503,7 +482,6 @@ Check it out at https://tanstack.com/start/`, >
)} */} - {/*
Wow, you've come a long way! diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/useStateDestructure@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/useStateDestructure@component.tsx index 97b5481cf5..5cc3099643 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/useStateDestructure@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/useStateDestructure@component.tsx @@ -1,2 +1,2 @@ -import { FaBolt, FaBook, FaCheckCircle, FaCogs } from 'react-icons/fa'; -import { VscPreview, VscWand } from 'react-icons/vsc'; \ No newline at end of file +import { FaBolt, FaBook, FaCheckCircle, FaCogs } from 'react-icons/fa' +import { VscPreview, VscWand } from 'react-icons/vsc' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/useStateDestructure@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/useStateDestructure@errorComponent.tsx index 97b5481cf5..5cc3099643 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/useStateDestructure@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/useStateDestructure@errorComponent.tsx @@ -1,2 +1,2 @@ -import { FaBolt, FaBook, FaCheckCircle, FaCogs } from 'react-icons/fa'; -import { VscPreview, VscWand } from 'react-icons/vsc'; \ No newline at end of file +import { FaBolt, FaBook, FaCheckCircle, FaCogs } from 'react-icons/fa' +import { VscPreview, VscWand } from 'react-icons/vsc' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/useStateDestructure@notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/useStateDestructure@notFoundComponent.tsx index 97b5481cf5..5cc3099643 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/useStateDestructure@notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/1-default/useStateDestructure@notFoundComponent.tsx @@ -1,2 +1,2 @@ -import { FaBolt, FaBook, FaCheckCircle, FaCogs } from 'react-icons/fa'; -import { VscPreview, VscWand } from 'react-icons/vsc'; \ No newline at end of file +import { FaBolt, FaBook, FaCheckCircle, FaCogs } from 'react-icons/fa' +import { VscPreview, VscWand } from 'react-icons/vsc' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/arrow-function.tsx index ad71347222..29a53d433e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/arrow-function.tsx @@ -1,10 +1,12 @@ -const $$splitComponentImporter = () => import('arrow-function.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('arrow-function.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('arrow-function.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('arrow-function.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/posts')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/arrow-function@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/arrow-function@component---errorComponent---notFoundComponent---pendingComponent.tsx index 7fe3edee11..e36e48f495 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/arrow-function@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/arrow-function@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,27 +1,31 @@ -import * as React from 'react'; -import { Link, Outlet } from '@tanstack/react-router'; -import { Route } from "arrow-function.tsx"; +import * as React from 'react' +import { Link, Outlet } from '@tanstack/react-router' +import { Route } from 'arrow-function.tsx' const PostsComponent = () => { - const posts = Route.useLoaderData(); - return
+ const posts = Route.useLoaderData() + return ( +
    - {[...posts, { - id: 'i-do-not-exist', - title: 'Non-existent Post' - }]?.map(post => { - return
  • - + {[...posts, { id: 'i-do-not-exist', title: 'Non-existent Post' }]?.map( + (post) => { + return ( +
  • +
    {post.title.substring(0, 20)}
    -
  • ; - })} + + ) + }, + )}

-
; -}; -export { PostsComponent as component }; \ No newline at end of file +
+ ) +} +export { PostsComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/arrow-function@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/arrow-function@loader.tsx index cb195afdd8..1c4fc213ed 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/arrow-function@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/arrow-function@loader.tsx @@ -1,4 +1,4 @@ -import * as React from 'react'; -import { fetchPosts } from '../posts'; -const SplitLoader = fetchPosts; -export { SplitLoader as loader }; \ No newline at end of file +import * as React from 'react' +import { fetchPosts } from '../posts' +const SplitLoader = fetchPosts +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/boolean-null-literals.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/boolean-null-literals.tsx index c31ee0e095..05711582b7 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/boolean-null-literals.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/boolean-null-literals.tsx @@ -1,13 +1,14 @@ -const $$splitLoaderImporter = () => import('boolean-null-literals.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -const $$splitComponentImporter = () => import('boolean-null-literals.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/router'; - +const $$splitLoaderImporter = () => + import('boolean-null-literals.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +const $$splitComponentImporter = () => + import('boolean-null-literals.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/router' // Test errorComponent with false literal export const Route = createFileRoute('/test')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), errorComponent: false, pendingComponent: null, - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/boolean-null-literals@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/boolean-null-literals@component---errorComponent---notFoundComponent---pendingComponent.tsx index c49c9e93a3..557105b6a3 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/boolean-null-literals@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/boolean-null-literals@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ // Test errorComponent with false literal -const SplitComponent = () =>
Test Component
; -export { SplitComponent as component }; \ No newline at end of file +const SplitComponent = () =>
Test Component
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/boolean-null-literals@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/boolean-null-literals@loader.tsx index 666ed1e7ec..0e19f8cafe 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/boolean-null-literals@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/boolean-null-literals@loader.tsx @@ -1,5 +1,3 @@ // Test errorComponent with false literal -const SplitLoader = async () => ({ - data: 'test' -}); -export { SplitLoader as loader }; \ No newline at end of file +const SplitLoader = async () => ({ data: 'test' }) +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/chinese.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/chinese.tsx index 327e227da4..41db95b98c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/chinese.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/chinese.tsx @@ -1,10 +1,11 @@ -const $$splitComponentImporter = () => import('chinese.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('chinese.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) interface DemoProps { - title: string; -} \ No newline at end of file + title: string +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/chinese@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/chinese@component---errorComponent---notFoundComponent---pendingComponent.tsx index 003ca944a1..2ac1fa54ff 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/chinese@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/chinese@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,23 +1,27 @@ -import * as React from 'react'; +import * as React from 'react' function HomeComponent() { - return
+ return ( +
-
; +
+ ) } interface DemoProps { - title: string; + title: string } -function Demo({ - title -}: DemoProps) { - return

+function Demo({ title }: DemoProps) { + return ( +

{title} -

; + + ) } -export { HomeComponent as component }; \ No newline at end of file +export { HomeComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/chinese@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/chinese@loader.tsx index b4de370f4e..cbcea8cc40 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/chinese@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/chinese@loader.tsx @@ -1,4 +1,4 @@ -import * as React from 'react'; +import * as React from 'react' interface DemoProps { - title: string; -} \ No newline at end of file + title: string +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/circular-reference-arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/circular-reference-arrow-function.tsx index ec4cff827d..38e3239ffd 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/circular-reference-arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/circular-reference-arrow-function.tsx @@ -1,6 +1,7 @@ -const $$splitComponentImporter = () => import('circular-reference-arrow-function.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('circular-reference-arrow-function.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/circular-reference-arrow-function@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/circular-reference-arrow-function@component---errorComponent---notFoundComponent---pendingComponent.tsx index 39ace71ebe..59c5b5eec2 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/circular-reference-arrow-function@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/circular-reference-arrow-function@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,19 +1,17 @@ function getComponentName(obj: Record): string { - return Object.keys(obj)[0]; + return Object.keys(obj)[0] } const App = () => { - const componentName = getComponentName({ - App - }); - return
+ const componentName = getComponentName({ App }) + return ( +
Component Name is {componentName} -
; -}; -function OtherComponent() { - const componentName = getComponentName({ - App - }); - return
App component name is {componentName}
; +
+ ) } -export { App as component }; \ No newline at end of file +function OtherComponent() { + const componentName = getComponentName({ App }) + return
App component name is {componentName}
+} +export { App as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/circular-reference-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/circular-reference-function.tsx index e4a82d1022..b3bdc6b113 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/circular-reference-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/circular-reference-function.tsx @@ -1,6 +1,7 @@ -const $$splitComponentImporter = () => import('circular-reference-function.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('circular-reference-function.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/circular-reference-function@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/circular-reference-function@component---errorComponent---notFoundComponent---pendingComponent.tsx index 96a753ad8a..22fbb8669f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/circular-reference-function@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/circular-reference-function@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,19 +1,17 @@ function getComponentName(obj: Record): string { - return Object.keys(obj)[0]; + return Object.keys(obj)[0] } function App() { - const componentName = getComponentName({ - App - }); - return
+ const componentName = getComponentName({ App }) + return ( +
Component Name is {componentName} -
; +
+ ) } function OtherComponent() { - const componentName = getComponentName({ - App - }); - return
App component name is {componentName}
; + const componentName = getComponentName({ App }) + return
App component name is {componentName}
} -export { App as component }; \ No newline at end of file +export { App as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/conditional-properties.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/conditional-properties.tsx index c20dcdc135..e8296b890b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/conditional-properties.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/conditional-properties.tsx @@ -1,9 +1,11 @@ -const $$splitLoaderImporter = () => import('conditional-properties.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -const $$splitComponentImporter = () => import('conditional-properties.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => + import('conditional-properties.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +const $$splitComponentImporter = () => + import('conditional-properties.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/posts')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/conditional-properties@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/conditional-properties@component---errorComponent---notFoundComponent---pendingComponent.tsx index aaf3410c69..e460c54467 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/conditional-properties@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/conditional-properties@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,5 +1,5 @@ -import { isEnabled } from '@features/feature-flags'; -import TrueImport from '@modules/true-component'; -import { FalseComponent } from '@modules/false-component'; -const SplitComponent = isEnabled ? TrueImport.Component : FalseComponent; -export { SplitComponent as component }; \ No newline at end of file +import { isEnabled } from '@features/feature-flags' +import TrueImport from '@modules/true-component' +import { FalseComponent } from '@modules/false-component' +const SplitComponent = isEnabled ? TrueImport.Component : FalseComponent +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/conditional-properties@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/conditional-properties@loader.tsx index e10f305ddc..e5872a344c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/conditional-properties@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/conditional-properties@loader.tsx @@ -1,5 +1,5 @@ -import { isEnabled } from '@features/feature-flags'; -import TrueImport from '@modules/true-component'; -import { falseLoader } from '@modules/false-component'; -const SplitLoader = isEnabled ? TrueImport.loader : falseLoader; -export { SplitLoader as loader }; \ No newline at end of file +import { isEnabled } from '@features/feature-flags' +import TrueImport from '@modules/true-component' +import { falseLoader } from '@modules/false-component' +const SplitLoader = isEnabled ? TrueImport.loader : falseLoader +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export-multiple.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export-multiple.tsx index e411fd54d8..f9e740d637 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export-multiple.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export-multiple.tsx @@ -1,15 +1,13 @@ -const $$splitComponentImporter = () => import('destructured-export-multiple.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('destructured-export-multiple.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const getConfig = () => ({ baseUrl: 'https://api.example.com', - timeout: 5000 -}); -export const { - baseUrl, - timeout -} = getConfig(); -export const [first, second] = [1, 2]; + timeout: 5000, +}) +export const { baseUrl, timeout } = getConfig() +export const [first, second] = [1, 2] export const Route = createFileRoute('/about')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export-multiple@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export-multiple@component---errorComponent---notFoundComponent---pendingComponent.tsx index 9441b5a689..6a15a59c0a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export-multiple@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export-multiple@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,8 +1,10 @@ -import { baseUrl, timeout } from "destructured-export-multiple.tsx"; +import { baseUrl, timeout } from 'destructured-export-multiple.tsx' function AboutComponent() { - return
+ return ( +

Base URL: {baseUrl}

Timeout: {timeout}

-
; +
+ ) } -export { AboutComponent as component }; \ No newline at end of file +export { AboutComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export-nested.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export-nested.tsx index 076c24b06f..f4fafce158 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export-nested.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export-nested.tsx @@ -1,19 +1,16 @@ -const $$splitComponentImporter = () => import('destructured-export-nested.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('destructured-export-nested.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' const getConfig = () => ({ - api: { - baseUrl: 'https://api.example.com' - }, + api: { baseUrl: 'https://api.example.com' }, timeout: 5000, - extra: 'data' -}); + extra: 'data', +}) export const { - api: { - baseUrl - }, + api: { baseUrl }, ...rest -} = getConfig(); +} = getConfig() export const Route = createFileRoute('/about')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export-nested@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export-nested@component---errorComponent---notFoundComponent---pendingComponent.tsx index 8ba46e33e1..9bc538525f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export-nested@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export-nested@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,7 +1,9 @@ -import { baseUrl } from "destructured-export-nested.tsx"; +import { baseUrl } from 'destructured-export-nested.tsx' function AboutComponent() { - return
+ return ( +

Base URL: {baseUrl}

-
; +
+ ) } -export { AboutComponent as component }; \ No newline at end of file +export { AboutComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export.tsx index 3f79ca544b..b56d070279 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export.tsx @@ -1,17 +1,11 @@ -const $$splitComponentImporter = () => import('destructured-export.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('destructured-export.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export function getObjectCallback() { - return { - getObject: () => ({ - constA: 10, - constB: 5 - }) - }; + return { getObject: () => ({ constA: 10, constB: 5 }) } } -export const { - getObject -} = getObjectCallback(); +export const { getObject } = getObjectCallback() export const Route = createFileRoute('/about')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export@component---errorComponent---notFoundComponent---pendingComponent.tsx index f58942d5af..b0abbd2e6e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,14 +1,11 @@ export function getObjectCallback() { - return { - getObject: () => ({ - constA: 10, - constB: 5 - }) - }; + return { getObject: () => ({ constA: 10, constB: 5 }) } } function AboutComponent() { - return
+ return ( +

About

-
; +
+ ) } -export { AboutComponent as component }; \ No newline at end of file +export { AboutComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export@loader.tsx index 45fb19eecd..024e0e620e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-export@loader.tsx @@ -1,8 +1,3 @@ export function getObjectCallback() { - return { - getObject: () => ({ - constA: 10, - constB: 5 - }) - }; -} \ No newline at end of file + return { getObject: () => ({ constA: 10, constB: 5 }) } +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-react-memo-imported-component.tsx index c27220acce..e914a58628 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-react-memo-imported-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-react-memo-imported-component.tsx @@ -1,9 +1,11 @@ -const $$splitLoaderImporter = () => import('destructured-react-memo-imported-component.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -const $$splitComponentImporter = () => import('destructured-react-memo-imported-component.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => + import('destructured-react-memo-imported-component.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +const $$splitComponentImporter = () => + import('destructured-react-memo-imported-component.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-react-memo-imported-component@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-react-memo-imported-component@component---errorComponent---notFoundComponent---pendingComponent.tsx index 446d55e26b..88dcdf6e48 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-react-memo-imported-component@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-react-memo-imported-component@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,6 +1,6 @@ -import { memo } from 'react'; +import { memo } from 'react' function Component() { - return
Component
; + return
Component
} -const SplitComponent = memo(Component); -export { SplitComponent as component }; \ No newline at end of file +const SplitComponent = memo(Component) +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-react-memo-imported-component@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-react-memo-imported-component@loader.tsx index 52e811be53..8691aec6ff 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-react-memo-imported-component@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-react-memo-imported-component@loader.tsx @@ -1,3 +1,3 @@ -import { importedLoader } from '../../shared/imported'; -const SplitLoader = importedLoader; -export { SplitLoader as loader }; \ No newline at end of file +import { importedLoader } from '../../shared/imported' +const SplitLoader = importedLoader +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-route-options-defaults.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-route-options-defaults.tsx index 1759b05846..bf26704b82 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-route-options-defaults.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-route-options-defaults.tsx @@ -1,9 +1,11 @@ -const $$splitLoaderImporter = () => import('destructured-route-options-defaults.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -const $$splitComponentImporter = () => import('destructured-route-options-defaults.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => + import('destructured-route-options-defaults.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +const $$splitComponentImporter = () => + import('destructured-route-options-defaults.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/about')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-route-options-defaults@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-route-options-defaults@component---errorComponent---notFoundComponent---pendingComponent.tsx index c73696ff32..c26d6be33d 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-route-options-defaults@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-route-options-defaults@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,2 +1,2 @@ -import { MyComponent } from "destructured-route-options-defaults.tsx?tsr-shared=1"; -export { MyComponent as component }; \ No newline at end of file +import { MyComponent } from 'destructured-route-options-defaults.tsx?tsr-shared=1' +export { MyComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-route-options-defaults@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-route-options-defaults@loader.tsx index 99d9619b91..3caedc3e55 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-route-options-defaults@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-route-options-defaults@loader.tsx @@ -1,2 +1,2 @@ -import { loader } from "destructured-route-options-defaults.tsx?tsr-shared=1"; -export { loader }; \ No newline at end of file +import { loader } from 'destructured-route-options-defaults.tsx?tsr-shared=1' +export { loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-route-options-defaults@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-route-options-defaults@shared.tsx index fdc9acef5b..a7dee6af52 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-route-options-defaults@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructured-route-options-defaults@shared.tsx @@ -1,22 +1,23 @@ function defaultLoader() { - return { - message: 'default' - }; + return { message: 'default' } } function DefaultComponent() { - return
Default
; + return
Default
} const createBits = () => ({ component: ActualComponent, - loader: () => ({ - message: 'hello' - }) -}); -const { - component: MyComponent = DefaultComponent, - loader = defaultLoader -} = createBits(); + loader: () => ({ message: 'hello' }), +}) +const { component: MyComponent = DefaultComponent, loader = defaultLoader } = + createBits() function ActualComponent() { - return
About
; + return
About
+} +export { + ActualComponent, + createBits, + DefaultComponent, + defaultLoader, + loader, + MyComponent, } -export { ActualComponent, createBits, DefaultComponent, defaultLoader, loader, MyComponent }; \ No newline at end of file diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructuring.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructuring.tsx index d80f17484f..112fded569 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructuring.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructuring.tsx @@ -1,11 +1,9 @@ import thing from 'thing' - export function test() { const { foo: { bar: { destructured }, }, } = thing - return destructured } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructuring@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructuring@component---errorComponent---notFoundComponent---pendingComponent.tsx index 858c5c0e05..112fded569 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructuring@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructuring@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,11 +1,9 @@ -import thing from 'thing'; +import thing from 'thing' export function test() { const { foo: { - bar: { - destructured - } - } - } = thing; - return destructured; -} \ No newline at end of file + bar: { destructured }, + }, + } = thing + return destructured +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructuring@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructuring@loader.tsx index 858c5c0e05..112fded569 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructuring@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/destructuring@loader.tsx @@ -1,11 +1,9 @@ -import thing from 'thing'; +import thing from 'thing' export function test() { const { foo: { - bar: { - destructured - } - } - } = thing; - return destructured; -} \ No newline at end of file + bar: { destructured }, + }, + } = thing + return destructured +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/directive-prologue.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/directive-prologue.tsx index 12d3529331..a5bca5a02c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/directive-prologue.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/directive-prologue.tsx @@ -1,8 +1,8 @@ -'use client'; - -const $$splitComponentImporter = () => import('directive-prologue.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +'use client' +const $$splitComponentImporter = () => + import('directive-prologue.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/directive')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/directive-prologue@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/directive-prologue@component---errorComponent---notFoundComponent---pendingComponent.tsx index ce7cd5e5ee..9ee4bd8f4c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/directive-prologue@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/directive-prologue@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,6 +1,5 @@ -'use client'; - +'use client' const SplitComponent = () => { - return
directive preserved
; -}; -export { SplitComponent as component }; \ No newline at end of file + return
directive preserved
+} +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/explicit-undefined-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/explicit-undefined-component.tsx index 4fdd9d1c68..8109a89624 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/explicit-undefined-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/explicit-undefined-component.tsx @@ -1,6 +1,3 @@ import React from 'react' import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/')({ - component: undefined, -}) +export const Route = createFileRoute('/')({ component: undefined }) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/explicit-undefined-component@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/explicit-undefined-component@component---errorComponent---notFoundComponent---pendingComponent.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/explicit-undefined-component@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/explicit-undefined-component@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/explicit-undefined-component@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/explicit-undefined-component@loader.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/explicit-undefined-component@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/explicit-undefined-component@loader.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component-and-normal-notFound.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component-and-normal-notFound.tsx index 0ca25a7017..fc6cef74a4 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component-and-normal-notFound.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component-and-normal-notFound.tsx @@ -1,15 +1,23 @@ -console.warn("[tanstack-router] These exports from \"export-default-component-and-normal-notFound.tsx\" will not be code-split and will increase your bundle size:\n- Home\nFor the best optimization, these items should either have their export statements removed, or be imported from another location that is not a route file."); -const $$splitNotFoundComponentImporter = () => import('export-default-component-and-normal-notFound.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import React, { useState } from 'react'; -import { createFileRoute } from '@tanstack/react-router'; +console.warn( + '[tanstack-router] These exports from "export-default-component-and-normal-notFound.tsx" will not be code-split and will increase your bundle size:\n- Home\nFor the best optimization, these items should either have their export statements removed, or be imported from another location that is not a route file.', +) +const $$splitNotFoundComponentImporter = () => + import('export-default-component-and-normal-notFound.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import React, { useState } from 'react' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/home')({ component: Home, - notFoundComponent: lazyRouteComponent($$splitNotFoundComponentImporter, 'notFoundComponent') -}); + notFoundComponent: lazyRouteComponent( + $$splitNotFoundComponentImporter, + 'notFoundComponent', + ), +}) export default function Home() { - const [one, setOne] = useState('this is from a state'); - return
+ const [one, setOne] = useState('this is from a state') + return ( +

{one}

-
; -} \ No newline at end of file +
+ ) +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component-and-normal-notFound@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component-and-normal-notFound@component---errorComponent---notFoundComponent---pendingComponent.tsx index 62cd0a1036..3da924c04c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component-and-normal-notFound@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component-and-normal-notFound@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,5 +1,5 @@ -import React from 'react'; +import React from 'react' function NotFoundComponent() { - return
Not Found
; + return
Not Found
} -export { NotFoundComponent as notFoundComponent }; \ No newline at end of file +export { NotFoundComponent as notFoundComponent } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component-and-normal-notFound@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component-and-normal-notFound@loader.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component-and-normal-notFound@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component-and-normal-notFound@loader.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component.tsx index c5198b9e00..de2d748c91 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component.tsx @@ -1,13 +1,8 @@ import React, { useState } from 'react' import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/home')({ - component: Home, -}) - +export const Route = createFileRoute('/home')({ component: Home }) export default function Home() { const [one, setOne] = useState('this is from a state') - return (

{one}

diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component@component---errorComponent---notFoundComponent---pendingComponent.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component@loader.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/export-default-component@loader.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-as-parameter.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-as-parameter.tsx index 3ae9710cd5..817b89d69a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-as-parameter.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-as-parameter.tsx @@ -1,29 +1,20 @@ import * as React from 'react' // @ts-expect-error import { useMemo } from 'tan-react' - const useUsedVar = 'i-am-unused' - const ReactUseMemoCall1 = React.useMemo(function performAction() { return 'true' }, []) - console.info(ReactUseMemoCall1) - const ReactUseMemoCall2 = React.useMemo(() => { return 'true' }, []) - console.info(ReactUseMemoCall2) - const UseMemoCall1 = useMemo(function performAction() { return 'true' }, []) - console.info(UseMemoCall1) - const UseMemoCall2 = useMemo(() => { return 'true' }, []) - console.info(UseMemoCall2) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-as-parameter@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-as-parameter@component---errorComponent---notFoundComponent---pendingComponent.tsx index 23e2cd0f03..817b89d69a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-as-parameter@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-as-parameter@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,20 +1,20 @@ -import * as React from 'react'; +import * as React from 'react' // @ts-expect-error -import { useMemo } from 'tan-react'; -const useUsedVar = 'i-am-unused'; +import { useMemo } from 'tan-react' +const useUsedVar = 'i-am-unused' const ReactUseMemoCall1 = React.useMemo(function performAction() { - return 'true'; -}, []); -console.info(ReactUseMemoCall1); + return 'true' +}, []) +console.info(ReactUseMemoCall1) const ReactUseMemoCall2 = React.useMemo(() => { - return 'true'; -}, []); -console.info(ReactUseMemoCall2); + return 'true' +}, []) +console.info(ReactUseMemoCall2) const UseMemoCall1 = useMemo(function performAction() { - return 'true'; -}, []); -console.info(UseMemoCall1); + return 'true' +}, []) +console.info(UseMemoCall1) const UseMemoCall2 = useMemo(() => { - return 'true'; -}, []); -console.info(UseMemoCall2); \ No newline at end of file + return 'true' +}, []) +console.info(UseMemoCall2) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-as-parameter@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-as-parameter@loader.tsx index 23e2cd0f03..817b89d69a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-as-parameter@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-as-parameter@loader.tsx @@ -1,20 +1,20 @@ -import * as React from 'react'; +import * as React from 'react' // @ts-expect-error -import { useMemo } from 'tan-react'; -const useUsedVar = 'i-am-unused'; +import { useMemo } from 'tan-react' +const useUsedVar = 'i-am-unused' const ReactUseMemoCall1 = React.useMemo(function performAction() { - return 'true'; -}, []); -console.info(ReactUseMemoCall1); + return 'true' +}, []) +console.info(ReactUseMemoCall1) const ReactUseMemoCall2 = React.useMemo(() => { - return 'true'; -}, []); -console.info(ReactUseMemoCall2); + return 'true' +}, []) +console.info(ReactUseMemoCall2) const UseMemoCall1 = useMemo(function performAction() { - return 'true'; -}, []); -console.info(UseMemoCall1); + return 'true' +}, []) +console.info(UseMemoCall1) const UseMemoCall2 = useMemo(() => { - return 'true'; -}, []); -console.info(UseMemoCall2); \ No newline at end of file + return 'true' +}, []) +console.info(UseMemoCall2) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-declaration.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-declaration.tsx index c191f9fddd..b12490e0a5 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-declaration.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-declaration.tsx @@ -1,10 +1,12 @@ -const $$splitComponentImporter = () => import('function-declaration.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('function-declaration.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('function-declaration.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('function-declaration.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/posts')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-declaration@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-declaration@component---errorComponent---notFoundComponent---pendingComponent.tsx index 3476c52d54..a0ebf07dee 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-declaration@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-declaration@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,27 +1,31 @@ -import * as React from 'react'; -import { Link, Outlet } from '@tanstack/react-router'; -import { Route } from "function-declaration.tsx"; +import * as React from 'react' +import { Link, Outlet } from '@tanstack/react-router' +import { Route } from 'function-declaration.tsx' function PostsComponent() { - const posts = Route.useLoaderData(); - return
+ const posts = Route.useLoaderData() + return ( +
    - {[...posts, { - id: 'i-do-not-exist', - title: 'Non-existent Post' - }]?.map(post => { - return
  • - + {[...posts, { id: 'i-do-not-exist', title: 'Non-existent Post' }]?.map( + (post) => { + return ( +
  • +
    {post.title.substring(0, 20)}
    -
  • ; - })} + + ) + }, + )}

-
; +
+ ) } -export { PostsComponent as component }; \ No newline at end of file +export { PostsComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-declaration@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-declaration@loader.tsx index cb195afdd8..1c4fc213ed 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-declaration@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/function-declaration@loader.tsx @@ -1,4 +1,4 @@ -import * as React from 'react'; -import { fetchPosts } from '../posts'; -const SplitLoader = fetchPosts; -export { SplitLoader as loader }; \ No newline at end of file +import * as React from 'react' +import { fetchPosts } from '../posts' +const SplitLoader = fetchPosts +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/importAttribute.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/importAttribute.tsx index e2aab465f5..b6b9c182dc 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/importAttribute.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/importAttribute.tsx @@ -1,6 +1,7 @@ -const $$splitComponentImporter = () => import('importAttribute.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('importAttribute.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/importAttribute@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/importAttribute@component---errorComponent---notFoundComponent---pendingComponent.tsx index f34d3c6408..88abef0c00 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/importAttribute@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/importAttribute@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ -import { test } from './test' with { type: 'macro' }; -const SplitComponent = () => test; -export { SplitComponent as component }; \ No newline at end of file +import { test } from './test' with { type: 'macro' } +const SplitComponent = () => test +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component-destructured-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component-destructured-loader.tsx index 70d5be8c3f..969129bdf2 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component-destructured-loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component-destructured-loader.tsx @@ -1,9 +1,11 @@ -const $$splitLoaderImporter = () => import('imported-default-component-destructured-loader.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -const $$splitComponentImporter = () => import('imported-default-component-destructured-loader.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => + import('imported-default-component-destructured-loader.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +const $$splitComponentImporter = () => + import('imported-default-component-destructured-loader.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component-destructured-loader@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component-destructured-loader@component---errorComponent---notFoundComponent---pendingComponent.tsx index d21b198c98..9350cda9e8 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component-destructured-loader@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component-destructured-loader@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ -import importedComponent from '../../shared/imported'; -const SplitComponent = importedComponent; -export { SplitComponent as component }; \ No newline at end of file +import importedComponent from '../../shared/imported' +const SplitComponent = importedComponent +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component-destructured-loader@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component-destructured-loader@loader.tsx index 52e811be53..8691aec6ff 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component-destructured-loader@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component-destructured-loader@loader.tsx @@ -1,3 +1,3 @@ -import { importedLoader } from '../../shared/imported'; -const SplitLoader = importedLoader; -export { SplitLoader as loader }; \ No newline at end of file +import { importedLoader } from '../../shared/imported' +const SplitLoader = importedLoader +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component.tsx index 601c1f656a..f793a41de9 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component.tsx @@ -1,6 +1,7 @@ -const $$splitComponentImporter = () => import('imported-default-component.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('imported-default-component.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component@component---errorComponent---notFoundComponent---pendingComponent.tsx index 31ccf07c52..d356227040 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-default-component@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ -import ImportedDefaultComponent from '../../shared/imported'; -const SplitComponent = ImportedDefaultComponent; -export { SplitComponent as component }; \ No newline at end of file +import ImportedDefaultComponent from '../../shared/imported' +const SplitComponent = ImportedDefaultComponent +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-errorComponent.tsx index 4df12c02de..13e87eb7f1 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-errorComponent.tsx @@ -1,8 +1,13 @@ -const $$splitErrorComponentImporter = () => import('imported-errorComponent.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -const $$splitComponentImporter = () => import('imported-errorComponent.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitErrorComponentImporter = () => + import('imported-errorComponent.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +const $$splitComponentImporter = () => + import('imported-errorComponent.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') -}); \ No newline at end of file + errorComponent: lazyRouteComponent( + $$splitErrorComponentImporter, + 'errorComponent', + ), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-errorComponent@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-errorComponent@component---errorComponent---notFoundComponent---pendingComponent.tsx index d8a0fcf9ff..b5bded20a6 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-errorComponent@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-errorComponent@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,5 +1,7 @@ -import ImportedDefaultComponent, { importedErrorComponent } from '../../shared/imported'; -const SplitComponent = ImportedDefaultComponent; -export { SplitComponent as component }; -const SplitErrorComponent = importedErrorComponent; -export { SplitErrorComponent as errorComponent }; \ No newline at end of file +import ImportedDefaultComponent, { + importedErrorComponent, +} from '../../shared/imported' +const SplitComponent = ImportedDefaultComponent +export { SplitComponent as component } +const SplitErrorComponent = importedErrorComponent +export { SplitErrorComponent as errorComponent } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-notFoundComponent.tsx index 716ec0ca3a..48b7f7f6bf 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-notFoundComponent.tsx @@ -1,8 +1,13 @@ -const $$splitNotFoundComponentImporter = () => import('imported-notFoundComponent.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -const $$splitComponentImporter = () => import('imported-notFoundComponent.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitNotFoundComponentImporter = () => + import('imported-notFoundComponent.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +const $$splitComponentImporter = () => + import('imported-notFoundComponent.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - notFoundComponent: lazyRouteComponent($$splitNotFoundComponentImporter, 'notFoundComponent') -}); \ No newline at end of file + notFoundComponent: lazyRouteComponent( + $$splitNotFoundComponentImporter, + 'notFoundComponent', + ), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-notFoundComponent@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-notFoundComponent@component---errorComponent---notFoundComponent---pendingComponent.tsx index 1273c7c50d..9f904a1a19 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-notFoundComponent@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-notFoundComponent@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,5 +1,7 @@ -import ImportedDefaultComponent, { importedNotFoundComponent } from '../../shared/imported'; -const SplitComponent = ImportedDefaultComponent; -export { SplitComponent as component }; -const SplitNotFoundComponent = importedNotFoundComponent; -export { SplitNotFoundComponent as notFoundComponent }; \ No newline at end of file +import ImportedDefaultComponent, { + importedNotFoundComponent, +} from '../../shared/imported' +const SplitComponent = ImportedDefaultComponent +export { SplitComponent as component } +const SplitNotFoundComponent = importedNotFoundComponent +export { SplitNotFoundComponent as notFoundComponent } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-pendingComponent.tsx index 5a5aa789f7..c22e117560 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-pendingComponent.tsx @@ -1,8 +1,13 @@ -const $$splitPendingComponentImporter = () => import('imported-pendingComponent.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -const $$splitComponentImporter = () => import('imported-pendingComponent.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitPendingComponentImporter = () => + import('imported-pendingComponent.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +const $$splitComponentImporter = () => + import('imported-pendingComponent.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - pendingComponent: lazyRouteComponent($$splitPendingComponentImporter, 'pendingComponent') -}); \ No newline at end of file + pendingComponent: lazyRouteComponent( + $$splitPendingComponentImporter, + 'pendingComponent', + ), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-pendingComponent@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-pendingComponent@component---errorComponent---notFoundComponent---pendingComponent.tsx index 0368000afa..d24c7b1505 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-pendingComponent@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported-pendingComponent@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,5 +1,7 @@ -import ImportedDefaultComponent, { importedPendingComponent } from '../../shared/imported'; -const SplitComponent = ImportedDefaultComponent; -export { SplitComponent as component }; -const SplitPendingComponent = importedPendingComponent; -export { SplitPendingComponent as pendingComponent }; \ No newline at end of file +import ImportedDefaultComponent, { + importedPendingComponent, +} from '../../shared/imported' +const SplitComponent = ImportedDefaultComponent +export { SplitComponent as component } +const SplitPendingComponent = importedPendingComponent +export { SplitPendingComponent as pendingComponent } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported.tsx index dd3299b1b1..54a7733167 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported.tsx @@ -1,9 +1,10 @@ -const $$splitLoaderImporter = () => import('imported.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -const $$splitComponentImporter = () => import('imported.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => import('imported.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +const $$splitComponentImporter = () => + import('imported.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported@component---errorComponent---notFoundComponent---pendingComponent.tsx index 5bc9da8d43..e3c06dbe9e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ -import { importedComponent } from '../../shared'; -const SplitComponent = importedComponent; -export { SplitComponent as component }; \ No newline at end of file +import { importedComponent } from '../../shared' +const SplitComponent = importedComponent +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported@loader.tsx index 9b91fafd91..d0418cbce3 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/imported@loader.tsx @@ -1,3 +1,3 @@ -import { importedLoader } from '../../shared'; -const SplitLoader = importedLoader; -export { SplitLoader as loader }; \ No newline at end of file +import { importedLoader } from '../../shared' +const SplitLoader = importedLoader +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/inline.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/inline.tsx index 960f639c0a..3c27842428 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/inline.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/inline.tsx @@ -1,9 +1,10 @@ -const $$splitComponentImporter = () => import('inline.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('inline.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); -Route.addChildren([]); -export const test = 'test'; \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) +Route.addChildren([]) +export const test = 'test' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/inline@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/inline@component---errorComponent---notFoundComponent---pendingComponent.tsx index 58ccfb2903..d28b872634 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/inline@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/inline@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,18 +1,18 @@ -import * as React from 'react'; -import * as styles from '../style.css'; -import { TEST_DATA } from '../test.const'; -const Button = (props: { - children: any; -}) => { - return ; -}; -import { Route } from "inline.tsx"; -import { test } from "inline.tsx"; +import * as React from 'react' +import * as styles from '../style.css' +import { TEST_DATA } from '../test.const' +const Button = (props: { children: any }) => { + return +} +import { Route } from 'inline.tsx' +import { test } from 'inline.tsx' const SplitComponent = () => { - return
- {test} -

{TEST_DATA.welcome}

- -
; -}; -export { SplitComponent as component }; \ No newline at end of file + return ( +
+ {test} +

{TEST_DATA.welcome}

+ +
+ ) +} +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/inline@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/inline@loader.tsx index 9236af6021..23fab71edc 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/inline@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/inline@loader.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -import { Route } from "inline.tsx"; \ No newline at end of file +import * as React from 'react' +import { Route } from 'inline.tsx' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/lowercase-function-declaration.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/lowercase-function-declaration.tsx index 75657cb44a..79ef82a7af 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/lowercase-function-declaration.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/lowercase-function-declaration.tsx @@ -1,10 +1,19 @@ -const $$splitErrorComponentImporter = () => import('lowercase-function-declaration.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -const $$splitPendingComponentImporter = () => import('lowercase-function-declaration.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -const $$splitComponentImporter = () => import('lowercase-function-declaration.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitErrorComponentImporter = () => + import('lowercase-function-declaration.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +const $$splitPendingComponentImporter = () => + import('lowercase-function-declaration.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +const $$splitComponentImporter = () => + import('lowercase-function-declaration.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - pendingComponent: lazyRouteComponent($$splitPendingComponentImporter, 'pendingComponent'), - errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') -}); \ No newline at end of file + pendingComponent: lazyRouteComponent( + $$splitPendingComponentImporter, + 'pendingComponent', + ), + errorComponent: lazyRouteComponent( + $$splitErrorComponentImporter, + 'errorComponent', + ), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/lowercase-function-declaration@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/lowercase-function-declaration@component---errorComponent---notFoundComponent---pendingComponent.tsx index 86876d616e..ec003091fb 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/lowercase-function-declaration@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/lowercase-function-declaration@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,12 +1,12 @@ function component() { - return
lowercase function declaration
; + return
lowercase function declaration
} function pendingComponent() { - return
lowercase pending function declaration
; + return
lowercase pending function declaration
} function errorComponent() { - return
lowercase error function declaration
; + return
lowercase error function declaration
} -export { component }; -export { pendingComponent }; -export { errorComponent }; \ No newline at end of file +export { component } +export { pendingComponent } +export { errorComponent } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/random-number.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/random-number.tsx index a345d17ae7..440e1f4253 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/random-number.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/random-number.tsx @@ -1,28 +1,41 @@ -const $$splitComponentImporter = () => import('random-number.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('random-number.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -import { Await, Link, createFileRoute } from '@tanstack/react-router'; -import { Carbon } from '~/components/Carbon'; -import { twMerge } from 'tailwind-merge'; -import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa'; -import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg'; -import { Footer } from '~/components/Footer'; -import SponsorPack from '~/components/SponsorPack'; -import { LogoColor } from '~/components/LogoColor'; -import agGridImage from '~/images/ag-grid.png'; -import nozzleImage from '~/images/nozzle.png'; -import bytesImage from '~/images/bytes.svg'; -import bytesUidotdevImage from '~/images/bytes-uidotdev.png'; -export const textColors = [`text-rose-500`, `text-yellow-500`, `text-teal-500`, `text-blue-500`]; -export const gradients = [`from-rose-500 to-yellow-500`, `from-yellow-500 to-teal-500`, `from-teal-500 to-violet-500`, `from-blue-500 to-pink-500`]; -const courses = [{ - name: 'The Official TanStack React Query Course', - cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, - href: 'https://query.gg/?s=tanstack', - description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.` -}]; +const $$splitComponentImporter = () => + import('random-number.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => import('random-number.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +import { Await, Link, createFileRoute } from '@tanstack/react-router' +import { Carbon } from '~/components/Carbon' +import { twMerge } from 'tailwind-merge' +import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa' +import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg' +import { Footer } from '~/components/Footer' +import SponsorPack from '~/components/SponsorPack' +import { LogoColor } from '~/components/LogoColor' +import agGridImage from '~/images/ag-grid.png' +import nozzleImage from '~/images/nozzle.png' +import bytesImage from '~/images/bytes.svg' +import bytesUidotdevImage from '~/images/bytes-uidotdev.png' +export const textColors = [ + `text-rose-500`, + `text-yellow-500`, + `text-teal-500`, + `text-blue-500`, +] +export const gradients = [ + `from-rose-500 to-yellow-500`, + `from-yellow-500 to-teal-500`, + `from-teal-500 to-violet-500`, + `from-blue-500 to-pink-500`, +] +const courses = [ + { + name: 'The Official TanStack React Query Course', + cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, + href: 'https://query.gg/?s=tanstack', + description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.`, + }, +] export const Route = createFileRoute('/')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/random-number@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/random-number@component---errorComponent---notFoundComponent---pendingComponent.tsx index 9ed6d15184..26a9f9c142 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/random-number@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/random-number@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,61 +1,48 @@ -import { Await, Link } from '@tanstack/react-router'; -import { Carbon } from '~/components/Carbon'; -import { twMerge } from 'tailwind-merge'; -import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa'; -import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg'; -import { Footer } from '~/components/Footer'; -import SponsorPack from '~/components/SponsorPack'; -import { LogoColor } from '~/components/LogoColor'; -import discordImage from '~/images/discord-logo-white.svg'; -import agGridImage from '~/images/ag-grid.png'; -import nozzleImage from '~/images/nozzle.png'; -import bytesImage from '~/images/bytes.svg'; -import bytesUidotdevImage from '~/images/bytes-uidotdev.png'; -import { useMutation } from '~/hooks/useMutation'; -import { sample } from '~/utils/utils'; -import { textColors } from "random-number.tsx"; -import { gradients } from "random-number.tsx"; -const courses = [{ - name: 'The Official TanStack React Query Course', - cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, - href: 'https://query.gg/?s=tanstack', - description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.` -}]; -import { Route } from "random-number.tsx"; -async function bytesSignupServerFn({ - email -}: { - email: string; -}) { - 'use server'; - +import { Await, Link } from '@tanstack/react-router' +import { Carbon } from '~/components/Carbon' +import { twMerge } from 'tailwind-merge' +import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa' +import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg' +import { Footer } from '~/components/Footer' +import SponsorPack from '~/components/SponsorPack' +import { LogoColor } from '~/components/LogoColor' +import discordImage from '~/images/discord-logo-white.svg' +import agGridImage from '~/images/ag-grid.png' +import nozzleImage from '~/images/nozzle.png' +import bytesImage from '~/images/bytes.svg' +import bytesUidotdevImage from '~/images/bytes-uidotdev.png' +import { useMutation } from '~/hooks/useMutation' +import { sample } from '~/utils/utils' +import { textColors } from 'random-number.tsx' +import { gradients } from 'random-number.tsx' +const courses = [ + { + name: 'The Official TanStack React Query Course', + cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, + href: 'https://query.gg/?s=tanstack', + description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.`, + }, +] +import { Route } from 'random-number.tsx' +async function bytesSignupServerFn({ email }: { email: string }) { + 'use server' return fetch(`https://bytes.dev/api/bytes-optin-cors`, { method: 'POST', - body: JSON.stringify({ - email, - influencer: 'tanstack' - }), - headers: { - Accept: 'application/json', - 'Content-Type': 'application/json' - } - }); + body: JSON.stringify({ email, influencer: 'tanstack' }), + headers: { Accept: 'application/json', 'Content-Type': 'application/json' }, + }) } function Index() { - const bytesSignupMutation = useMutation({ - fn: bytesSignupServerFn - }); - const { - sponsorsPromise, - randomNumber, - testing2 - } = Route.useLoaderData(); - const gradient = sample(gradients, randomNumber); - const textColor = sample(textColors, randomNumber); - return <> + const bytesSignupMutation = useMutation({ fn: bytesSignupServerFn }) + const { sponsorsPromise, randomNumber, testing2 } = Route.useLoaderData() + const gradient = sample(gradients, randomNumber) + const textColor = sample(textColors, randomNumber) + return ( + <> {discordImage} {gradient} {textColor} - ; + + ) } -export { Index as component }; \ No newline at end of file +export { Index as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/random-number@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/random-number@loader.tsx index 9f854acfb0..0e7d41451e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/random-number@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/random-number@loader.tsx @@ -1,26 +1,28 @@ -import { Await, Link, defer } from '@tanstack/react-router'; -import { Carbon } from '~/components/Carbon'; -import { twMerge } from 'tailwind-merge'; -import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa'; -import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg'; -import { Footer } from '~/components/Footer'; -import SponsorPack from '~/components/SponsorPack'; -import { LogoColor } from '~/components/LogoColor'; -import { getSponsorsForSponsorPack } from '~/server/sponsors'; -import agGridImage from '~/images/ag-grid.png'; -import nozzleImage from '~/images/nozzle.png'; -import bytesImage from '~/images/bytes.svg'; -import bytesUidotdevImage from '~/images/bytes-uidotdev.png'; -const courses = [{ - name: 'The Official TanStack React Query Course', - cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, - href: 'https://query.gg/?s=tanstack', - description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.` -}]; +import { Await, Link, defer } from '@tanstack/react-router' +import { Carbon } from '~/components/Carbon' +import { twMerge } from 'tailwind-merge' +import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa' +import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg' +import { Footer } from '~/components/Footer' +import SponsorPack from '~/components/SponsorPack' +import { LogoColor } from '~/components/LogoColor' +import { getSponsorsForSponsorPack } from '~/server/sponsors' +import agGridImage from '~/images/ag-grid.png' +import nozzleImage from '~/images/nozzle.png' +import bytesImage from '~/images/bytes.svg' +import bytesUidotdevImage from '~/images/bytes-uidotdev.png' +const courses = [ + { + name: 'The Official TanStack React Query Course', + cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, + href: 'https://query.gg/?s=tanstack', + description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.`, + }, +] const SplitLoader = () => { return { randomNumber: Math.random(), - sponsorsPromise: defer(getSponsorsForSponsorPack()) - }; -}; -export { SplitLoader as loader }; \ No newline at end of file + sponsorsPromise: defer(getSponsorsForSponsorPack()), + } +} +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-component.tsx index eea3e62996..9be4f76d08 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-component.tsx @@ -1,9 +1,11 @@ -const $$splitLoaderImporter = () => import('react-memo-component.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -const $$splitComponentImporter = () => import('react-memo-component.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => + import('react-memo-component.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +const $$splitComponentImporter = () => + import('react-memo-component.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-component@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-component@component---errorComponent---notFoundComponent---pendingComponent.tsx index dfef29c9e3..6bdb537fe9 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-component@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-component@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,6 +1,6 @@ -import React from 'react'; +import React from 'react' function Component() { - return
Component
; + return
Component
} -const SplitComponent = React.memo(Component); -export { SplitComponent as component }; \ No newline at end of file +const SplitComponent = React.memo(Component) +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-component@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-component@loader.tsx index 52e811be53..8691aec6ff 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-component@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-component@loader.tsx @@ -1,3 +1,3 @@ -import { importedLoader } from '../../shared/imported'; -const SplitLoader = importedLoader; -export { SplitLoader as loader }; \ No newline at end of file +import { importedLoader } from '../../shared/imported' +const SplitLoader = importedLoader +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-imported-component.tsx index e445bcbb72..2637f8de7a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-imported-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-imported-component.tsx @@ -1,9 +1,11 @@ -const $$splitLoaderImporter = () => import('react-memo-imported-component.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -const $$splitComponentImporter = () => import('react-memo-imported-component.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => + import('react-memo-imported-component.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +const $$splitComponentImporter = () => + import('react-memo-imported-component.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-imported-component@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-imported-component@component---errorComponent---notFoundComponent---pendingComponent.tsx index 540812230e..d162a1aeaf 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-imported-component@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-imported-component@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,4 +1,4 @@ -import React from 'react'; -import { importedComponent } from '../../shared/imported'; -const SplitComponent = React.memo(importedComponent); -export { SplitComponent as component }; \ No newline at end of file +import React from 'react' +import { importedComponent } from '../../shared/imported' +const SplitComponent = React.memo(importedComponent) +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-imported-component@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-imported-component@loader.tsx index 52e811be53..8691aec6ff 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-imported-component@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/react-memo-imported-component@loader.tsx @@ -1,3 +1,3 @@ -import { importedLoader } from '../../shared/imported'; -const SplitLoader = importedLoader; -export { SplitLoader as loader }; \ No newline at end of file +import { importedLoader } from '../../shared/imported' +const SplitLoader = importedLoader +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-export-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-export-component.tsx index f22aa236e1..1b374dd690 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-export-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-export-component.tsx @@ -1,14 +1,16 @@ -console.warn("[tanstack-router] These exports from \"retain-export-component.tsx\" will not be code-split and will increase your bundle size:\n- Layout\nFor the best optimization, these items should either have their export statements removed, or be imported from another location that is not a route file."); -const $$splitLoaderImporter = () => import('retain-export-component.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute, Outlet } from '@tanstack/react-router'; -import { importedComponent as ImportedComponent } from '../../shared/imported'; +console.warn( + '[tanstack-router] These exports from "retain-export-component.tsx" will not be code-split and will increase your bundle size:\n- Layout\nFor the best optimization, these items should either have their export statements removed, or be imported from another location that is not a route file.', +) +const $$splitLoaderImporter = () => + import('retain-export-component.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute, Outlet } from '@tanstack/react-router' +import { importedComponent as ImportedComponent } from '../../shared/imported' export function Layout() { - return
-
+ return ( +
+
-
; +
+ ) } export const Route = createFileRoute('/_layout')({ component: Layout, - loader: lazyFn($$splitLoaderImporter, 'loader') -}); -const HEADER_HEIGHT = '63px'; -export const SIDEBAR_WIDTH = '150px'; -const SIDEBAR_MINI_WIDTH = '80px'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) +const HEADER_HEIGHT = '63px' +export const SIDEBAR_WIDTH = '150px' +const SIDEBAR_MINI_WIDTH = '80px' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-export-component@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-export-component@component---errorComponent---notFoundComponent---pendingComponent.tsx index 5bb0ab5451..8fb12f0c6b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-export-component@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-export-component@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ -import * as React from 'react'; -const SIDEBAR_MINI_WIDTH = '80px'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const SIDEBAR_MINI_WIDTH = '80px' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-export-component@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-export-component@loader.tsx index 9787e27ad7..ddeb4d1e6f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-export-component@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-export-component@loader.tsx @@ -1,6 +1,6 @@ -import * as React from 'react'; -import { importedLoader } from '../../shared/imported'; -const SIDEBAR_MINI_WIDTH = '80px'; -const ASIDE_WIDTH = '250px'; -const SplitLoader = importedLoader; -export { SplitLoader as loader }; \ No newline at end of file +import * as React from 'react' +import { importedLoader } from '../../shared/imported' +const SIDEBAR_MINI_WIDTH = '80px' +const ASIDE_WIDTH = '250px' +const SplitLoader = importedLoader +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-const.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-const.tsx index f256b01a83..d674dbb799 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-const.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-const.tsx @@ -4,11 +4,9 @@ import { importedComponent as ImportedComponent, importedLoader, } from '../../shared/imported' - export const loaderFn = () => { return importedLoader() } - const Layout = () => { return (
@@ -26,15 +24,12 @@ const Layout = () => {
) } - export const Route = createFileRoute('/_layout')({ component: Layout, loader: loaderFn, }) - const HEADER_HEIGHT = '63px' export const SIDEBAR_WIDTH = '150px' export const SIDEBAR_MINI_WIDTH = '80px' const ASIDE_WIDTH = '250px' - export default Layout diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-const@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-const@component---errorComponent---notFoundComponent---pendingComponent.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-const@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-const@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-const@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-const@loader.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-const@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-const@loader.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-destructured.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-destructured.tsx index 0e3175116f..89c23305a0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-destructured.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-destructured.tsx @@ -1,18 +1,12 @@ import { createFileRoute } from '@tanstack/react-router' - const createBits = () => ({ component: AboutComponentImpl, - loader: () => ({ - message: 'hello', - }), + loader: () => ({ message: 'hello' }), }) - export const { component: AboutComponent, loader } = createBits() - function AboutComponentImpl() { return
About
} - export const Route = createFileRoute('/about')({ component: AboutComponent, loader, diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-destructured@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-destructured@component---errorComponent---notFoundComponent---pendingComponent.tsx index a6d57afe77..d64b42fdcc 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-destructured@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-destructured@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,2 +1,2 @@ -import { AboutComponent } from "retain-exports-destructured.tsx?tsr-shared=1"; -export { AboutComponent as component }; \ No newline at end of file +import { AboutComponent } from 'retain-exports-destructured.tsx?tsr-shared=1' +export { AboutComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-destructured@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-destructured@loader.tsx index e8d771ea44..0397569b0f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-destructured@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-destructured@loader.tsx @@ -1,2 +1,2 @@ -import { loader } from "retain-exports-destructured.tsx?tsr-shared=1"; -export { loader }; \ No newline at end of file +import { loader } from 'retain-exports-destructured.tsx?tsr-shared=1' +export { loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-destructured@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-destructured@shared.tsx index b03a4eb83a..6eff1ff083 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-destructured@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-destructured@shared.tsx @@ -1,14 +1,9 @@ const createBits = () => ({ component: AboutComponentImpl, - loader: () => ({ - message: 'hello' - }) -}); -const { - component: AboutComponent, - loader -} = createBits(); + loader: () => ({ message: 'hello' }), +}) +const { component: AboutComponent, loader } = createBits() function AboutComponentImpl() { - return
About
; + return
About
} -export { AboutComponent, AboutComponentImpl, createBits, loader }; \ No newline at end of file +export { AboutComponent, AboutComponentImpl, createBits, loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-function.tsx index 298c388e65..83b3dd4eb5 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-function.tsx @@ -4,11 +4,9 @@ import { importedComponent as ImportedComponent, importedLoader, } from '../../shared/imported' - export function loaderFn() { return importedLoader() } - function Layout() { return (
@@ -26,15 +24,12 @@ function Layout() {
) } - export const Route = createFileRoute('/_layout')({ component: Layout, loader: loaderFn, }) - const HEADER_HEIGHT = '63px' export const SIDEBAR_WIDTH = '150px' export const SIDEBAR_MINI_WIDTH = '80px' const ASIDE_WIDTH = '250px' - export default Layout diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-function@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-function@component---errorComponent---notFoundComponent---pendingComponent.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-function@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-function@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-function@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-function@loader.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-function@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-function@loader.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-loader.tsx index c7d5437729..ef230c47f6 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-loader.tsx @@ -1,17 +1,18 @@ -console.warn("[tanstack-router] These exports from \"retain-exports-loader.tsx\" will not be code-split and will increase your bundle size:\n- loaderFn\nFor the best optimization, these items should either have their export statements removed, or be imported from another location that is not a route file."); -const $$splitComponentImporter = () => import('retain-exports-loader.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; +console.warn( + '[tanstack-router] These exports from "retain-exports-loader.tsx" will not be code-split and will increase your bundle size:\n- loaderFn\nFor the best optimization, these items should either have their export statements removed, or be imported from another location that is not a route file.', +) +const $$splitComponentImporter = () => + import('retain-exports-loader.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' export function loaderFn() { - return { - foo: 'bar' - }; + return { foo: 'bar' } } export const Route = createFileRoute('/_layout')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: loaderFn -}); -export const SIDEBAR_WIDTH = '150px'; -export const SIDEBAR_MINI_WIDTH = '80px'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file + loader: loaderFn, +}) +export const SIDEBAR_WIDTH = '150px' +export const SIDEBAR_MINI_WIDTH = '80px' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-loader@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-loader@component---errorComponent---notFoundComponent---pendingComponent.tsx index 9f54ae0dc5..604be4dc69 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-loader@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-loader@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,11 +1,10 @@ -import * as React from 'react'; -import { Outlet } from '@tanstack/react-router'; -import { importedComponent as ImportedComponent } from '../../shared/imported'; +import * as React from 'react' +import { Outlet } from '@tanstack/react-router' +import { importedComponent as ImportedComponent } from '../../shared/imported' function Layout() { - return
-
+ return ( +
+
-
; +
+ ) } -const HEADER_HEIGHT = '63px'; -const ASIDE_WIDTH = '250px'; -export { Layout as component }; \ No newline at end of file +const HEADER_HEIGHT = '63px' +const ASIDE_WIDTH = '250px' +export { Layout as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-loader@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-loader@loader.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-loader@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/retain-exports-loader@loader.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-class.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-class.tsx index da068daa17..96d51c8492 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-class.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-class.tsx @@ -1,9 +1,10 @@ -const $$splitComponentImporter = () => import('shared-class.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-class.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-class.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => import('shared-class.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/store')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-class@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-class@component---errorComponent---notFoundComponent---pendingComponent.tsx index 6a38b10ff8..e0e187fb1d 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-class@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-class@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ -import { store } from "shared-class.tsx?tsr-shared=1"; -const SplitComponent = () =>
{store.get('items')}
; -export { SplitComponent as component }; \ No newline at end of file +import { store } from 'shared-class.tsx?tsr-shared=1' +const SplitComponent = () =>
{store.get('items')}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-class@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-class@loader.tsx index f91799f3c8..96dcaca4a8 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-class@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-class@loader.tsx @@ -1,5 +1,5 @@ -import { store } from "shared-class.tsx?tsr-shared=1"; +import { store } from 'shared-class.tsx?tsr-shared=1' const SplitLoader = async () => { - store.set('items', await fetch('/api')); -}; -export { SplitLoader as loader }; \ No newline at end of file + store.set('items', await fetch('/api')) +} +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-class@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-class@shared.tsx index 18c40bafb6..0abc282ecc 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-class@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-class@shared.tsx @@ -1,11 +1,11 @@ class DataStore { - data = new Map(); + data = new Map() get(k: string) { - return this.data.get(k); + return this.data.get(k) } set(k: string, v: unknown) { - this.data.set(k, v); + this.data.set(k, v) } } -const store = new DataStore(); -export { DataStore, store }; \ No newline at end of file +const store = new DataStore() +export { DataStore, store } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured-export.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured-export.tsx index 7d0f0fcae1..080a19ff45 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured-export.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured-export.tsx @@ -1,10 +1,12 @@ -const $$splitComponentImporter = () => import('shared-destructured-export.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-destructured-export.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-destructured-export.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-destructured-export.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/config')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); -export { apiUrl, timeout } from "shared-destructured-export.tsx?tsr-shared=1"; \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) +export { apiUrl, timeout } from 'shared-destructured-export.tsx?tsr-shared=1' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured-export@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured-export@component---errorComponent---notFoundComponent---pendingComponent.tsx index 16b288ac5f..8cd0f14a27 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured-export@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured-export@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ -import { timeout } from "shared-destructured-export.tsx?tsr-shared=1"; -const SplitComponent = () =>
Timeout: {timeout}
; -export { SplitComponent as component }; \ No newline at end of file +import { timeout } from 'shared-destructured-export.tsx?tsr-shared=1' +const SplitComponent = () =>
Timeout: {timeout}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured-export@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured-export@loader.tsx index 33d4b5aa43..d099459c6f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured-export@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured-export@loader.tsx @@ -1,3 +1,3 @@ -import { apiUrl } from "shared-destructured-export.tsx?tsr-shared=1"; -const SplitLoader = async () => fetch(apiUrl); -export { SplitLoader as loader }; \ No newline at end of file +import { apiUrl } from 'shared-destructured-export.tsx?tsr-shared=1' +const SplitLoader = async () => fetch(apiUrl) +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured-export@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured-export@shared.tsx index f0bfd70add..ae9324acc9 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured-export@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured-export@shared.tsx @@ -1,11 +1,5 @@ -const { - apiUrl, - timeout -} = getConfig(); +const { apiUrl, timeout } = getConfig() function getConfig() { - return { - apiUrl: '/api', - timeout: 5000 - }; + return { apiUrl: '/api', timeout: 5000 } } -export { apiUrl, getConfig, timeout }; \ No newline at end of file +export { apiUrl, getConfig, timeout } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured.tsx index 8185738e9d..7c46a40bb3 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured.tsx @@ -1,9 +1,11 @@ -const $$splitComponentImporter = () => import('shared-destructured.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-destructured.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-destructured.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-destructured.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/config')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured@component---errorComponent---notFoundComponent---pendingComponent.tsx index 5c0182e61a..3d7933a573 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ -import { timeout } from "shared-destructured.tsx?tsr-shared=1"; -const SplitComponent = () =>
Timeout: {timeout}
; -export { SplitComponent as component }; \ No newline at end of file +import { timeout } from 'shared-destructured.tsx?tsr-shared=1' +const SplitComponent = () =>
Timeout: {timeout}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured@loader.tsx index 94b0923079..53e56d748d 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured@loader.tsx @@ -1,3 +1,3 @@ -import { apiUrl } from "shared-destructured.tsx?tsr-shared=1"; -const SplitLoader = async () => fetch(apiUrl); -export { SplitLoader as loader }; \ No newline at end of file +import { apiUrl } from 'shared-destructured.tsx?tsr-shared=1' +const SplitLoader = async () => fetch(apiUrl) +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured@shared.tsx index f0bfd70add..ae9324acc9 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-destructured@shared.tsx @@ -1,11 +1,5 @@ -const { - apiUrl, - timeout -} = getConfig(); +const { apiUrl, timeout } = getConfig() function getConfig() { - return { - apiUrl: '/api', - timeout: 5000 - }; + return { apiUrl: '/api', timeout: 5000 } } -export { apiUrl, getConfig, timeout }; \ No newline at end of file +export { apiUrl, getConfig, timeout } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-exported.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-exported.tsx index ce690311b2..bf6574aaed 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-exported.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-exported.tsx @@ -1,10 +1,12 @@ -const $$splitComponentImporter = () => import('shared-exported.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-exported.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-exported.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-exported.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/query')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); -export { queryOptions } from "shared-exported.tsx?tsr-shared=1"; \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) +export { queryOptions } from 'shared-exported.tsx?tsr-shared=1' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-exported@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-exported@component---errorComponent---notFoundComponent---pendingComponent.tsx index b020b5cadf..9fe61942dd 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-exported@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-exported@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ -import { queryOptions } from "shared-exported.tsx?tsr-shared=1"; -const SplitComponent = () =>
GC: {queryOptions.gcTime}
; -export { SplitComponent as component }; \ No newline at end of file +import { queryOptions } from 'shared-exported.tsx?tsr-shared=1' +const SplitComponent = () =>
GC: {queryOptions.gcTime}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-exported@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-exported@loader.tsx index 332fa35079..4d4b8fbc5c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-exported@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-exported@loader.tsx @@ -1,7 +1,5 @@ -import { queryOptions } from "shared-exported.tsx?tsr-shared=1"; +import { queryOptions } from 'shared-exported.tsx?tsr-shared=1' const SplitLoader = async () => { - return { - staleTime: queryOptions.staleTime - }; -}; -export { SplitLoader as loader }; \ No newline at end of file + return { staleTime: queryOptions.staleTime } +} +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-exported@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-exported@shared.tsx index a3f91b85bb..3a1ff108bb 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-exported@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-exported@shared.tsx @@ -1,5 +1,2 @@ -const queryOptions = { - staleTime: 5000, - gcTime: 10000 -}; -export { queryOptions }; \ No newline at end of file +const queryOptions = { staleTime: 5000, gcTime: 10000 } +export { queryOptions } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-function.tsx index b5bf41235e..ef2e5e57a3 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-function.tsx @@ -1,9 +1,11 @@ -const $$splitComponentImporter = () => import('shared-function.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-function.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-function.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-function.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/cached')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-function@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-function@component---errorComponent---notFoundComponent---pendingComponent.tsx index 571bd9356a..1c327523af 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-function@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-function@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ -import { getCached } from "shared-function.tsx?tsr-shared=1"; -const SplitComponent = () =>
{JSON.stringify(getCached('data'))}
; -export { SplitComponent as component }; \ No newline at end of file +import { getCached } from 'shared-function.tsx?tsr-shared=1' +const SplitComponent = () =>
{JSON.stringify(getCached('data'))}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-function@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-function@loader.tsx index f5f72ab014..d8ae45caed 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-function@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-function@loader.tsx @@ -1,9 +1,9 @@ -import { getCached, cache } from "shared-function.tsx?tsr-shared=1"; +import { getCached, cache } from 'shared-function.tsx?tsr-shared=1' function setCached(key: string, val: unknown) { - cache.set(key, val); + cache.set(key, val) } const SplitLoader = async () => { - setCached('data', await fetch('/api').then(r => r.json())); - return getCached('data'); -}; -export { SplitLoader as loader }; \ No newline at end of file + setCached('data', await fetch('/api').then((r) => r.json())) + return getCached('data') +} +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-function@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-function@shared.tsx index 27d2cf03f1..243ac23a66 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-function@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-function@shared.tsx @@ -1,5 +1,5 @@ -const cache = new Map(); +const cache = new Map() function getCached(key: string) { - return cache.get(key); + return cache.get(key) } -export { cache, getCached }; \ No newline at end of file +export { cache, getCached } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-imported-binding.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-imported-binding.tsx index d9ce6828fa..30823e2684 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-imported-binding.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-imported-binding.tsx @@ -1,9 +1,11 @@ -const $$splitComponentImporter = () => import('shared-imported-binding.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-imported-binding.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-imported-binding.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-imported-binding.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/imported')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-imported-binding@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-imported-binding@component---errorComponent---notFoundComponent---pendingComponent.tsx index 0a835ae063..e3c8a0f5d8 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-imported-binding@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-imported-binding@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ -import { sharedUtil } from '../utils'; -const SplitComponent = () =>
{sharedUtil('render')}
; -export { SplitComponent as component }; \ No newline at end of file +import { sharedUtil } from '../utils' +const SplitComponent = () =>
{sharedUtil('render')}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-imported-binding@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-imported-binding@loader.tsx index 1b27de9093..8b8c645837 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-imported-binding@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-imported-binding@loader.tsx @@ -1,3 +1,3 @@ -import { sharedUtil } from '../utils'; -const SplitLoader = async () => sharedUtil('load'); -export { SplitLoader as loader }; \ No newline at end of file +import { sharedUtil } from '../utils' +const SplitLoader = async () => sharedUtil('load') +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-indirect-ref.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-indirect-ref.tsx index f4dfce52ba..17ae801b02 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-indirect-ref.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-indirect-ref.tsx @@ -1,9 +1,11 @@ -const $$splitComponentImporter = () => import('shared-indirect-ref.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-indirect-ref.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-indirect-ref.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-indirect-ref.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/shared-indirect')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-indirect-ref@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-indirect-ref@component---errorComponent---notFoundComponent---pendingComponent.tsx index 62995e7fd8..64bb6ab567 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-indirect-ref@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-indirect-ref@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,7 +1,9 @@ -import { state, getCount } from "shared-indirect-ref.tsx?tsr-shared=1"; +import { state, getCount } from 'shared-indirect-ref.tsx?tsr-shared=1' function SharedComponent() { - return
+ return ( +
{getCount()} - {state.count} -
; +
+ ) } -export { SharedComponent as component }; \ No newline at end of file +export { SharedComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-indirect-ref@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-indirect-ref@loader.tsx index 0625ac53f8..6b4c2c895b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-indirect-ref@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-indirect-ref@loader.tsx @@ -1,8 +1,6 @@ -import { state, getCount } from "shared-indirect-ref.tsx?tsr-shared=1"; +import { state, getCount } from 'shared-indirect-ref.tsx?tsr-shared=1' const SplitLoader = () => { - state.count++; - return { - count: getCount() - }; -}; -export { SplitLoader as loader }; \ No newline at end of file + state.count++ + return { count: getCount() } +} +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-indirect-ref@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-indirect-ref@shared.tsx index 7e7e811ba8..b4910d2fd1 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-indirect-ref@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-indirect-ref@shared.tsx @@ -1,7 +1,5 @@ -const state = { - count: 0 -}; +const state = { count: 0 } function getCount() { - return state.count; + return state.count } -export { getCount, state }; \ No newline at end of file +export { getCount, state } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-jsx-component-ref.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-jsx-component-ref.tsx index 8ac24d49cf..fd6b2c69be 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-jsx-component-ref.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-jsx-component-ref.tsx @@ -1,10 +1,12 @@ -const $$splitComponentImporter = () => import('shared-jsx-component-ref.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-jsx-component-ref.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-jsx-component-ref.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-jsx-component-ref.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' // @ts-nocheck -import { createFileRoute } from '@tanstack/react-router'; +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/jsx')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-jsx-component-ref@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-jsx-component-ref@component---errorComponent---notFoundComponent---pendingComponent.tsx index 52ecb6d474..845e1db45c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-jsx-component-ref@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-jsx-component-ref@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,5 +1,5 @@ -import { shared } from "shared-jsx-component-ref.tsx?tsr-shared=1"; // @ts-nocheck +import { shared } from 'shared-jsx-component-ref.tsx?tsr-shared=1' // @ts-nocheck function SharedComponent() { - return
{shared}
; + return
{shared}
} -export { SharedComponent as component }; \ No newline at end of file +export { SharedComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-jsx-component-ref@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-jsx-component-ref@loader.tsx index f861dda436..348aecd923 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-jsx-component-ref@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-jsx-component-ref@loader.tsx @@ -1,3 +1,3 @@ -import { shared } from "shared-jsx-component-ref.tsx?tsr-shared=1"; // @ts-nocheck -const SplitLoader = () => shared; -export { SplitLoader as loader }; \ No newline at end of file +import { shared } from 'shared-jsx-component-ref.tsx?tsr-shared=1' // @ts-nocheck +const SplitLoader = () => shared +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-jsx-component-ref@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-jsx-component-ref@shared.tsx index d5cc2cf990..60ae1006a1 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-jsx-component-ref@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-jsx-component-ref@shared.tsx @@ -1,4 +1,3 @@ // @ts-nocheck - -const shared = 1; -export { shared }; \ No newline at end of file +const shared = 1 +export { shared } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-none.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-none.tsx index 06e81042d6..5ecfa3b109 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-none.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-none.tsx @@ -1,9 +1,10 @@ -const $$splitComponentImporter = () => import('shared-none.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-none.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-none.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => import('shared-none.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/clean')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-none@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-none@component---errorComponent---notFoundComponent---pendingComponent.tsx index 701deeedeb..1bfd4eb63f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-none@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-none@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,5 +1,7 @@ -const ComponentHelper = () => helper; -const SplitComponent = () =>
- -
; -export { SplitComponent as component }; \ No newline at end of file +const ComponentHelper = () => helper +const SplitComponent = () => ( +
+ +
+) +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-none@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-none@loader.tsx index d0cfce36ee..0dfbec2515 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-none@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-none@loader.tsx @@ -1,3 +1,3 @@ -const loaderHelper = () => fetch('/api'); -const SplitLoader = async () => loaderHelper(); -export { SplitLoader as loader }; \ No newline at end of file +const loaderHelper = () => fetch('/api') +const SplitLoader = async () => loaderHelper() +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-referencing-route.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-referencing-route.tsx index b62568c1fb..5a3509f434 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-referencing-route.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-referencing-route.tsx @@ -1,9 +1,11 @@ -const $$splitComponentImporter = () => import('shared-referencing-route.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-referencing-route.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-referencing-route.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-referencing-route.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/about')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-referencing-route@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-referencing-route@component---errorComponent---notFoundComponent---pendingComponent.tsx index 2cb2cdb68c..b2c4630c90 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-referencing-route@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-referencing-route@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,10 +1,10 @@ -import { HEADER } from "shared-referencing-route.tsx?tsr-shared=1"; +import { HEADER } from 'shared-referencing-route.tsx?tsr-shared=1' function usePageTitle() { - return `${HEADER} - ${Route.fullPath}`; + return `${HEADER} - ${Route.fullPath}` } -import { Route } from "shared-referencing-route.tsx"; +import { Route } from 'shared-referencing-route.tsx' const SplitComponent = () => { - const title = usePageTitle(); - return
{title}
; -}; -export { SplitComponent as component }; \ No newline at end of file + const title = usePageTitle() + return
{title}
+} +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-referencing-route@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-referencing-route@loader.tsx index baedd53bd7..dbf196f1b3 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-referencing-route@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-referencing-route@loader.tsx @@ -1,12 +1,10 @@ -import { HEADER } from "shared-referencing-route.tsx?tsr-shared=1"; +import { HEADER } from 'shared-referencing-route.tsx?tsr-shared=1' function usePageTitle() { - return `${HEADER} - ${Route.fullPath}`; + return `${HEADER} - ${Route.fullPath}` } -import { Route } from "shared-referencing-route.tsx"; +import { Route } from 'shared-referencing-route.tsx' const SplitLoader = async () => { - const title = usePageTitle(); - return { - title - }; -}; -export { SplitLoader as loader }; \ No newline at end of file + const title = usePageTitle() + return { title } +} +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-referencing-route@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-referencing-route@shared.tsx index cc2d01424c..34b9c4ca41 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-referencing-route@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-referencing-route@shared.tsx @@ -1,2 +1,2 @@ -const HEADER = 'Page'; -export { HEADER }; \ No newline at end of file +const HEADER = 'Page' +export { HEADER } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime.tsx index bceb12d39a..944c0b8ca8 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime.tsx @@ -1,22 +1,20 @@ -import { state, createState, createSeed } from "shared-runtime.tsx?tsr-shared=1"; -const $$splitComponentImporter = () => import('shared-runtime.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-runtime.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -console.log('shared-runtime:reference'); +import { state, createState, createSeed } from 'shared-runtime.tsx?tsr-shared=1' +const $$splitComponentImporter = () => + import('shared-runtime.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-runtime.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +console.log('shared-runtime:reference') export const Route = createFileRoute('/shared-runtime')({ beforeLoad: () => state, loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); -function createState(initialState: { - count: number; -}): { - state: { - count: number; - }; - increment: () => number; -}; -export { state as firstState, state as secondState, state as 'odd-name' }; -export default createSeed; \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) +function createState(initialState: { count: number }): { + state: { count: number } + increment: () => number +} +export { state as firstState, state as secondState, state as 'odd-name' } +export default createSeed diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@component---errorComponent---notFoundComponent---pendingComponent.tsx index fbccf6c90b..5245f6d9eb 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,23 +1,24 @@ -import { state, createState, createSeed, Labels } from "shared-runtime.tsx?tsr-shared=1"; -const label = createComponentLabel(); -function createState(initialState: { - count: number; -}): { - state: { - count: number; - }; - increment: () => number; -}; -function createComponentLabel() { - console.log('shared-runtime:component'); - return Labels.component; +import { + state, + createState, + createSeed, + Labels, +} from 'shared-runtime.tsx?tsr-shared=1' +const label = createComponentLabel() +function createState(initialState: { count: number }): { + state: { count: number } + increment: () => number } -export { state as firstState, state as secondState, state as 'odd-name' }; -export default createSeed; +function createComponentLabel() { + console.log('shared-runtime:component') + return Labels.component +} +export { state as firstState, state as secondState, state as 'odd-name' } +export default createSeed const SplitComponent = () => { if (state.count === 3) { - throw new Error('route source-map contract'); + throw new Error('route source-map contract') } - return `${label}:${state.count}`; -}; -export { SplitComponent as component }; \ No newline at end of file + return `${label}:${state.count}` +} +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@loader.tsx index 6c797c0226..6c0c88cab7 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@loader.tsx @@ -1,16 +1,17 @@ -import { state, createState, createSeed, increment } from "shared-runtime.tsx?tsr-shared=1"; -function createState(initialState: { - count: number; -}): { - state: { - count: number; - }; - increment: () => number; -}; -export { state as firstState, state as secondState, state as 'odd-name' }; -export default createSeed; +import { + state, + createState, + createSeed, + increment, +} from 'shared-runtime.tsx?tsr-shared=1' +function createState(initialState: { count: number }): { + state: { count: number } + increment: () => number +} +export { state as firstState, state as secondState, state as 'odd-name' } +export default createSeed const SplitLoader = () => { - increment(); - return state; -}; -export { SplitLoader as loader }; \ No newline at end of file + increment() + return state +} +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@shared.tsx index 54239b6cc5..c53a7e1568 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-runtime@shared.tsx @@ -1,28 +1,13 @@ -const Count = { - Initial: 0 -}; -const Labels = { - component: 'count' -}; -const seed = createSeed(); -const { - state, - increment -} = createState(seed); +const Count = { Initial: 0 } +const Labels = { component: 'count' } +const seed = createSeed() +const { state, increment } = createState(seed) function createSeed() { - console.log('shared-runtime:seed'); - return { - count: Count.Initial, - label: Labels.component - }; + console.log('shared-runtime:seed') + return { count: Count.Initial, label: Labels.component } } -function createState(initialState: { - count: number; -}) { - console.log('shared-runtime:state'); - return { - state: initialState, - increment: () => initialState.count++ - }; +function createState(initialState: { count: number }) { + console.log('shared-runtime:state') + return { state: initialState, increment: () => initialState.count++ } } -export { Count, createSeed, createState, increment, Labels, seed, state }; \ No newline at end of file +export { Count, createSeed, createState, increment, Labels, seed, state } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-transitive.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-transitive.tsx index 869602e15b..aba85fd14b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-transitive.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-transitive.tsx @@ -1,9 +1,11 @@ -const $$splitComponentImporter = () => import('shared-transitive.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-transitive.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-transitive.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-transitive.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/api')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-transitive@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-transitive@component---errorComponent---notFoundComponent---pendingComponent.tsx index 7a3a74048e..c237a03583 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-transitive@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-transitive@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ -import { config } from "shared-transitive.tsx?tsr-shared=1"; -const SplitComponent = () =>
Timeout: {config.timeout}
; -export { SplitComponent as component }; \ No newline at end of file +import { config } from 'shared-transitive.tsx?tsr-shared=1' +const SplitComponent = () =>
Timeout: {config.timeout}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-transitive@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-transitive@loader.tsx index 8472eab295..70faa4c627 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-transitive@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-transitive@loader.tsx @@ -1,6 +1,6 @@ -import { config } from "shared-transitive.tsx?tsr-shared=1"; -const fetcher = (path: string) => fetch(`${config.url}${path}`); +import { config } from 'shared-transitive.tsx?tsr-shared=1' +const fetcher = (path: string) => fetch(`${config.url}${path}`) const SplitLoader = async () => { - return fetcher('/data'); -}; -export { SplitLoader as loader }; \ No newline at end of file + return fetcher('/data') +} +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-transitive@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-transitive@shared.tsx index 8bec4a1d55..ac44498714 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-transitive@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-transitive@shared.tsx @@ -1,6 +1,3 @@ -const BASE_URL = 'https://api.example.com'; -const config = { - url: BASE_URL, - timeout: 5000 -}; -export { BASE_URL, config }; \ No newline at end of file +const BASE_URL = 'https://api.example.com' +const config = { url: BASE_URL, timeout: 5000 } +export { BASE_URL, config } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-variable.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-variable.tsx index 42f68cce48..e06ea2b1d2 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-variable.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-variable.tsx @@ -1,9 +1,11 @@ -const $$splitComponentImporter = () => import('shared-variable.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-variable.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-variable.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-variable.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/todos')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-variable@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-variable@component---errorComponent---notFoundComponent---pendingComponent.tsx index d149922fbc..10325aa95e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-variable@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-variable@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ -import { collection } from "shared-variable.tsx?tsr-shared=1"; -const SplitComponent = () =>
{collection.name}
; -export { SplitComponent as component }; \ No newline at end of file +import { collection } from 'shared-variable.tsx?tsr-shared=1' +const SplitComponent = () =>
{collection.name}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-variable@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-variable@loader.tsx index 196a8e48a4..b76d00b514 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-variable@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-variable@loader.tsx @@ -1,8 +1,6 @@ -import { collection } from "shared-variable.tsx?tsr-shared=1"; +import { collection } from 'shared-variable.tsx?tsr-shared=1' const SplitLoader = async () => { - await collection.preload(); - return { - data: 'loaded' - }; -}; -export { SplitLoader as loader }; \ No newline at end of file + await collection.preload() + return { data: 'loaded' } +} +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-variable@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-variable@shared.tsx index 8a0560d5b9..10421dac09 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-variable@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-variable@shared.tsx @@ -1,5 +1,2 @@ -const collection = { - name: 'todos', - preload: async () => {} -}; -export { collection }; \ No newline at end of file +const collection = { name: 'todos', preload: async () => {} } +export { collection } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-with-side-effect.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-with-side-effect.tsx index 943cdf189c..5965d04430 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-with-side-effect.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-with-side-effect.tsx @@ -1,10 +1,12 @@ -const $$splitComponentImporter = () => import('shared-with-side-effect.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-with-side-effect.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -console.log('registry created'); +const $$splitComponentImporter = () => + import('shared-with-side-effect.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-with-side-effect.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +console.log('registry created') export const Route = createFileRoute('/fx')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-with-side-effect@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-with-side-effect@component---errorComponent---notFoundComponent---pendingComponent.tsx index d953af00fa..3ede22c8be 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-with-side-effect@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-with-side-effect@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ -import { registry } from "shared-with-side-effect.tsx?tsr-shared=1"; -const SplitComponent = () =>
{registry.size}
; -export { SplitComponent as component }; \ No newline at end of file +import { registry } from 'shared-with-side-effect.tsx?tsr-shared=1' +const SplitComponent = () =>
{registry.size}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-with-side-effect@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-with-side-effect@loader.tsx index a5f06a0a05..b3b404a8ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-with-side-effect@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-with-side-effect@loader.tsx @@ -1,5 +1,5 @@ -import { registry } from "shared-with-side-effect.tsx?tsr-shared=1"; +import { registry } from 'shared-with-side-effect.tsx?tsr-shared=1' const SplitLoader = async () => { - registry.set('loaded', true); -}; -export { SplitLoader as loader }; \ No newline at end of file + registry.set('loaded', true) +} +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-with-side-effect@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-with-side-effect@shared.tsx index f26c656fdd..a59298f9e0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-with-side-effect@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/shared-with-side-effect@shared.tsx @@ -1,2 +1,2 @@ -const registry = new Map(); -export { registry }; \ No newline at end of file +const registry = new Map() +export { registry } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/undefined-literals.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/undefined-literals.tsx index 0c6e4f01aa..88b0bf1ba8 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/undefined-literals.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/undefined-literals.tsx @@ -1,5 +1,4 @@ import { createFileRoute } from '@tanstack/react-router' - export const Route = createFileRoute('/undefined-test')({ component: undefined, errorComponent: undefined, diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/useStateDestructure.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/useStateDestructure.tsx index d0de09bf8b..b5b3ecade6 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/useStateDestructure.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/useStateDestructure.tsx @@ -1,5 +1,4 @@ import * as React from 'react' - import { CgCornerUpLeft, CgSpinner } from 'react-icons/cg' import { FaBolt, @@ -21,7 +20,6 @@ import { startProject } from '~/projects/start' import { createFileRoute } from '@tanstack/react-router' import { Framework, getBranch } from '~/projects' import { seo } from '~/utils/seo' - const menu = [ { label: ( @@ -72,31 +70,22 @@ const menu = [ to: `https://cottonbureau.com/people/tanstack`, }, ] - export const Route = createFileRoute('/_libraries/start/$version/')({ component: VersionIndex, meta: () => - seo({ - title: startProject.name, - description: startProject.description, - }), + seo({ title: startProject.name, description: startProject.description }), }) - const librariesRouteApi = getRouteApi('/_libraries') - export default function VersionIndex() { const { sponsorsPromise } = librariesRouteApi.useLoaderData() const { version } = Route.useParams() const branch = getBranch(startProject, version) const [framework, setFramework] = React.useState('react') const [isDark, setIsDark] = React.useState(true) - React.useEffect(() => { setIsDark(window.matchMedia?.(`(prefers-color-scheme: dark)`).matches) }, []) - const gradientText = `inline-block text-transparent bg-clip-text bg-gradient-to-r ${startProject.colorFrom} ${startProject.colorTo}` - return (
{item.label}
) - return (
{item.to.startsWith('http') ? ( @@ -269,7 +257,6 @@ Check it out at https://tanstack.com/start/`,
*/} - {/*

@@ -315,7 +302,6 @@ Check it out at https://tanstack.com/start/`, })}

*/} - {/*
Trusted in Production by @@ -358,7 +344,6 @@ Check it out at https://tanstack.com/start/`,
*/} -

Partners @@ -388,16 +373,13 @@ Check it out at https://tanstack.com/start/`,

-

Sponsors

-
@@ -429,7 +410,6 @@ Check it out at https://tanstack.com/start/`, rage-quit OSS. Yay money! 😉
- {/*

@@ -468,7 +448,6 @@ Check it out at https://tanstack.com/start/`,

*/} - {/* {[''].includes(framework) ? (
@@ -503,7 +482,6 @@ Check it out at https://tanstack.com/start/`, >
)} */} - {/*
Wow, you've come a long way! diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/useStateDestructure@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/useStateDestructure@component---errorComponent---notFoundComponent---pendingComponent.tsx index 97b5481cf5..5cc3099643 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/useStateDestructure@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/useStateDestructure@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,2 +1,2 @@ -import { FaBolt, FaBook, FaCheckCircle, FaCogs } from 'react-icons/fa'; -import { VscPreview, VscWand } from 'react-icons/vsc'; \ No newline at end of file +import { FaBolt, FaBook, FaCheckCircle, FaCogs } from 'react-icons/fa' +import { VscPreview, VscWand } from 'react-icons/vsc' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/useStateDestructure@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/useStateDestructure@loader.tsx index 97b5481cf5..5cc3099643 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/useStateDestructure@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/useStateDestructure@loader.tsx @@ -1,2 +1,2 @@ -import { FaBolt, FaBook, FaCheckCircle, FaCogs } from 'react-icons/fa'; -import { VscPreview, VscWand } from 'react-icons/vsc'; \ No newline at end of file +import { FaBolt, FaBook, FaCheckCircle, FaCogs } from 'react-icons/fa' +import { VscPreview, VscWand } from 'react-icons/vsc' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/using.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/using.tsx index c58f0f663b..811b66a9d3 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/using.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/using.tsx @@ -1,5 +1,5 @@ -const $$splitLoaderImporter = () => import('using.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => import('using.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/react-router' export const Route = createFileRoute({ - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/using@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/using@loader.tsx index 7e4f4fde9b..3b60e73b8d 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/using@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/2-components-combined-loader-separate/using@loader.tsx @@ -1,17 +1,9 @@ const DummyPostResource = (postId: string) => ({ - postData: { - id: postId, - title: 'dummy', - body: 'dummy' - }, - [Symbol.dispose]: () => console.log('disposing!') -}); -const SplitLoader = ({ - params: { - postId - } -}) => { - using dummyPost = DummyPostResource(postId); - return dummyPost.postData; -}; -export { SplitLoader as loader }; \ No newline at end of file + postData: { id: postId, title: 'dummy', body: 'dummy' }, + [Symbol.dispose]: () => console.log('disposing!'), +}) +const SplitLoader = ({ params: { postId } }) => { + using dummyPost = DummyPostResource(postId) + return dummyPost.postData +} +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/arrow-function.tsx index 380087d43c..19dfb7e3ba 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/arrow-function.tsx @@ -1,10 +1,12 @@ -const $$splitComponentImporter = () => import('arrow-function.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('arrow-function.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('arrow-function.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('arrow-function.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/posts')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/arrow-function@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/arrow-function@component---loader---notFoundComponent---pendingComponent.tsx index 764043a59c..e2f2a1ccdb 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/arrow-function@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/arrow-function@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,30 +1,34 @@ -import * as React from 'react'; -import { Link, Outlet } from '@tanstack/react-router'; -import { fetchPosts } from '../posts'; -import { Route } from "arrow-function.tsx"; +import * as React from 'react' +import { Link, Outlet } from '@tanstack/react-router' +import { fetchPosts } from '../posts' +import { Route } from 'arrow-function.tsx' const PostsComponent = () => { - const posts = Route.useLoaderData(); - return
+ const posts = Route.useLoaderData() + return ( +
    - {[...posts, { - id: 'i-do-not-exist', - title: 'Non-existent Post' - }]?.map(post => { - return
  • - + {[...posts, { id: 'i-do-not-exist', title: 'Non-existent Post' }]?.map( + (post) => { + return ( +
  • +
    {post.title.substring(0, 20)}
    -
  • ; - })} + + ) + }, + )}

-
; -}; -const SplitLoader = fetchPosts; -export { SplitLoader as loader }; -export { PostsComponent as component }; \ No newline at end of file +
+ ) +} +const SplitLoader = fetchPosts +export { SplitLoader as loader } +export { PostsComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/arrow-function@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/arrow-function@errorComponent.tsx index 5f67a6fff1..371dc65868 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/arrow-function@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/arrow-function@errorComponent.tsx @@ -1 +1 @@ -import * as React from 'react'; \ No newline at end of file +import * as React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/boolean-null-literals.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/boolean-null-literals.tsx index d3f54dd789..68fd7fc203 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/boolean-null-literals.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/boolean-null-literals.tsx @@ -1,13 +1,14 @@ -const $$splitLoaderImporter = () => import('boolean-null-literals.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -const $$splitComponentImporter = () => import('boolean-null-literals.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/router'; - +const $$splitLoaderImporter = () => + import('boolean-null-literals.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +const $$splitComponentImporter = () => + import('boolean-null-literals.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/router' // Test errorComponent with false literal export const Route = createFileRoute('/test')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), errorComponent: false, pendingComponent: null, - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/boolean-null-literals@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/boolean-null-literals@component---loader---notFoundComponent---pendingComponent.tsx index 40973b0328..7133d0d77e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/boolean-null-literals@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/boolean-null-literals@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,7 +1,5 @@ // Test errorComponent with false literal -const SplitLoader = async () => ({ - data: 'test' -}); -export { SplitLoader as loader }; -const SplitComponent = () =>
Test Component
; -export { SplitComponent as component }; \ No newline at end of file +const SplitLoader = async () => ({ data: 'test' }) +export { SplitLoader as loader } +const SplitComponent = () =>
Test Component
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/chinese.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/chinese.tsx index d08045e238..bfe965067d 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/chinese.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/chinese.tsx @@ -1,10 +1,11 @@ -const $$splitComponentImporter = () => import('chinese.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('chinese.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) interface DemoProps { - title: string; -} \ No newline at end of file + title: string +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/chinese@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/chinese@component---loader---notFoundComponent---pendingComponent.tsx index 003ca944a1..2ac1fa54ff 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/chinese@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/chinese@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,23 +1,27 @@ -import * as React from 'react'; +import * as React from 'react' function HomeComponent() { - return
+ return ( +
-
; +
+ ) } interface DemoProps { - title: string; + title: string } -function Demo({ - title -}: DemoProps) { - return

+function Demo({ title }: DemoProps) { + return ( +

{title} -

; + + ) } -export { HomeComponent as component }; \ No newline at end of file +export { HomeComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/chinese@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/chinese@errorComponent.tsx index b4de370f4e..cbcea8cc40 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/chinese@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/chinese@errorComponent.tsx @@ -1,4 +1,4 @@ -import * as React from 'react'; +import * as React from 'react' interface DemoProps { - title: string; -} \ No newline at end of file + title: string +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/circular-reference-arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/circular-reference-arrow-function.tsx index fe221be964..819a4a9bf4 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/circular-reference-arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/circular-reference-arrow-function.tsx @@ -1,6 +1,7 @@ -const $$splitComponentImporter = () => import('circular-reference-arrow-function.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('circular-reference-arrow-function.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/circular-reference-arrow-function@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/circular-reference-arrow-function@component---loader---notFoundComponent---pendingComponent.tsx index 39ace71ebe..59c5b5eec2 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/circular-reference-arrow-function@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/circular-reference-arrow-function@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,19 +1,17 @@ function getComponentName(obj: Record): string { - return Object.keys(obj)[0]; + return Object.keys(obj)[0] } const App = () => { - const componentName = getComponentName({ - App - }); - return
+ const componentName = getComponentName({ App }) + return ( +
Component Name is {componentName} -
; -}; -function OtherComponent() { - const componentName = getComponentName({ - App - }); - return
App component name is {componentName}
; +
+ ) } -export { App as component }; \ No newline at end of file +function OtherComponent() { + const componentName = getComponentName({ App }) + return
App component name is {componentName}
+} +export { App as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/circular-reference-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/circular-reference-function.tsx index 14d74d432d..d4a70c7341 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/circular-reference-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/circular-reference-function.tsx @@ -1,6 +1,7 @@ -const $$splitComponentImporter = () => import('circular-reference-function.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('circular-reference-function.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/circular-reference-function@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/circular-reference-function@component---loader---notFoundComponent---pendingComponent.tsx index 96a753ad8a..22fbb8669f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/circular-reference-function@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/circular-reference-function@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,19 +1,17 @@ function getComponentName(obj: Record): string { - return Object.keys(obj)[0]; + return Object.keys(obj)[0] } function App() { - const componentName = getComponentName({ - App - }); - return
+ const componentName = getComponentName({ App }) + return ( +
Component Name is {componentName} -
; +
+ ) } function OtherComponent() { - const componentName = getComponentName({ - App - }); - return
App component name is {componentName}
; + const componentName = getComponentName({ App }) + return
App component name is {componentName}
} -export { App as component }; \ No newline at end of file +export { App as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/conditional-properties.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/conditional-properties.tsx index dfb3b09c5e..3b956ec804 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/conditional-properties.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/conditional-properties.tsx @@ -1,9 +1,11 @@ -const $$splitLoaderImporter = () => import('conditional-properties.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -const $$splitComponentImporter = () => import('conditional-properties.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => + import('conditional-properties.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +const $$splitComponentImporter = () => + import('conditional-properties.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/posts')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/conditional-properties@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/conditional-properties@component---loader---notFoundComponent---pendingComponent.tsx index 857b130de7..88dcc8e930 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/conditional-properties@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/conditional-properties@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,7 +1,7 @@ -import { isEnabled } from '@features/feature-flags'; -import TrueImport from '@modules/true-component'; -import { FalseComponent, falseLoader } from '@modules/false-component'; -const SplitLoader = isEnabled ? TrueImport.loader : falseLoader; -export { SplitLoader as loader }; -const SplitComponent = isEnabled ? TrueImport.Component : FalseComponent; -export { SplitComponent as component }; \ No newline at end of file +import { isEnabled } from '@features/feature-flags' +import TrueImport from '@modules/true-component' +import { FalseComponent, falseLoader } from '@modules/false-component' +const SplitLoader = isEnabled ? TrueImport.loader : falseLoader +export { SplitLoader as loader } +const SplitComponent = isEnabled ? TrueImport.Component : FalseComponent +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export-multiple.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export-multiple.tsx index 8b823166e4..e3c598b0b5 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export-multiple.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export-multiple.tsx @@ -1,15 +1,13 @@ -const $$splitComponentImporter = () => import('destructured-export-multiple.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('destructured-export-multiple.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const getConfig = () => ({ baseUrl: 'https://api.example.com', - timeout: 5000 -}); -export const { - baseUrl, - timeout -} = getConfig(); -export const [first, second] = [1, 2]; + timeout: 5000, +}) +export const { baseUrl, timeout } = getConfig() +export const [first, second] = [1, 2] export const Route = createFileRoute('/about')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export-multiple@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export-multiple@component---loader---notFoundComponent---pendingComponent.tsx index 9441b5a689..6a15a59c0a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export-multiple@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export-multiple@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,8 +1,10 @@ -import { baseUrl, timeout } from "destructured-export-multiple.tsx"; +import { baseUrl, timeout } from 'destructured-export-multiple.tsx' function AboutComponent() { - return
+ return ( +

Base URL: {baseUrl}

Timeout: {timeout}

-
; +
+ ) } -export { AboutComponent as component }; \ No newline at end of file +export { AboutComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export-nested.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export-nested.tsx index 5920a891c0..f1608ec6dd 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export-nested.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export-nested.tsx @@ -1,19 +1,16 @@ -const $$splitComponentImporter = () => import('destructured-export-nested.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('destructured-export-nested.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' const getConfig = () => ({ - api: { - baseUrl: 'https://api.example.com' - }, + api: { baseUrl: 'https://api.example.com' }, timeout: 5000, - extra: 'data' -}); + extra: 'data', +}) export const { - api: { - baseUrl - }, + api: { baseUrl }, ...rest -} = getConfig(); +} = getConfig() export const Route = createFileRoute('/about')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export-nested@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export-nested@component---loader---notFoundComponent---pendingComponent.tsx index 8ba46e33e1..9bc538525f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export-nested@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export-nested@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,7 +1,9 @@ -import { baseUrl } from "destructured-export-nested.tsx"; +import { baseUrl } from 'destructured-export-nested.tsx' function AboutComponent() { - return
+ return ( +

Base URL: {baseUrl}

-
; +
+ ) } -export { AboutComponent as component }; \ No newline at end of file +export { AboutComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export.tsx index f573764824..397c6400f5 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export.tsx @@ -1,17 +1,11 @@ -const $$splitComponentImporter = () => import('destructured-export.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('destructured-export.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export function getObjectCallback() { - return { - getObject: () => ({ - constA: 10, - constB: 5 - }) - }; + return { getObject: () => ({ constA: 10, constB: 5 }) } } -export const { - getObject -} = getObjectCallback(); +export const { getObject } = getObjectCallback() export const Route = createFileRoute('/about')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export@component---loader---notFoundComponent---pendingComponent.tsx index f58942d5af..b0abbd2e6e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,14 +1,11 @@ export function getObjectCallback() { - return { - getObject: () => ({ - constA: 10, - constB: 5 - }) - }; + return { getObject: () => ({ constA: 10, constB: 5 }) } } function AboutComponent() { - return
+ return ( +

About

-
; +
+ ) } -export { AboutComponent as component }; \ No newline at end of file +export { AboutComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export@errorComponent.tsx index 45fb19eecd..024e0e620e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-export@errorComponent.tsx @@ -1,8 +1,3 @@ export function getObjectCallback() { - return { - getObject: () => ({ - constA: 10, - constB: 5 - }) - }; -} \ No newline at end of file + return { getObject: () => ({ constA: 10, constB: 5 }) } +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-react-memo-imported-component.tsx index 1776055cc2..b8053fff9e 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-react-memo-imported-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-react-memo-imported-component.tsx @@ -1,9 +1,11 @@ -const $$splitLoaderImporter = () => import('destructured-react-memo-imported-component.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -const $$splitComponentImporter = () => import('destructured-react-memo-imported-component.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => + import('destructured-react-memo-imported-component.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +const $$splitComponentImporter = () => + import('destructured-react-memo-imported-component.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-react-memo-imported-component@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-react-memo-imported-component@component---loader---notFoundComponent---pendingComponent.tsx index 931bed75b4..66f97a20d0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-react-memo-imported-component@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-react-memo-imported-component@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,9 +1,9 @@ -import { memo } from 'react'; -import { importedLoader } from '../../shared/imported'; +import { memo } from 'react' +import { importedLoader } from '../../shared/imported' function Component() { - return
Component
; + return
Component
} -const SplitLoader = importedLoader; -export { SplitLoader as loader }; -const SplitComponent = memo(Component); -export { SplitComponent as component }; \ No newline at end of file +const SplitLoader = importedLoader +export { SplitLoader as loader } +const SplitComponent = memo(Component) +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-route-options-defaults.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-route-options-defaults.tsx index 6cac408c56..636e017a64 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-route-options-defaults.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-route-options-defaults.tsx @@ -1,9 +1,11 @@ -const $$splitLoaderImporter = () => import('destructured-route-options-defaults.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -const $$splitComponentImporter = () => import('destructured-route-options-defaults.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => + import('destructured-route-options-defaults.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +const $$splitComponentImporter = () => + import('destructured-route-options-defaults.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/about')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-route-options-defaults@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-route-options-defaults@component---loader---notFoundComponent---pendingComponent.tsx index 2f8ef91c49..ae1cd17853 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-route-options-defaults@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructured-route-options-defaults@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,23 +1,17 @@ function defaultLoader() { - return { - message: 'default' - }; + return { message: 'default' } } function DefaultComponent() { - return
Default
; + return
Default
} const createBits = () => ({ component: ActualComponent, - loader: () => ({ - message: 'hello' - }) -}); -const { - component: MyComponent = DefaultComponent, - loader = defaultLoader -} = createBits(); + loader: () => ({ message: 'hello' }), +}) +const { component: MyComponent = DefaultComponent, loader = defaultLoader } = + createBits() function ActualComponent() { - return
About
; + return
About
} -export { loader }; -export { MyComponent as component }; \ No newline at end of file +export { loader } +export { MyComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructuring.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructuring.tsx index d80f17484f..112fded569 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructuring.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructuring.tsx @@ -1,11 +1,9 @@ import thing from 'thing' - export function test() { const { foo: { bar: { destructured }, }, } = thing - return destructured } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructuring@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructuring@component---loader---notFoundComponent---pendingComponent.tsx index 858c5c0e05..112fded569 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructuring@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructuring@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,11 +1,9 @@ -import thing from 'thing'; +import thing from 'thing' export function test() { const { foo: { - bar: { - destructured - } - } - } = thing; - return destructured; -} \ No newline at end of file + bar: { destructured }, + }, + } = thing + return destructured +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructuring@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructuring@errorComponent.tsx index 858c5c0e05..112fded569 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructuring@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/destructuring@errorComponent.tsx @@ -1,11 +1,9 @@ -import thing from 'thing'; +import thing from 'thing' export function test() { const { foo: { - bar: { - destructured - } - } - } = thing; - return destructured; -} \ No newline at end of file + bar: { destructured }, + }, + } = thing + return destructured +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/directive-prologue.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/directive-prologue.tsx index 178bec9bf7..b807ba9283 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/directive-prologue.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/directive-prologue.tsx @@ -1,8 +1,8 @@ -'use client'; - -const $$splitComponentImporter = () => import('directive-prologue.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +'use client' +const $$splitComponentImporter = () => + import('directive-prologue.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/directive')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/directive-prologue@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/directive-prologue@component---loader---notFoundComponent---pendingComponent.tsx index ce7cd5e5ee..9ee4bd8f4c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/directive-prologue@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/directive-prologue@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,6 +1,5 @@ -'use client'; - +'use client' const SplitComponent = () => { - return
directive preserved
; -}; -export { SplitComponent as component }; \ No newline at end of file + return
directive preserved
+} +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/explicit-undefined-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/explicit-undefined-component.tsx index 4fdd9d1c68..8109a89624 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/explicit-undefined-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/explicit-undefined-component.tsx @@ -1,6 +1,3 @@ import React from 'react' import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/')({ - component: undefined, -}) +export const Route = createFileRoute('/')({ component: undefined }) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/explicit-undefined-component@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/explicit-undefined-component@component---loader---notFoundComponent---pendingComponent.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/explicit-undefined-component@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/explicit-undefined-component@component---loader---notFoundComponent---pendingComponent.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/explicit-undefined-component@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/explicit-undefined-component@errorComponent.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/explicit-undefined-component@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/explicit-undefined-component@errorComponent.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component-and-normal-notFound.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component-and-normal-notFound.tsx index a3e020c559..534529220a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component-and-normal-notFound.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component-and-normal-notFound.tsx @@ -1,15 +1,23 @@ -console.warn("[tanstack-router] These exports from \"export-default-component-and-normal-notFound.tsx\" will not be code-split and will increase your bundle size:\n- Home\nFor the best optimization, these items should either have their export statements removed, or be imported from another location that is not a route file."); -const $$splitNotFoundComponentImporter = () => import('export-default-component-and-normal-notFound.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import React, { useState } from 'react'; -import { createFileRoute } from '@tanstack/react-router'; +console.warn( + '[tanstack-router] These exports from "export-default-component-and-normal-notFound.tsx" will not be code-split and will increase your bundle size:\n- Home\nFor the best optimization, these items should either have their export statements removed, or be imported from another location that is not a route file.', +) +const $$splitNotFoundComponentImporter = () => + import('export-default-component-and-normal-notFound.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import React, { useState } from 'react' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/home')({ component: Home, - notFoundComponent: lazyRouteComponent($$splitNotFoundComponentImporter, 'notFoundComponent') -}); + notFoundComponent: lazyRouteComponent( + $$splitNotFoundComponentImporter, + 'notFoundComponent', + ), +}) export default function Home() { - const [one, setOne] = useState('this is from a state'); - return
+ const [one, setOne] = useState('this is from a state') + return ( +

{one}

-
; -} \ No newline at end of file +
+ ) +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component-and-normal-notFound@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component-and-normal-notFound@component---loader---notFoundComponent---pendingComponent.tsx index 62cd0a1036..3da924c04c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component-and-normal-notFound@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component-and-normal-notFound@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,5 +1,5 @@ -import React from 'react'; +import React from 'react' function NotFoundComponent() { - return
Not Found
; + return
Not Found
} -export { NotFoundComponent as notFoundComponent }; \ No newline at end of file +export { NotFoundComponent as notFoundComponent } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component-and-normal-notFound@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component-and-normal-notFound@errorComponent.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component-and-normal-notFound@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component-and-normal-notFound@errorComponent.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component.tsx index c5198b9e00..de2d748c91 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component.tsx @@ -1,13 +1,8 @@ import React, { useState } from 'react' import { createFileRoute } from '@tanstack/react-router' - -export const Route = createFileRoute('/home')({ - component: Home, -}) - +export const Route = createFileRoute('/home')({ component: Home }) export default function Home() { const [one, setOne] = useState('this is from a state') - return (

{one}

diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component@component---loader---notFoundComponent---pendingComponent.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component@component---loader---notFoundComponent---pendingComponent.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component@errorComponent.tsx index b01f5e7863..b45dfaa8f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/export-default-component@errorComponent.tsx @@ -1 +1 @@ -import React from 'react'; \ No newline at end of file +import React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-as-parameter.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-as-parameter.tsx index 3ae9710cd5..817b89d69a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-as-parameter.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-as-parameter.tsx @@ -1,29 +1,20 @@ import * as React from 'react' // @ts-expect-error import { useMemo } from 'tan-react' - const useUsedVar = 'i-am-unused' - const ReactUseMemoCall1 = React.useMemo(function performAction() { return 'true' }, []) - console.info(ReactUseMemoCall1) - const ReactUseMemoCall2 = React.useMemo(() => { return 'true' }, []) - console.info(ReactUseMemoCall2) - const UseMemoCall1 = useMemo(function performAction() { return 'true' }, []) - console.info(UseMemoCall1) - const UseMemoCall2 = useMemo(() => { return 'true' }, []) - console.info(UseMemoCall2) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-as-parameter@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-as-parameter@component---loader---notFoundComponent---pendingComponent.tsx index 23e2cd0f03..817b89d69a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-as-parameter@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-as-parameter@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,20 +1,20 @@ -import * as React from 'react'; +import * as React from 'react' // @ts-expect-error -import { useMemo } from 'tan-react'; -const useUsedVar = 'i-am-unused'; +import { useMemo } from 'tan-react' +const useUsedVar = 'i-am-unused' const ReactUseMemoCall1 = React.useMemo(function performAction() { - return 'true'; -}, []); -console.info(ReactUseMemoCall1); + return 'true' +}, []) +console.info(ReactUseMemoCall1) const ReactUseMemoCall2 = React.useMemo(() => { - return 'true'; -}, []); -console.info(ReactUseMemoCall2); + return 'true' +}, []) +console.info(ReactUseMemoCall2) const UseMemoCall1 = useMemo(function performAction() { - return 'true'; -}, []); -console.info(UseMemoCall1); + return 'true' +}, []) +console.info(UseMemoCall1) const UseMemoCall2 = useMemo(() => { - return 'true'; -}, []); -console.info(UseMemoCall2); \ No newline at end of file + return 'true' +}, []) +console.info(UseMemoCall2) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-as-parameter@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-as-parameter@errorComponent.tsx index 23e2cd0f03..817b89d69a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-as-parameter@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-as-parameter@errorComponent.tsx @@ -1,20 +1,20 @@ -import * as React from 'react'; +import * as React from 'react' // @ts-expect-error -import { useMemo } from 'tan-react'; -const useUsedVar = 'i-am-unused'; +import { useMemo } from 'tan-react' +const useUsedVar = 'i-am-unused' const ReactUseMemoCall1 = React.useMemo(function performAction() { - return 'true'; -}, []); -console.info(ReactUseMemoCall1); + return 'true' +}, []) +console.info(ReactUseMemoCall1) const ReactUseMemoCall2 = React.useMemo(() => { - return 'true'; -}, []); -console.info(ReactUseMemoCall2); + return 'true' +}, []) +console.info(ReactUseMemoCall2) const UseMemoCall1 = useMemo(function performAction() { - return 'true'; -}, []); -console.info(UseMemoCall1); + return 'true' +}, []) +console.info(UseMemoCall1) const UseMemoCall2 = useMemo(() => { - return 'true'; -}, []); -console.info(UseMemoCall2); \ No newline at end of file + return 'true' +}, []) +console.info(UseMemoCall2) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-declaration.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-declaration.tsx index 6076420598..bdef68ad2d 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-declaration.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-declaration.tsx @@ -1,10 +1,12 @@ -const $$splitComponentImporter = () => import('function-declaration.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('function-declaration.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('function-declaration.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('function-declaration.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/posts')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-declaration@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-declaration@component---loader---notFoundComponent---pendingComponent.tsx index d453767c20..5289c0c3c4 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-declaration@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-declaration@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,30 +1,34 @@ -import * as React from 'react'; -import { Link, Outlet } from '@tanstack/react-router'; -import { fetchPosts } from '../posts'; -import { Route } from "function-declaration.tsx"; +import * as React from 'react' +import { Link, Outlet } from '@tanstack/react-router' +import { fetchPosts } from '../posts' +import { Route } from 'function-declaration.tsx' function PostsComponent() { - const posts = Route.useLoaderData(); - return
+ const posts = Route.useLoaderData() + return ( +
    - {[...posts, { - id: 'i-do-not-exist', - title: 'Non-existent Post' - }]?.map(post => { - return
  • - + {[...posts, { id: 'i-do-not-exist', title: 'Non-existent Post' }]?.map( + (post) => { + return ( +
  • +
    {post.title.substring(0, 20)}
    -
  • ; - })} + + ) + }, + )}

-
; +
+ ) } -const SplitLoader = fetchPosts; -export { SplitLoader as loader }; -export { PostsComponent as component }; \ No newline at end of file +const SplitLoader = fetchPosts +export { SplitLoader as loader } +export { PostsComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-declaration@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-declaration@errorComponent.tsx index 5f67a6fff1..371dc65868 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-declaration@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/function-declaration@errorComponent.tsx @@ -1 +1 @@ -import * as React from 'react'; \ No newline at end of file +import * as React from 'react' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/importAttribute.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/importAttribute.tsx index cec0324adf..f336e2ff0f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/importAttribute.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/importAttribute.tsx @@ -1,6 +1,7 @@ -const $$splitComponentImporter = () => import('importAttribute.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('importAttribute.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/importAttribute@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/importAttribute@component---loader---notFoundComponent---pendingComponent.tsx index f34d3c6408..88abef0c00 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/importAttribute@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/importAttribute@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ -import { test } from './test' with { type: 'macro' }; -const SplitComponent = () => test; -export { SplitComponent as component }; \ No newline at end of file +import { test } from './test' with { type: 'macro' } +const SplitComponent = () => test +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-default-component-destructured-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-default-component-destructured-loader.tsx index d79c8e0f32..d7c5699549 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-default-component-destructured-loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-default-component-destructured-loader.tsx @@ -1,9 +1,11 @@ -const $$splitLoaderImporter = () => import('imported-default-component-destructured-loader.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -const $$splitComponentImporter = () => import('imported-default-component-destructured-loader.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => + import('imported-default-component-destructured-loader.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +const $$splitComponentImporter = () => + import('imported-default-component-destructured-loader.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-default-component-destructured-loader@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-default-component-destructured-loader@component---loader---notFoundComponent---pendingComponent.tsx index d4fc40141e..b7ed94da4a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-default-component-destructured-loader@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-default-component-destructured-loader@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,5 +1,5 @@ -import importedComponent, { importedLoader } from '../../shared/imported'; -const SplitLoader = importedLoader; -export { SplitLoader as loader }; -const SplitComponent = importedComponent; -export { SplitComponent as component }; \ No newline at end of file +import importedComponent, { importedLoader } from '../../shared/imported' +const SplitLoader = importedLoader +export { SplitLoader as loader } +const SplitComponent = importedComponent +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-default-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-default-component.tsx index c165f65262..81ec753301 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-default-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-default-component.tsx @@ -1,6 +1,7 @@ -const $$splitComponentImporter = () => import('imported-default-component.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('imported-default-component.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-default-component@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-default-component@component---loader---notFoundComponent---pendingComponent.tsx index 31ccf07c52..d356227040 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-default-component@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-default-component@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ -import ImportedDefaultComponent from '../../shared/imported'; -const SplitComponent = ImportedDefaultComponent; -export { SplitComponent as component }; \ No newline at end of file +import ImportedDefaultComponent from '../../shared/imported' +const SplitComponent = ImportedDefaultComponent +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-errorComponent.tsx index 4152c9af17..e2179478b3 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-errorComponent.tsx @@ -1,8 +1,13 @@ -const $$splitErrorComponentImporter = () => import('imported-errorComponent.tsx?tsr-split=errorComponent'); -const $$splitComponentImporter = () => import('imported-errorComponent.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitErrorComponentImporter = () => + import('imported-errorComponent.tsx?tsr-split=errorComponent') +const $$splitComponentImporter = () => + import('imported-errorComponent.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') -}); \ No newline at end of file + errorComponent: lazyRouteComponent( + $$splitErrorComponentImporter, + 'errorComponent', + ), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-errorComponent@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-errorComponent@component---loader---notFoundComponent---pendingComponent.tsx index 31ccf07c52..d356227040 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-errorComponent@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-errorComponent@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,3 +1,3 @@ -import ImportedDefaultComponent from '../../shared/imported'; -const SplitComponent = ImportedDefaultComponent; -export { SplitComponent as component }; \ No newline at end of file +import ImportedDefaultComponent from '../../shared/imported' +const SplitComponent = ImportedDefaultComponent +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-errorComponent@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-errorComponent@errorComponent.tsx index 7a8654fb94..3f20c3e485 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-errorComponent@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-errorComponent@errorComponent.tsx @@ -1,3 +1,3 @@ -import { importedErrorComponent } from '../../shared/imported'; -const SplitErrorComponent = importedErrorComponent; -export { SplitErrorComponent as errorComponent }; \ No newline at end of file +import { importedErrorComponent } from '../../shared/imported' +const SplitErrorComponent = importedErrorComponent +export { SplitErrorComponent as errorComponent } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-notFoundComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-notFoundComponent.tsx index 584c829f37..31812e1e44 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-notFoundComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-notFoundComponent.tsx @@ -1,8 +1,13 @@ -const $$splitNotFoundComponentImporter = () => import('imported-notFoundComponent.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -const $$splitComponentImporter = () => import('imported-notFoundComponent.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitNotFoundComponentImporter = () => + import('imported-notFoundComponent.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +const $$splitComponentImporter = () => + import('imported-notFoundComponent.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - notFoundComponent: lazyRouteComponent($$splitNotFoundComponentImporter, 'notFoundComponent') -}); \ No newline at end of file + notFoundComponent: lazyRouteComponent( + $$splitNotFoundComponentImporter, + 'notFoundComponent', + ), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-notFoundComponent@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-notFoundComponent@component---loader---notFoundComponent---pendingComponent.tsx index 1273c7c50d..9f904a1a19 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-notFoundComponent@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-notFoundComponent@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,5 +1,7 @@ -import ImportedDefaultComponent, { importedNotFoundComponent } from '../../shared/imported'; -const SplitComponent = ImportedDefaultComponent; -export { SplitComponent as component }; -const SplitNotFoundComponent = importedNotFoundComponent; -export { SplitNotFoundComponent as notFoundComponent }; \ No newline at end of file +import ImportedDefaultComponent, { + importedNotFoundComponent, +} from '../../shared/imported' +const SplitComponent = ImportedDefaultComponent +export { SplitComponent as component } +const SplitNotFoundComponent = importedNotFoundComponent +export { SplitNotFoundComponent as notFoundComponent } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-pendingComponent.tsx index 1be3f8071b..0996abeb6c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-pendingComponent.tsx @@ -1,8 +1,13 @@ -const $$splitPendingComponentImporter = () => import('imported-pendingComponent.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -const $$splitComponentImporter = () => import('imported-pendingComponent.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitPendingComponentImporter = () => + import('imported-pendingComponent.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +const $$splitComponentImporter = () => + import('imported-pendingComponent.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - pendingComponent: lazyRouteComponent($$splitPendingComponentImporter, 'pendingComponent') -}); \ No newline at end of file + pendingComponent: lazyRouteComponent( + $$splitPendingComponentImporter, + 'pendingComponent', + ), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-pendingComponent@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-pendingComponent@component---loader---notFoundComponent---pendingComponent.tsx index 0368000afa..d24c7b1505 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-pendingComponent@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported-pendingComponent@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,5 +1,7 @@ -import ImportedDefaultComponent, { importedPendingComponent } from '../../shared/imported'; -const SplitComponent = ImportedDefaultComponent; -export { SplitComponent as component }; -const SplitPendingComponent = importedPendingComponent; -export { SplitPendingComponent as pendingComponent }; \ No newline at end of file +import ImportedDefaultComponent, { + importedPendingComponent, +} from '../../shared/imported' +const SplitComponent = ImportedDefaultComponent +export { SplitComponent as component } +const SplitPendingComponent = importedPendingComponent +export { SplitPendingComponent as pendingComponent } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported.tsx index 14356133d6..75c54f18ad 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported.tsx @@ -1,9 +1,11 @@ -const $$splitLoaderImporter = () => import('imported.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -const $$splitComponentImporter = () => import('imported.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => + import('imported.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +const $$splitComponentImporter = () => + import('imported.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported@component---loader---notFoundComponent---pendingComponent.tsx index ecc588688b..1c4d3e909b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/imported@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,5 +1,5 @@ -import { importedComponent, importedLoader } from '../../shared'; -const SplitLoader = importedLoader; -export { SplitLoader as loader }; -const SplitComponent = importedComponent; -export { SplitComponent as component }; \ No newline at end of file +import { importedComponent, importedLoader } from '../../shared' +const SplitLoader = importedLoader +export { SplitLoader as loader } +const SplitComponent = importedComponent +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/inline.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/inline.tsx index 3e2ea1f1c2..fbc7185a17 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/inline.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/inline.tsx @@ -1,9 +1,10 @@ -const $$splitComponentImporter = () => import('inline.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('inline.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); -Route.addChildren([]); -export const test = 'test'; \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) +Route.addChildren([]) +export const test = 'test' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/inline@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/inline@component---loader---notFoundComponent---pendingComponent.tsx index 58ccfb2903..d28b872634 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/inline@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/inline@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,18 +1,18 @@ -import * as React from 'react'; -import * as styles from '../style.css'; -import { TEST_DATA } from '../test.const'; -const Button = (props: { - children: any; -}) => { - return ; -}; -import { Route } from "inline.tsx"; -import { test } from "inline.tsx"; +import * as React from 'react' +import * as styles from '../style.css' +import { TEST_DATA } from '../test.const' +const Button = (props: { children: any }) => { + return +} +import { Route } from 'inline.tsx' +import { test } from 'inline.tsx' const SplitComponent = () => { - return
- {test} -

{TEST_DATA.welcome}

- -
; -}; -export { SplitComponent as component }; \ No newline at end of file + return ( +
+ {test} +

{TEST_DATA.welcome}

+ +
+ ) +} +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/inline@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/inline@errorComponent.tsx index 9236af6021..23fab71edc 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/inline@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/inline@errorComponent.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -import { Route } from "inline.tsx"; \ No newline at end of file +import * as React from 'react' +import { Route } from 'inline.tsx' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/lowercase-function-declaration.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/lowercase-function-declaration.tsx index 574c6d4c2b..55c51e878b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/lowercase-function-declaration.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/lowercase-function-declaration.tsx @@ -1,10 +1,19 @@ -const $$splitErrorComponentImporter = () => import('lowercase-function-declaration.tsx?tsr-split=errorComponent'); -const $$splitPendingComponentImporter = () => import('lowercase-function-declaration.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -const $$splitComponentImporter = () => import('lowercase-function-declaration.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitErrorComponentImporter = () => + import('lowercase-function-declaration.tsx?tsr-split=errorComponent') +const $$splitPendingComponentImporter = () => + import('lowercase-function-declaration.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +const $$splitComponentImporter = () => + import('lowercase-function-declaration.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - pendingComponent: lazyRouteComponent($$splitPendingComponentImporter, 'pendingComponent'), - errorComponent: lazyRouteComponent($$splitErrorComponentImporter, 'errorComponent') -}); \ No newline at end of file + pendingComponent: lazyRouteComponent( + $$splitPendingComponentImporter, + 'pendingComponent', + ), + errorComponent: lazyRouteComponent( + $$splitErrorComponentImporter, + 'errorComponent', + ), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/lowercase-function-declaration@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/lowercase-function-declaration@component---loader---notFoundComponent---pendingComponent.tsx index 382621ea9a..3b432397b3 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/lowercase-function-declaration@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/lowercase-function-declaration@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,8 +1,8 @@ function component() { - return
lowercase function declaration
; + return
lowercase function declaration
} function pendingComponent() { - return
lowercase pending function declaration
; + return
lowercase pending function declaration
} -export { component }; -export { pendingComponent }; \ No newline at end of file +export { component } +export { pendingComponent } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/lowercase-function-declaration@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/lowercase-function-declaration@errorComponent.tsx index acc1c0be8d..9d411c1f0f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/lowercase-function-declaration@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/lowercase-function-declaration@errorComponent.tsx @@ -1,4 +1,4 @@ function errorComponent() { - return
lowercase error function declaration
; + return
lowercase error function declaration
} -export { errorComponent }; \ No newline at end of file +export { errorComponent } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/random-number.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/random-number.tsx index 5b4cfaaa9b..602ff5c117 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/random-number.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/random-number.tsx @@ -1,28 +1,42 @@ -const $$splitComponentImporter = () => import('random-number.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('random-number.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -import { Await, Link, createFileRoute } from '@tanstack/react-router'; -import { Carbon } from '~/components/Carbon'; -import { twMerge } from 'tailwind-merge'; -import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa'; -import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg'; -import { Footer } from '~/components/Footer'; -import SponsorPack from '~/components/SponsorPack'; -import { LogoColor } from '~/components/LogoColor'; -import agGridImage from '~/images/ag-grid.png'; -import nozzleImage from '~/images/nozzle.png'; -import bytesImage from '~/images/bytes.svg'; -import bytesUidotdevImage from '~/images/bytes-uidotdev.png'; -export const textColors = [`text-rose-500`, `text-yellow-500`, `text-teal-500`, `text-blue-500`]; -export const gradients = [`from-rose-500 to-yellow-500`, `from-yellow-500 to-teal-500`, `from-teal-500 to-violet-500`, `from-blue-500 to-pink-500`]; -const courses = [{ - name: 'The Official TanStack React Query Course', - cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, - href: 'https://query.gg/?s=tanstack', - description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.` -}]; +const $$splitComponentImporter = () => + import('random-number.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('random-number.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +import { Await, Link, createFileRoute } from '@tanstack/react-router' +import { Carbon } from '~/components/Carbon' +import { twMerge } from 'tailwind-merge' +import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa' +import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg' +import { Footer } from '~/components/Footer' +import SponsorPack from '~/components/SponsorPack' +import { LogoColor } from '~/components/LogoColor' +import agGridImage from '~/images/ag-grid.png' +import nozzleImage from '~/images/nozzle.png' +import bytesImage from '~/images/bytes.svg' +import bytesUidotdevImage from '~/images/bytes-uidotdev.png' +export const textColors = [ + `text-rose-500`, + `text-yellow-500`, + `text-teal-500`, + `text-blue-500`, +] +export const gradients = [ + `from-rose-500 to-yellow-500`, + `from-yellow-500 to-teal-500`, + `from-teal-500 to-violet-500`, + `from-blue-500 to-pink-500`, +] +const courses = [ + { + name: 'The Official TanStack React Query Course', + cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, + href: 'https://query.gg/?s=tanstack', + description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.`, + }, +] export const Route = createFileRoute('/')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/random-number@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/random-number@component---loader---notFoundComponent---pendingComponent.tsx index c133e05d9e..37649d8606 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/random-number@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/random-number@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,69 +1,56 @@ -import { Await, Link, defer } from '@tanstack/react-router'; -import { Carbon } from '~/components/Carbon'; -import { twMerge } from 'tailwind-merge'; -import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa'; -import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg'; -import { Footer } from '~/components/Footer'; -import SponsorPack from '~/components/SponsorPack'; -import { LogoColor } from '~/components/LogoColor'; -import { getSponsorsForSponsorPack } from '~/server/sponsors'; -import discordImage from '~/images/discord-logo-white.svg'; -import agGridImage from '~/images/ag-grid.png'; -import nozzleImage from '~/images/nozzle.png'; -import bytesImage from '~/images/bytes.svg'; -import bytesUidotdevImage from '~/images/bytes-uidotdev.png'; -import { useMutation } from '~/hooks/useMutation'; -import { sample } from '~/utils/utils'; -import { textColors } from "random-number.tsx"; -import { gradients } from "random-number.tsx"; -const courses = [{ - name: 'The Official TanStack React Query Course', - cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, - href: 'https://query.gg/?s=tanstack', - description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.` -}]; -import { Route } from "random-number.tsx"; -async function bytesSignupServerFn({ - email -}: { - email: string; -}) { - 'use server'; - +import { Await, Link, defer } from '@tanstack/react-router' +import { Carbon } from '~/components/Carbon' +import { twMerge } from 'tailwind-merge' +import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa' +import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg' +import { Footer } from '~/components/Footer' +import SponsorPack from '~/components/SponsorPack' +import { LogoColor } from '~/components/LogoColor' +import { getSponsorsForSponsorPack } from '~/server/sponsors' +import discordImage from '~/images/discord-logo-white.svg' +import agGridImage from '~/images/ag-grid.png' +import nozzleImage from '~/images/nozzle.png' +import bytesImage from '~/images/bytes.svg' +import bytesUidotdevImage from '~/images/bytes-uidotdev.png' +import { useMutation } from '~/hooks/useMutation' +import { sample } from '~/utils/utils' +import { textColors } from 'random-number.tsx' +import { gradients } from 'random-number.tsx' +const courses = [ + { + name: 'The Official TanStack React Query Course', + cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, + href: 'https://query.gg/?s=tanstack', + description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.`, + }, +] +import { Route } from 'random-number.tsx' +async function bytesSignupServerFn({ email }: { email: string }) { + 'use server' return fetch(`https://bytes.dev/api/bytes-optin-cors`, { method: 'POST', - body: JSON.stringify({ - email, - influencer: 'tanstack' - }), - headers: { - Accept: 'application/json', - 'Content-Type': 'application/json' - } - }); + body: JSON.stringify({ email, influencer: 'tanstack' }), + headers: { Accept: 'application/json', 'Content-Type': 'application/json' }, + }) } function Index() { - const bytesSignupMutation = useMutation({ - fn: bytesSignupServerFn - }); - const { - sponsorsPromise, - randomNumber, - testing2 - } = Route.useLoaderData(); - const gradient = sample(gradients, randomNumber); - const textColor = sample(textColors, randomNumber); - return <> + const bytesSignupMutation = useMutation({ fn: bytesSignupServerFn }) + const { sponsorsPromise, randomNumber, testing2 } = Route.useLoaderData() + const gradient = sample(gradients, randomNumber) + const textColor = sample(textColors, randomNumber) + return ( + <> {discordImage} {gradient} {textColor} - ; + + ) } const SplitLoader = () => { return { randomNumber: Math.random(), - sponsorsPromise: defer(getSponsorsForSponsorPack()) - }; -}; -export { SplitLoader as loader }; -export { Index as component }; \ No newline at end of file + sponsorsPromise: defer(getSponsorsForSponsorPack()), + } +} +export { SplitLoader as loader } +export { Index as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/random-number@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/random-number@errorComponent.tsx index cdf4d37891..8e156eca17 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/random-number@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/random-number@errorComponent.tsx @@ -1,18 +1,20 @@ -import { Await, Link } from '@tanstack/react-router'; -import { Carbon } from '~/components/Carbon'; -import { twMerge } from 'tailwind-merge'; -import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa'; -import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg'; -import { Footer } from '~/components/Footer'; -import SponsorPack from '~/components/SponsorPack'; -import { LogoColor } from '~/components/LogoColor'; -import agGridImage from '~/images/ag-grid.png'; -import nozzleImage from '~/images/nozzle.png'; -import bytesImage from '~/images/bytes.svg'; -import bytesUidotdevImage from '~/images/bytes-uidotdev.png'; -const courses = [{ - name: 'The Official TanStack React Query Course', - cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, - href: 'https://query.gg/?s=tanstack', - description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.` -}]; \ No newline at end of file +import { Await, Link } from '@tanstack/react-router' +import { Carbon } from '~/components/Carbon' +import { twMerge } from 'tailwind-merge' +import { FaDiscord, FaGithub, FaTshirt } from 'react-icons/fa' +import { CgMusicSpeaker, CgSpinner } from 'react-icons/cg' +import { Footer } from '~/components/Footer' +import SponsorPack from '~/components/SponsorPack' +import { LogoColor } from '~/components/LogoColor' +import agGridImage from '~/images/ag-grid.png' +import nozzleImage from '~/images/nozzle.png' +import bytesImage from '~/images/bytes.svg' +import bytesUidotdevImage from '~/images/bytes-uidotdev.png' +const courses = [ + { + name: 'The Official TanStack React Query Course', + cardStyles: `border-t-4 border-red-500 hover:(border-green-500)`, + href: 'https://query.gg/?s=tanstack', + description: `Learn how to build enterprise quality apps with TanStack's React Query the easy way with our brand new course.`, + }, +] diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/react-memo-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/react-memo-component.tsx index 568c8dc323..9f605effce 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/react-memo-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/react-memo-component.tsx @@ -1,9 +1,11 @@ -const $$splitLoaderImporter = () => import('react-memo-component.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -const $$splitComponentImporter = () => import('react-memo-component.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => + import('react-memo-component.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +const $$splitComponentImporter = () => + import('react-memo-component.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/react-memo-component@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/react-memo-component@component---loader---notFoundComponent---pendingComponent.tsx index 70d8b0eb42..7c2c8e17de 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/react-memo-component@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/react-memo-component@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,9 +1,9 @@ -import React from 'react'; -import { importedLoader } from '../../shared/imported'; +import React from 'react' +import { importedLoader } from '../../shared/imported' function Component() { - return
Component
; + return
Component
} -const SplitLoader = importedLoader; -export { SplitLoader as loader }; -const SplitComponent = React.memo(Component); -export { SplitComponent as component }; \ No newline at end of file +const SplitLoader = importedLoader +export { SplitLoader as loader } +const SplitComponent = React.memo(Component) +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/react-memo-imported-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/react-memo-imported-component.tsx index 233eca72a0..7e9467be1b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/react-memo-imported-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/react-memo-imported-component.tsx @@ -1,9 +1,11 @@ -const $$splitLoaderImporter = () => import('react-memo-imported-component.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -const $$splitComponentImporter = () => import('react-memo-imported-component.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => + import('react-memo-imported-component.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +const $$splitComponentImporter = () => + import('react-memo-imported-component.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/react-memo-imported-component@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/react-memo-imported-component@component---loader---notFoundComponent---pendingComponent.tsx index d2671013ef..83e6e4b28c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/react-memo-imported-component@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/react-memo-imported-component@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,6 +1,6 @@ -import React from 'react'; -import { importedLoader, importedComponent } from '../../shared/imported'; -const SplitLoader = importedLoader; -export { SplitLoader as loader }; -const SplitComponent = React.memo(importedComponent); -export { SplitComponent as component }; \ No newline at end of file +import React from 'react' +import { importedLoader, importedComponent } from '../../shared/imported' +const SplitLoader = importedLoader +export { SplitLoader as loader } +const SplitComponent = React.memo(importedComponent) +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-export-component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-export-component.tsx index 1b00751ae6..4f14db0832 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-export-component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-export-component.tsx @@ -1,14 +1,16 @@ -console.warn("[tanstack-router] These exports from \"retain-export-component.tsx\" will not be code-split and will increase your bundle size:\n- Layout\nFor the best optimization, these items should either have their export statements removed, or be imported from another location that is not a route file."); -const $$splitLoaderImporter = () => import('retain-export-component.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute, Outlet } from '@tanstack/react-router'; -import { importedComponent as ImportedComponent } from '../../shared/imported'; +console.warn( + '[tanstack-router] These exports from "retain-export-component.tsx" will not be code-split and will increase your bundle size:\n- Layout\nFor the best optimization, these items should either have their export statements removed, or be imported from another location that is not a route file.', +) +const $$splitLoaderImporter = () => + import('retain-export-component.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute, Outlet } from '@tanstack/react-router' +import { importedComponent as ImportedComponent } from '../../shared/imported' export function Layout() { - return
-
+ return ( +
+
-
; +
+ ) } export const Route = createFileRoute('/_layout')({ component: Layout, - loader: lazyFn($$splitLoaderImporter, 'loader') -}); -const HEADER_HEIGHT = '63px'; -export const SIDEBAR_WIDTH = '150px'; -const SIDEBAR_MINI_WIDTH = '80px'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) +const HEADER_HEIGHT = '63px' +export const SIDEBAR_WIDTH = '150px' +const SIDEBAR_MINI_WIDTH = '80px' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-export-component@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-export-component@component---loader---notFoundComponent---pendingComponent.tsx index 9787e27ad7..ddeb4d1e6f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-export-component@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-export-component@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,6 +1,6 @@ -import * as React from 'react'; -import { importedLoader } from '../../shared/imported'; -const SIDEBAR_MINI_WIDTH = '80px'; -const ASIDE_WIDTH = '250px'; -const SplitLoader = importedLoader; -export { SplitLoader as loader }; \ No newline at end of file +import * as React from 'react' +import { importedLoader } from '../../shared/imported' +const SIDEBAR_MINI_WIDTH = '80px' +const ASIDE_WIDTH = '250px' +const SplitLoader = importedLoader +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-export-component@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-export-component@errorComponent.tsx index 5bb0ab5451..8fb12f0c6b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-export-component@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-export-component@errorComponent.tsx @@ -1,3 +1,3 @@ -import * as React from 'react'; -const SIDEBAR_MINI_WIDTH = '80px'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const SIDEBAR_MINI_WIDTH = '80px' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-const.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-const.tsx index f256b01a83..d674dbb799 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-const.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-const.tsx @@ -4,11 +4,9 @@ import { importedComponent as ImportedComponent, importedLoader, } from '../../shared/imported' - export const loaderFn = () => { return importedLoader() } - const Layout = () => { return (
@@ -26,15 +24,12 @@ const Layout = () => {
) } - export const Route = createFileRoute('/_layout')({ component: Layout, loader: loaderFn, }) - const HEADER_HEIGHT = '63px' export const SIDEBAR_WIDTH = '150px' export const SIDEBAR_MINI_WIDTH = '80px' const ASIDE_WIDTH = '250px' - export default Layout diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-const@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-const@component---loader---notFoundComponent---pendingComponent.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-const@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-const@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-const@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-const@errorComponent.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-const@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-const@errorComponent.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-destructured.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-destructured.tsx index 0e3175116f..89c23305a0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-destructured.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-destructured.tsx @@ -1,18 +1,12 @@ import { createFileRoute } from '@tanstack/react-router' - const createBits = () => ({ component: AboutComponentImpl, - loader: () => ({ - message: 'hello', - }), + loader: () => ({ message: 'hello' }), }) - export const { component: AboutComponent, loader } = createBits() - function AboutComponentImpl() { return
About
} - export const Route = createFileRoute('/about')({ component: AboutComponent, loader, diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-destructured@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-destructured@component---loader---notFoundComponent---pendingComponent.tsx index 43108700f5..c3ddde13a8 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-destructured@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-destructured@component---loader---notFoundComponent---pendingComponent.tsx @@ -1 +1 @@ -export { SplitLoader as loader }; \ No newline at end of file +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-function.tsx index 298c388e65..83b3dd4eb5 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-function.tsx @@ -4,11 +4,9 @@ import { importedComponent as ImportedComponent, importedLoader, } from '../../shared/imported' - export function loaderFn() { return importedLoader() } - function Layout() { return (
@@ -26,15 +24,12 @@ function Layout() {
) } - export const Route = createFileRoute('/_layout')({ component: Layout, loader: loaderFn, }) - const HEADER_HEIGHT = '63px' export const SIDEBAR_WIDTH = '150px' export const SIDEBAR_MINI_WIDTH = '80px' const ASIDE_WIDTH = '250px' - export default Layout diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-function@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-function@component---loader---notFoundComponent---pendingComponent.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-function@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-function@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-function@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-function@errorComponent.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-function@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-function@errorComponent.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-loader.tsx index b36cbc6be2..e805842e0c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-loader.tsx @@ -1,17 +1,18 @@ -console.warn("[tanstack-router] These exports from \"retain-exports-loader.tsx\" will not be code-split and will increase your bundle size:\n- loaderFn\nFor the best optimization, these items should either have their export statements removed, or be imported from another location that is not a route file."); -const $$splitComponentImporter = () => import('retain-exports-loader.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -import * as React from 'react'; -import { createFileRoute } from '@tanstack/react-router'; +console.warn( + '[tanstack-router] These exports from "retain-exports-loader.tsx" will not be code-split and will increase your bundle size:\n- loaderFn\nFor the best optimization, these items should either have their export statements removed, or be imported from another location that is not a route file.', +) +const $$splitComponentImporter = () => + import('retain-exports-loader.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +import * as React from 'react' +import { createFileRoute } from '@tanstack/react-router' export function loaderFn() { - return { - foo: 'bar' - }; + return { foo: 'bar' } } export const Route = createFileRoute('/_layout')({ component: lazyRouteComponent($$splitComponentImporter, 'component'), - loader: loaderFn -}); -export const SIDEBAR_WIDTH = '150px'; -export const SIDEBAR_MINI_WIDTH = '80px'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file + loader: loaderFn, +}) +export const SIDEBAR_WIDTH = '150px' +export const SIDEBAR_MINI_WIDTH = '80px' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-loader@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-loader@component---loader---notFoundComponent---pendingComponent.tsx index 9f54ae0dc5..604be4dc69 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-loader@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-loader@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,11 +1,10 @@ -import * as React from 'react'; -import { Outlet } from '@tanstack/react-router'; -import { importedComponent as ImportedComponent } from '../../shared/imported'; +import * as React from 'react' +import { Outlet } from '@tanstack/react-router' +import { importedComponent as ImportedComponent } from '../../shared/imported' function Layout() { - return
-
+ return ( +
+
-
; +
+ ) } -const HEADER_HEIGHT = '63px'; -const ASIDE_WIDTH = '250px'; -export { Layout as component }; \ No newline at end of file +const HEADER_HEIGHT = '63px' +const ASIDE_WIDTH = '250px' +export { Layout as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-loader@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-loader@errorComponent.tsx index 168ba78680..0e0123f1ab 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-loader@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/retain-exports-loader@errorComponent.tsx @@ -1,2 +1,2 @@ -import * as React from 'react'; -const ASIDE_WIDTH = '250px'; \ No newline at end of file +import * as React from 'react' +const ASIDE_WIDTH = '250px' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-class.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-class.tsx index 48afc3f070..c9bffc92ba 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-class.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-class.tsx @@ -1,18 +1,20 @@ -const $$splitComponentImporter = () => import('shared-class.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-class.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-class.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-class.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' class DataStore { - data = new Map(); + data = new Map() get(k: string) { - return this.data.get(k); + return this.data.get(k) } set(k: string, v: unknown) { - this.data.set(k, v); + this.data.set(k, v) } } export const Route = createFileRoute('/store')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-class@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-class@component---loader---notFoundComponent---pendingComponent.tsx index 10675b99ed..39593e61e0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-class@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-class@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,16 +1,16 @@ class DataStore { - data = new Map(); + data = new Map() get(k: string) { - return this.data.get(k); + return this.data.get(k) } set(k: string, v: unknown) { - this.data.set(k, v); + this.data.set(k, v) } } -const store = new DataStore(); +const store = new DataStore() const SplitLoader = async () => { - store.set('items', await fetch('/api')); -}; -export { SplitLoader as loader }; -const SplitComponent = () =>
{store.get('items')}
; -export { SplitComponent as component }; \ No newline at end of file + store.set('items', await fetch('/api')) +} +export { SplitLoader as loader } +const SplitComponent = () =>
{store.get('items')}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-class@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-class@errorComponent.tsx index 0a50638c6a..31a1763b5d 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-class@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-class@errorComponent.tsx @@ -1,9 +1,9 @@ class DataStore { - data = new Map(); + data = new Map() get(k: string) { - return this.data.get(k); + return this.data.get(k) } set(k: string, v: unknown) { - this.data.set(k, v); + this.data.set(k, v) } -} \ No newline at end of file +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-destructured-export.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-destructured-export.tsx index 73f1b54389..6b770a1cf2 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-destructured-export.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-destructured-export.tsx @@ -1,19 +1,15 @@ -const $$splitComponentImporter = () => import('shared-destructured-export.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-destructured-export.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -export const { - apiUrl, - timeout -} = getConfig(); +const $$splitComponentImporter = () => + import('shared-destructured-export.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-destructured-export.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +export const { apiUrl, timeout } = getConfig() export const Route = createFileRoute('/config')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) function getConfig() { - return { - apiUrl: '/api', - timeout: 5000 - }; -} \ No newline at end of file + return { apiUrl: '/api', timeout: 5000 } +} diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-destructured-export@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-destructured-export@component---loader---notFoundComponent---pendingComponent.tsx index d48accf910..68114df748 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-destructured-export@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-destructured-export@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,5 +1,5 @@ -import { apiUrl, timeout } from "shared-destructured-export.tsx"; -const SplitLoader = async () => fetch(apiUrl); -export { SplitLoader as loader }; -const SplitComponent = () =>
Timeout: {timeout}
; -export { SplitComponent as component }; \ No newline at end of file +import { apiUrl, timeout } from 'shared-destructured-export.tsx' +const SplitLoader = async () => fetch(apiUrl) +export { SplitLoader as loader } +const SplitComponent = () =>
Timeout: {timeout}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-destructured.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-destructured.tsx index fbc4272c3e..78bf0b8ceb 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-destructured.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-destructured.tsx @@ -1,9 +1,11 @@ -const $$splitComponentImporter = () => import('shared-destructured.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-destructured.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-destructured.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-destructured.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/config')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-destructured@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-destructured@component---loader---notFoundComponent---pendingComponent.tsx index e92f7dd7f8..a5c9439324 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-destructured@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-destructured@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,14 +1,8 @@ -const { - apiUrl, - timeout -} = getConfig(); +const { apiUrl, timeout } = getConfig() function getConfig() { - return { - apiUrl: '/api', - timeout: 5000 - }; + return { apiUrl: '/api', timeout: 5000 } } -const SplitLoader = async () => fetch(apiUrl); -export { SplitLoader as loader }; -const SplitComponent = () =>
Timeout: {timeout}
; -export { SplitComponent as component }; \ No newline at end of file +const SplitLoader = async () => fetch(apiUrl) +export { SplitLoader as loader } +const SplitComponent = () =>
Timeout: {timeout}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-exported.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-exported.tsx index 76a5d29dc3..887f52978d 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-exported.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-exported.tsx @@ -1,13 +1,12 @@ -const $$splitComponentImporter = () => import('shared-exported.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-exported.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -export const queryOptions = { - staleTime: 5000, - gcTime: 10000 -}; +const $$splitComponentImporter = () => + import('shared-exported.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-exported.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +export const queryOptions = { staleTime: 5000, gcTime: 10000 } export const Route = createFileRoute('/query')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-exported@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-exported@component---loader---notFoundComponent---pendingComponent.tsx index f77f81cbdb..f2a32be2bc 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-exported@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-exported@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,9 +1,7 @@ -import { queryOptions } from "shared-exported.tsx"; +import { queryOptions } from 'shared-exported.tsx' const SplitLoader = async () => { - return { - staleTime: queryOptions.staleTime - }; -}; -export { SplitLoader as loader }; -const SplitComponent = () =>
GC: {queryOptions.gcTime}
; -export { SplitComponent as component }; \ No newline at end of file + return { staleTime: queryOptions.staleTime } +} +export { SplitLoader as loader } +const SplitComponent = () =>
GC: {queryOptions.gcTime}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-function.tsx index 8a921d9640..b964d09962 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-function.tsx @@ -1,9 +1,11 @@ -const $$splitComponentImporter = () => import('shared-function.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-function.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-function.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-function.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/cached')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-function@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-function@component---loader---notFoundComponent---pendingComponent.tsx index cfe519f47a..0f4a23b3fe 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-function@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-function@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,14 +1,14 @@ -const cache = new Map(); +const cache = new Map() function getCached(key: string) { - return cache.get(key); + return cache.get(key) } function setCached(key: string, val: unknown) { - cache.set(key, val); + cache.set(key, val) } const SplitLoader = async () => { - setCached('data', await fetch('/api').then(r => r.json())); - return getCached('data'); -}; -export { SplitLoader as loader }; -const SplitComponent = () =>
{JSON.stringify(getCached('data'))}
; -export { SplitComponent as component }; \ No newline at end of file + setCached('data', await fetch('/api').then((r) => r.json())) + return getCached('data') +} +export { SplitLoader as loader } +const SplitComponent = () =>
{JSON.stringify(getCached('data'))}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-imported-binding.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-imported-binding.tsx index feb46cd789..71082ac702 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-imported-binding.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-imported-binding.tsx @@ -1,9 +1,11 @@ -const $$splitComponentImporter = () => import('shared-imported-binding.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-imported-binding.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-imported-binding.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-imported-binding.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/imported')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-imported-binding@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-imported-binding@component---loader---notFoundComponent---pendingComponent.tsx index 409e8d4023..7718cec94c 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-imported-binding@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-imported-binding@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,5 +1,5 @@ -import { sharedUtil } from '../utils'; -const SplitLoader = async () => sharedUtil('load'); -export { SplitLoader as loader }; -const SplitComponent = () =>
{sharedUtil('render')}
; -export { SplitComponent as component }; \ No newline at end of file +import { sharedUtil } from '../utils' +const SplitLoader = async () => sharedUtil('load') +export { SplitLoader as loader } +const SplitComponent = () =>
{sharedUtil('render')}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-indirect-ref.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-indirect-ref.tsx index 4275e17e58..913fae8432 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-indirect-ref.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-indirect-ref.tsx @@ -1,9 +1,11 @@ -const $$splitComponentImporter = () => import('shared-indirect-ref.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-indirect-ref.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-indirect-ref.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-indirect-ref.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/shared-indirect')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-indirect-ref@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-indirect-ref@component---loader---notFoundComponent---pendingComponent.tsx index 090f3b5c73..90815572f7 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-indirect-ref@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-indirect-ref@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,19 +1,17 @@ -const state = { - count: 0 -}; +const state = { count: 0 } function getCount() { - return state.count; + return state.count } function SharedComponent() { - return
+ return ( +
{getCount()} - {state.count} -
; +
+ ) } const SplitLoader = () => { - state.count++; - return { - count: getCount() - }; -}; -export { SplitLoader as loader }; -export { SharedComponent as component }; \ No newline at end of file + state.count++ + return { count: getCount() } +} +export { SplitLoader as loader } +export { SharedComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-jsx-component-ref.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-jsx-component-ref.tsx index 130c7ce120..7d5cff0d5f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-jsx-component-ref.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-jsx-component-ref.tsx @@ -1,10 +1,12 @@ -const $$splitComponentImporter = () => import('shared-jsx-component-ref.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-jsx-component-ref.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-jsx-component-ref.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-jsx-component-ref.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' // @ts-nocheck -import { createFileRoute } from '@tanstack/react-router'; +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/jsx')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-jsx-component-ref@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-jsx-component-ref@component---loader---notFoundComponent---pendingComponent.tsx index c5fd18664e..82b634246f 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-jsx-component-ref@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-jsx-component-ref@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,9 +1,8 @@ // @ts-nocheck - -const shared = 1; +const shared = 1 function SharedComponent() { - return
{shared}
; + return
{shared}
} -const SplitLoader = () => shared; -export { SplitLoader as loader }; -export { SharedComponent as component }; \ No newline at end of file +const SplitLoader = () => shared +export { SplitLoader as loader } +export { SharedComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-none.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-none.tsx index eac0f9ab0a..1dd8f7bb0a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-none.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-none.tsx @@ -1,9 +1,11 @@ -const $$splitComponentImporter = () => import('shared-none.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-none.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-none.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-none.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/clean')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-none@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-none@component---loader---notFoundComponent---pendingComponent.tsx index f9f52ba6be..9f1d1a5ca1 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-none@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-none@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,8 +1,10 @@ -const loaderHelper = () => fetch('/api'); -const ComponentHelper = () => helper; -const SplitLoader = async () => loaderHelper(); -export { SplitLoader as loader }; -const SplitComponent = () =>
- -
; -export { SplitComponent as component }; \ No newline at end of file +const loaderHelper = () => fetch('/api') +const ComponentHelper = () => helper +const SplitLoader = async () => loaderHelper() +export { SplitLoader as loader } +const SplitComponent = () => ( +
+ +
+) +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-referencing-route.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-referencing-route.tsx index 9aebb45a95..f51ed0c13a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-referencing-route.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-referencing-route.tsx @@ -1,9 +1,11 @@ -const $$splitComponentImporter = () => import('shared-referencing-route.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-referencing-route.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-referencing-route.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-referencing-route.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/about')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-referencing-route@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-referencing-route@component---loader---notFoundComponent---pendingComponent.tsx index 9bcd130ea8..da98398ae1 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-referencing-route@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-referencing-route@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,17 +1,15 @@ -const HEADER = 'Page'; +const HEADER = 'Page' function usePageTitle() { - return `${HEADER} - ${Route.fullPath}`; + return `${HEADER} - ${Route.fullPath}` } -import { Route } from "shared-referencing-route.tsx"; +import { Route } from 'shared-referencing-route.tsx' const SplitLoader = async () => { - const title = usePageTitle(); - return { - title - }; -}; -export { SplitLoader as loader }; + const title = usePageTitle() + return { title } +} +export { SplitLoader as loader } const SplitComponent = () => { - const title = usePageTitle(); - return
{title}
; -}; -export { SplitComponent as component }; \ No newline at end of file + const title = usePageTitle() + return
{title}
+} +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime.tsx index d88eff9d9b..fdc18fa37b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime.tsx @@ -1,22 +1,20 @@ -import { state, createState, createSeed } from "shared-runtime.tsx?tsr-shared=1"; -const $$splitComponentImporter = () => import('shared-runtime.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-runtime.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -console.log('shared-runtime:reference'); +import { state, createState, createSeed } from 'shared-runtime.tsx?tsr-shared=1' +const $$splitComponentImporter = () => + import('shared-runtime.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-runtime.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +console.log('shared-runtime:reference') export const Route = createFileRoute('/shared-runtime')({ beforeLoad: () => state, loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); -function createState(initialState: { - count: number; -}): { - state: { - count: number; - }; - increment: () => number; -}; -export { state as firstState, state as secondState, state as 'odd-name' }; -export default createSeed; \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) +function createState(initialState: { count: number }): { + state: { count: number } + increment: () => number +} +export { state as firstState, state as secondState, state as 'odd-name' } +export default createSeed diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@component---loader---notFoundComponent---pendingComponent.tsx index 0af87c21c5..053cf24d5a 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,28 +1,30 @@ -import { state, createState, createSeed, Labels, increment } from "shared-runtime.tsx?tsr-shared=1"; -const label = createComponentLabel(); -function createState(initialState: { - count: number; -}): { - state: { - count: number; - }; - increment: () => number; -}; -function createComponentLabel() { - console.log('shared-runtime:component'); - return Labels.component; +import { + state, + createState, + createSeed, + Labels, + increment, +} from 'shared-runtime.tsx?tsr-shared=1' +const label = createComponentLabel() +function createState(initialState: { count: number }): { + state: { count: number } + increment: () => number } -export { state as firstState, state as secondState, state as 'odd-name' }; -export default createSeed; +function createComponentLabel() { + console.log('shared-runtime:component') + return Labels.component +} +export { state as firstState, state as secondState, state as 'odd-name' } +export default createSeed const SplitLoader = () => { - increment(); - return state; -}; -export { SplitLoader as loader }; + increment() + return state +} +export { SplitLoader as loader } const SplitComponent = () => { if (state.count === 3) { - throw new Error('route source-map contract'); + throw new Error('route source-map contract') } - return `${label}:${state.count}`; -}; -export { SplitComponent as component }; \ No newline at end of file + return `${label}:${state.count}` +} +export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@errorComponent.tsx index d890a562c9..03cacac5b3 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@errorComponent.tsx @@ -1,11 +1,7 @@ -import { state, createState, createSeed } from "shared-runtime.tsx?tsr-shared=1"; -function createState(initialState: { - count: number; -}): { - state: { - count: number; - }; - increment: () => number; -}; -export { state as firstState, state as secondState, state as 'odd-name' }; -export default createSeed; \ No newline at end of file +import { state, createState, createSeed } from 'shared-runtime.tsx?tsr-shared=1' +function createState(initialState: { count: number }): { + state: { count: number } + increment: () => number +} +export { state as firstState, state as secondState, state as 'odd-name' } +export default createSeed diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@shared.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@shared.tsx index 54239b6cc5..c53a7e1568 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@shared.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-runtime@shared.tsx @@ -1,28 +1,13 @@ -const Count = { - Initial: 0 -}; -const Labels = { - component: 'count' -}; -const seed = createSeed(); -const { - state, - increment -} = createState(seed); +const Count = { Initial: 0 } +const Labels = { component: 'count' } +const seed = createSeed() +const { state, increment } = createState(seed) function createSeed() { - console.log('shared-runtime:seed'); - return { - count: Count.Initial, - label: Labels.component - }; + console.log('shared-runtime:seed') + return { count: Count.Initial, label: Labels.component } } -function createState(initialState: { - count: number; -}) { - console.log('shared-runtime:state'); - return { - state: initialState, - increment: () => initialState.count++ - }; +function createState(initialState: { count: number }) { + console.log('shared-runtime:state') + return { state: initialState, increment: () => initialState.count++ } } -export { Count, createSeed, createState, increment, Labels, seed, state }; \ No newline at end of file +export { Count, createSeed, createState, increment, Labels, seed, state } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-transitive.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-transitive.tsx index 67b0631b8e..552cd657e0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-transitive.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-transitive.tsx @@ -1,9 +1,11 @@ -const $$splitComponentImporter = () => import('shared-transitive.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-transitive.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-transitive.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-transitive.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/api')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-transitive@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-transitive@component---loader---notFoundComponent---pendingComponent.tsx index 662d7fd7aa..c67ed3c691 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-transitive@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-transitive@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,12 +1,9 @@ -const BASE_URL = 'https://api.example.com'; -const config = { - url: BASE_URL, - timeout: 5000 -}; -const fetcher = (path: string) => fetch(`${config.url}${path}`); +const BASE_URL = 'https://api.example.com' +const config = { url: BASE_URL, timeout: 5000 } +const fetcher = (path: string) => fetch(`${config.url}${path}`) const SplitLoader = async () => { - return fetcher('/data'); -}; -export { SplitLoader as loader }; -const SplitComponent = () =>
Timeout: {config.timeout}
; -export { SplitComponent as component }; \ No newline at end of file + return fetcher('/data') +} +export { SplitLoader as loader } +const SplitComponent = () =>
Timeout: {config.timeout}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-variable.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-variable.tsx index 48cdad100e..191b12aa33 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-variable.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-variable.tsx @@ -1,9 +1,11 @@ -const $$splitComponentImporter = () => import('shared-variable.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-variable.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; +const $$splitComponentImporter = () => + import('shared-variable.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-variable.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/todos')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-variable@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-variable@component---loader---notFoundComponent---pendingComponent.tsx index daca782a6f..e96ced1955 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-variable@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-variable@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,13 +1,8 @@ -const collection = { - name: 'todos', - preload: async () => {} -}; +const collection = { name: 'todos', preload: async () => {} } const SplitLoader = async () => { - await collection.preload(); - return { - data: 'loaded' - }; -}; -export { SplitLoader as loader }; -const SplitComponent = () =>
{collection.name}
; -export { SplitComponent as component }; \ No newline at end of file + await collection.preload() + return { data: 'loaded' } +} +export { SplitLoader as loader } +const SplitComponent = () =>
{collection.name}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-with-side-effect.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-with-side-effect.tsx index c322746737..5f68cb275d 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-with-side-effect.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-with-side-effect.tsx @@ -1,10 +1,12 @@ -const $$splitComponentImporter = () => import('shared-with-side-effect.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/react-router'; -const $$splitLoaderImporter = () => import('shared-with-side-effect.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; -import { createFileRoute } from '@tanstack/react-router'; -console.log('registry created'); +const $$splitComponentImporter = () => + import('shared-with-side-effect.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/react-router' +const $$splitLoaderImporter = () => + import('shared-with-side-effect.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router' +console.log('registry created') export const Route = createFileRoute('/fx')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-with-side-effect@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-with-side-effect@component---loader---notFoundComponent---pendingComponent.tsx index 6c77f8b857..542779a26b 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-with-side-effect@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/shared-with-side-effect@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,7 +1,7 @@ -const registry = new Map(); +const registry = new Map() const SplitLoader = async () => { - registry.set('loaded', true); -}; -export { SplitLoader as loader }; -const SplitComponent = () =>
{registry.size}
; -export { SplitComponent as component }; \ No newline at end of file + registry.set('loaded', true) +} +export { SplitLoader as loader } +const SplitComponent = () =>
{registry.size}
+export { SplitComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/undefined-literals.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/undefined-literals.tsx index 0c6e4f01aa..88b0bf1ba8 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/undefined-literals.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/undefined-literals.tsx @@ -1,5 +1,4 @@ import { createFileRoute } from '@tanstack/react-router' - export const Route = createFileRoute('/undefined-test')({ component: undefined, errorComponent: undefined, diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/useStateDestructure.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/useStateDestructure.tsx index d0de09bf8b..b5b3ecade6 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/useStateDestructure.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/useStateDestructure.tsx @@ -1,5 +1,4 @@ import * as React from 'react' - import { CgCornerUpLeft, CgSpinner } from 'react-icons/cg' import { FaBolt, @@ -21,7 +20,6 @@ import { startProject } from '~/projects/start' import { createFileRoute } from '@tanstack/react-router' import { Framework, getBranch } from '~/projects' import { seo } from '~/utils/seo' - const menu = [ { label: ( @@ -72,31 +70,22 @@ const menu = [ to: `https://cottonbureau.com/people/tanstack`, }, ] - export const Route = createFileRoute('/_libraries/start/$version/')({ component: VersionIndex, meta: () => - seo({ - title: startProject.name, - description: startProject.description, - }), + seo({ title: startProject.name, description: startProject.description }), }) - const librariesRouteApi = getRouteApi('/_libraries') - export default function VersionIndex() { const { sponsorsPromise } = librariesRouteApi.useLoaderData() const { version } = Route.useParams() const branch = getBranch(startProject, version) const [framework, setFramework] = React.useState('react') const [isDark, setIsDark] = React.useState(true) - React.useEffect(() => { setIsDark(window.matchMedia?.(`(prefers-color-scheme: dark)`).matches) }, []) - const gradientText = `inline-block text-transparent bg-clip-text bg-gradient-to-r ${startProject.colorFrom} ${startProject.colorTo}` - return (
{item.label}
) - return (
{item.to.startsWith('http') ? ( @@ -269,7 +257,6 @@ Check it out at https://tanstack.com/start/`,
*/} - {/*

@@ -315,7 +302,6 @@ Check it out at https://tanstack.com/start/`, })}

*/} - {/*
Trusted in Production by @@ -358,7 +344,6 @@ Check it out at https://tanstack.com/start/`,
*/} -

Partners @@ -388,16 +373,13 @@ Check it out at https://tanstack.com/start/`,

-

Sponsors

-
@@ -429,7 +410,6 @@ Check it out at https://tanstack.com/start/`, rage-quit OSS. Yay money! 😉
- {/*

@@ -468,7 +448,6 @@ Check it out at https://tanstack.com/start/`,

*/} - {/* {[''].includes(framework) ? (
@@ -503,7 +482,6 @@ Check it out at https://tanstack.com/start/`, >
)} */} - {/*
Wow, you've come a long way! diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/useStateDestructure@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/useStateDestructure@component---loader---notFoundComponent---pendingComponent.tsx index 97b5481cf5..5cc3099643 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/useStateDestructure@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/useStateDestructure@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,2 +1,2 @@ -import { FaBolt, FaBook, FaCheckCircle, FaCogs } from 'react-icons/fa'; -import { VscPreview, VscWand } from 'react-icons/vsc'; \ No newline at end of file +import { FaBolt, FaBook, FaCheckCircle, FaCogs } from 'react-icons/fa' +import { VscPreview, VscWand } from 'react-icons/vsc' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/useStateDestructure@errorComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/useStateDestructure@errorComponent.tsx index 97b5481cf5..5cc3099643 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/useStateDestructure@errorComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/useStateDestructure@errorComponent.tsx @@ -1,2 +1,2 @@ -import { FaBolt, FaBook, FaCheckCircle, FaCogs } from 'react-icons/fa'; -import { VscPreview, VscWand } from 'react-icons/vsc'; \ No newline at end of file +import { FaBolt, FaBook, FaCheckCircle, FaCogs } from 'react-icons/fa' +import { VscPreview, VscWand } from 'react-icons/vsc' diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/using.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/using.tsx index 140f394f60..22ad515362 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/using.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/using.tsx @@ -1,5 +1,6 @@ -const $$splitLoaderImporter = () => import('using.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/react-router'; +const $$splitLoaderImporter = () => + import('using.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/react-router' export const Route = createFileRoute({ - loader: lazyFn($$splitLoaderImporter, 'loader') -}); \ No newline at end of file + loader: lazyFn($$splitLoaderImporter, 'loader'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/using@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/using@component---loader---notFoundComponent---pendingComponent.tsx index 7e4f4fde9b..3b60e73b8d 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/using@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/react/3-all-combined-errorComponent-separate/using@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,17 +1,9 @@ const DummyPostResource = (postId: string) => ({ - postData: { - id: postId, - title: 'dummy', - body: 'dummy' - }, - [Symbol.dispose]: () => console.log('disposing!') -}); -const SplitLoader = ({ - params: { - postId - } -}) => { - using dummyPost = DummyPostResource(postId); - return dummyPost.postData; -}; -export { SplitLoader as loader }; \ No newline at end of file + postData: { id: postId, title: 'dummy', body: 'dummy' }, + [Symbol.dispose]: () => console.log('disposing!'), +}) +const SplitLoader = ({ params: { postId } }) => { + using dummyPost = DummyPostResource(postId) + return dummyPost.postData +} +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/solid/1-default/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/solid/1-default/arrow-function.tsx index b09548da57..10bedc87f0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/solid/1-default/arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/solid/1-default/arrow-function.tsx @@ -1,8 +1,9 @@ -const $$splitComponentImporter = () => import('arrow-function.tsx?tsr-split=component'); -import { lazyRouteComponent } from '@tanstack/solid-router'; -import { createFileRoute } from '@tanstack/solid-router'; -import { fetchPosts } from '../posts'; +const $$splitComponentImporter = () => + import('arrow-function.tsx?tsr-split=component') +import { lazyRouteComponent } from '@tanstack/solid-router' +import { createFileRoute } from '@tanstack/solid-router' +import { fetchPosts } from '../posts' export const Route = createFileRoute('/posts')({ loader: fetchPosts, - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/solid/1-default/arrow-function@component.tsx b/packages/router-plugin/tests/code-splitter/snapshots/solid/1-default/arrow-function@component.tsx index fe44a34fe1..c84e6f25d4 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/solid/1-default/arrow-function@component.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/solid/1-default/arrow-function@component.tsx @@ -1,26 +1,31 @@ -import * as Solid from 'solid-js'; -import { Link, Outlet } from '@tanstack/solid-router'; -import { Route } from "arrow-function.tsx"; +import * as Solid from 'solid-js' +import { Link, Outlet } from '@tanstack/solid-router' +import { Route } from 'arrow-function.tsx' const PostsComponent = () => { - const posts = Route.useLoaderData(); - return
+ const posts = Route.useLoaderData() + return ( +
    - {post => { - return
  • - + {(post) => { + return ( +
  • +
    {post.title.substring(0, 20)}
    -
  • ; - }} + + ) + }}

-
; -}; -export { PostsComponent as component }; \ No newline at end of file +
+ ) +} +export { PostsComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/arrow-function.tsx index 61c77d73bd..6842e20964 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/arrow-function.tsx @@ -1,9 +1,11 @@ -const $$splitComponentImporter = () => import('arrow-function.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/solid-router'; -const $$splitLoaderImporter = () => import('arrow-function.tsx?tsr-split=loader'); -import { lazyFn } from '@tanstack/solid-router'; -import { createFileRoute } from '@tanstack/solid-router'; +const $$splitComponentImporter = () => + import('arrow-function.tsx?tsr-split=component---errorComponent---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/solid-router' +const $$splitLoaderImporter = () => + import('arrow-function.tsx?tsr-split=loader') +import { lazyFn } from '@tanstack/solid-router' +import { createFileRoute } from '@tanstack/solid-router' export const Route = createFileRoute('/posts')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/arrow-function@component---errorComponent---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/arrow-function@component---errorComponent---notFoundComponent---pendingComponent.tsx index fe44a34fe1..c84e6f25d4 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/arrow-function@component---errorComponent---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/arrow-function@component---errorComponent---notFoundComponent---pendingComponent.tsx @@ -1,26 +1,31 @@ -import * as Solid from 'solid-js'; -import { Link, Outlet } from '@tanstack/solid-router'; -import { Route } from "arrow-function.tsx"; +import * as Solid from 'solid-js' +import { Link, Outlet } from '@tanstack/solid-router' +import { Route } from 'arrow-function.tsx' const PostsComponent = () => { - const posts = Route.useLoaderData(); - return
+ const posts = Route.useLoaderData() + return ( +
    - {post => { - return
  • - + {(post) => { + return ( +
  • +
    {post.title.substring(0, 20)}
    -
  • ; - }} + + ) + }}

-
; -}; -export { PostsComponent as component }; \ No newline at end of file +
+ ) +} +export { PostsComponent as component } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/arrow-function@loader.tsx b/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/arrow-function@loader.tsx index d9ed4ea7af..888abc8593 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/arrow-function@loader.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/solid/2-components-combined-loader-separate/arrow-function@loader.tsx @@ -1,3 +1,3 @@ -import { fetchPosts } from '../posts'; -const SplitLoader = fetchPosts; -export { SplitLoader as loader }; \ No newline at end of file +import { fetchPosts } from '../posts' +const SplitLoader = fetchPosts +export { SplitLoader as loader } diff --git a/packages/router-plugin/tests/code-splitter/snapshots/solid/3-all-combined-errorComponent-separate/arrow-function.tsx b/packages/router-plugin/tests/code-splitter/snapshots/solid/3-all-combined-errorComponent-separate/arrow-function.tsx index a872f13d33..2b7b2caefc 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/solid/3-all-combined-errorComponent-separate/arrow-function.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/solid/3-all-combined-errorComponent-separate/arrow-function.tsx @@ -1,9 +1,11 @@ -const $$splitComponentImporter = () => import('arrow-function.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyRouteComponent } from '@tanstack/solid-router'; -const $$splitLoaderImporter = () => import('arrow-function.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent'); -import { lazyFn } from '@tanstack/solid-router'; -import { createFileRoute } from '@tanstack/solid-router'; +const $$splitComponentImporter = () => + import('arrow-function.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyRouteComponent } from '@tanstack/solid-router' +const $$splitLoaderImporter = () => + import('arrow-function.tsx?tsr-split=component---loader---notFoundComponent---pendingComponent') +import { lazyFn } from '@tanstack/solid-router' +import { createFileRoute } from '@tanstack/solid-router' export const Route = createFileRoute('/posts')({ loader: lazyFn($$splitLoaderImporter, 'loader'), - component: lazyRouteComponent($$splitComponentImporter, 'component') -}); \ No newline at end of file + component: lazyRouteComponent($$splitComponentImporter, 'component'), +}) diff --git a/packages/router-plugin/tests/code-splitter/snapshots/solid/3-all-combined-errorComponent-separate/arrow-function@component---loader---notFoundComponent---pendingComponent.tsx b/packages/router-plugin/tests/code-splitter/snapshots/solid/3-all-combined-errorComponent-separate/arrow-function@component---loader---notFoundComponent---pendingComponent.tsx index 2ea36d2e03..7fdf2dd9d0 100644 --- a/packages/router-plugin/tests/code-splitter/snapshots/solid/3-all-combined-errorComponent-separate/arrow-function@component---loader---notFoundComponent---pendingComponent.tsx +++ b/packages/router-plugin/tests/code-splitter/snapshots/solid/3-all-combined-errorComponent-separate/arrow-function@component---loader---notFoundComponent---pendingComponent.tsx @@ -1,29 +1,34 @@ -import * as Solid from 'solid-js'; -import { Link, Outlet } from '@tanstack/solid-router'; -import { fetchPosts } from '../posts'; -import { Route } from "arrow-function.tsx"; +import * as Solid from 'solid-js' +import { Link, Outlet } from '@tanstack/solid-router' +import { fetchPosts } from '../posts' +import { Route } from 'arrow-function.tsx' const PostsComponent = () => { - const posts = Route.useLoaderData(); - return
+ const posts = Route.useLoaderData() + return ( +
    - {post => { - return
  • - + {(post) => { + return ( +
  • +
    {post.title.substring(0, 20)}
    -
  • ; - }} + + ) + }}

-
; -}; -const SplitLoader = fetchPosts; -export { SplitLoader as loader }; -export { PostsComponent as component }; \ No newline at end of file +
+ ) +} +const SplitLoader = fetchPosts +export { SplitLoader as loader } +export { PostsComponent as component } diff --git a/packages/router-plugin/tests/config.test.ts b/packages/router-plugin/tests/config.test.ts index 2f3e8cc7db..7191f197a9 100644 --- a/packages/router-plugin/tests/config.test.ts +++ b/packages/router-plugin/tests/config.test.ts @@ -11,7 +11,6 @@ describe('getConfig', () => { inlineConfig: { target: 'solid', autoCodeSplitting: false, - enableRouteGeneration: true, } as Partial, withJson: false, }, @@ -22,7 +21,6 @@ describe('getConfig', () => { autoCodeSplitting: false, routesDirectory: 'src/paths', generatedRouteTree: 'src/tree/routeTree.gen.ts', - enableRouteGeneration: true, } as Partial, withJson: false, }, @@ -33,7 +31,6 @@ describe('getConfig', () => { autoCodeSplitting: true, routesDirectory: './src/paths', generatedRouteTree: './src/tree/routeTree.gen.ts', - enableRouteGeneration: true, } as Partial, withJson: false, }, @@ -44,7 +41,6 @@ describe('getConfig', () => { autoCodeSplitting: false, routesDirectory: '/src/paths', generatedRouteTree: '/src/tree/routeTree.gen.ts', - enableRouteGeneration: true, } as Partial, withJson: false, }, @@ -60,7 +56,6 @@ describe('getConfig', () => { autoCodeSplitting: true, routesDirectory: './src/paths', generatedRouteTree: './src/tree/routeTree.gen.ts', - enableRouteGeneration: true, } as Partial, withJson: true, }, diff --git a/packages/router-plugin/tests/delete-nodes.test.ts b/packages/router-plugin/tests/delete-nodes.test.ts index 6bb1d3dc6d..d9b37ce54a 100644 --- a/packages/router-plugin/tests/delete-nodes.test.ts +++ b/packages/router-plugin/tests/delete-nodes.test.ts @@ -4,6 +4,7 @@ import { describe, expect, it } from 'vitest' import { compileCodeSplitReferenceRoute } from '../src/core/code-splitter/compilers' import { frameworks } from './constants' +import { formatSnapshot } from './format-snapshot' import type { DeletableNodes } from '../src/core/config' function getFrameworkDir(framework: string) { @@ -57,7 +58,9 @@ describe('code-splitter delete nodes', () => { targetFramework: framework, }) - await expect(compileResult?.code || code).toMatchFileSnapshot( + await expect( + await formatSnapshot(compileResult?.code || code, filename), + ).toMatchFileSnapshot( path.join(dirs.snapshots, groupName, filename), ) }, diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/react/1-delete-nodes-undefined/createRootRoute-ssr-function.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/react/1-delete-nodes-undefined/createRootRoute-ssr-function.tsx index 512e597528..9ddd962b9c 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/react/1-delete-nodes-undefined/createRootRoute-ssr-function.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/react/1-delete-nodes-undefined/createRootRoute-ssr-function.tsx @@ -1,6 +1,5 @@ import { createRootRoute } from '@tanstack/react-router' import crypto from 'node:crypto' - export const Route = createRootRoute({ ssr: () => { if (crypto.randomInt(0, 2) === 0) { diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/react/1-delete-nodes-undefined/createRootRouteWithContext-ssr-function.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/react/1-delete-nodes-undefined/createRootRouteWithContext-ssr-function.tsx index 9a2cac49b3..97521cd051 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/react/1-delete-nodes-undefined/createRootRouteWithContext-ssr-function.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/react/1-delete-nodes-undefined/createRootRouteWithContext-ssr-function.tsx @@ -1,6 +1,5 @@ import { createRootRouteWithContext } from '@tanstack/react-router' import crypto from 'node:crypto' - export const Route = createRootRouteWithContext<{}>()({ ssr: () => { if (crypto.randomInt(0, 2) === 0) { diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/react/1-delete-nodes-undefined/ssr-data-only.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/react/1-delete-nodes-undefined/ssr-data-only.tsx index c489be3266..9ab5a1eb7f 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/react/1-delete-nodes-undefined/ssr-data-only.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/react/1-delete-nodes-undefined/ssr-data-only.tsx @@ -1,5 +1,4 @@ import { createFileRoute } from '@tanstack/react-router' - export const Route = createFileRoute('/')({ ssr: 'data-only', component: () => { diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/react/1-delete-nodes-undefined/ssr-false.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/react/1-delete-nodes-undefined/ssr-false.tsx index d2409de686..daeb982324 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/react/1-delete-nodes-undefined/ssr-false.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/react/1-delete-nodes-undefined/ssr-false.tsx @@ -1,5 +1,4 @@ import { createFileRoute } from '@tanstack/react-router' - export const Route = createFileRoute('/')({ ssr: false, component: () => { diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/react/2-delete-nodes-empty/createRootRoute-ssr-function.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/react/2-delete-nodes-empty/createRootRoute-ssr-function.tsx index 512e597528..9ddd962b9c 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/react/2-delete-nodes-empty/createRootRoute-ssr-function.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/react/2-delete-nodes-empty/createRootRoute-ssr-function.tsx @@ -1,6 +1,5 @@ import { createRootRoute } from '@tanstack/react-router' import crypto from 'node:crypto' - export const Route = createRootRoute({ ssr: () => { if (crypto.randomInt(0, 2) === 0) { diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/react/2-delete-nodes-empty/createRootRouteWithContext-ssr-function.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/react/2-delete-nodes-empty/createRootRouteWithContext-ssr-function.tsx index 9a2cac49b3..97521cd051 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/react/2-delete-nodes-empty/createRootRouteWithContext-ssr-function.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/react/2-delete-nodes-empty/createRootRouteWithContext-ssr-function.tsx @@ -1,6 +1,5 @@ import { createRootRouteWithContext } from '@tanstack/react-router' import crypto from 'node:crypto' - export const Route = createRootRouteWithContext<{}>()({ ssr: () => { if (crypto.randomInt(0, 2) === 0) { diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/react/2-delete-nodes-empty/ssr-data-only.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/react/2-delete-nodes-empty/ssr-data-only.tsx index c489be3266..9ab5a1eb7f 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/react/2-delete-nodes-empty/ssr-data-only.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/react/2-delete-nodes-empty/ssr-data-only.tsx @@ -1,5 +1,4 @@ import { createFileRoute } from '@tanstack/react-router' - export const Route = createFileRoute('/')({ ssr: 'data-only', component: () => { diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/react/2-delete-nodes-empty/ssr-false.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/react/2-delete-nodes-empty/ssr-false.tsx index d2409de686..daeb982324 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/react/2-delete-nodes-empty/ssr-false.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/react/2-delete-nodes-empty/ssr-false.tsx @@ -1,5 +1,4 @@ import { createFileRoute } from '@tanstack/react-router' - export const Route = createFileRoute('/')({ ssr: false, component: () => { diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/createRootRoute-ssr-function.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/createRootRoute-ssr-function.tsx index a442b9ad2f..74e60e59e1 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/createRootRoute-ssr-function.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/createRootRoute-ssr-function.tsx @@ -1,6 +1,6 @@ -import { createRootRoute } from '@tanstack/react-router'; +import { createRootRoute } from '@tanstack/react-router' export const Route = createRootRoute({ component: () => { - return
hello world
; - } -}); \ No newline at end of file + return
hello world
+ }, +}) diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/createRootRouteWithContext-ssr-function.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/createRootRouteWithContext-ssr-function.tsx index 75c818b072..9c4e69445c 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/createRootRouteWithContext-ssr-function.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/createRootRouteWithContext-ssr-function.tsx @@ -1,6 +1,6 @@ -import { createRootRouteWithContext } from '@tanstack/react-router'; +import { createRootRouteWithContext } from '@tanstack/react-router' export const Route = createRootRouteWithContext<{}>()({ component: () => { - return
hello world
; - } -}); \ No newline at end of file + return
hello world
+ }, +}) diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/ssr-data-only.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/ssr-data-only.tsx index cd2371ae2e..fd9a7cd090 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/ssr-data-only.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/ssr-data-only.tsx @@ -1,6 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router'; +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: () => { - return
hello world
; - } -}); \ No newline at end of file + return
hello world
+ }, +}) diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/ssr-false.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/ssr-false.tsx index cd2371ae2e..fd9a7cd090 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/ssr-false.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/ssr-false.tsx @@ -1,6 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router'; +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: () => { - return
hello world
; - } -}); \ No newline at end of file + return
hello world
+ }, +}) diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/ssr-function.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/ssr-function.tsx index cd2371ae2e..fd9a7cd090 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/ssr-function.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/react/3-delete-nodes-ssr/ssr-function.tsx @@ -1,6 +1,6 @@ -import { createFileRoute } from '@tanstack/react-router'; +import { createFileRoute } from '@tanstack/react-router' export const Route = createFileRoute('/')({ component: () => { - return
hello world
; - } -}); \ No newline at end of file + return
hello world
+ }, +}) diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/solid/1-delete-nodes-undefined/ssr-data-only.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/solid/1-delete-nodes-undefined/ssr-data-only.tsx index e6a51d19ea..50cdfdeb49 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/solid/1-delete-nodes-undefined/ssr-data-only.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/solid/1-delete-nodes-undefined/ssr-data-only.tsx @@ -1,5 +1,4 @@ import { createFileRoute } from '@tanstack/solid-router' - export const Route = createFileRoute('/')({ ssr: 'data-only', component: () => { diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/solid/1-delete-nodes-undefined/ssr-false.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/solid/1-delete-nodes-undefined/ssr-false.tsx index 31eda25da3..178109f8d7 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/solid/1-delete-nodes-undefined/ssr-false.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/solid/1-delete-nodes-undefined/ssr-false.tsx @@ -1,5 +1,4 @@ import { createFileRoute } from '@tanstack/solid-router' - export const Route = createFileRoute('/')({ ssr: false, component: () => { diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/solid/1-delete-nodes-undefined/ssr-function.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/solid/1-delete-nodes-undefined/ssr-function.tsx index a111e03c8d..d16a74bb7a 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/solid/1-delete-nodes-undefined/ssr-function.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/solid/1-delete-nodes-undefined/ssr-function.tsx @@ -1,5 +1,4 @@ import { createFileRoute } from '@tanstack/solid-router' - export const Route = createFileRoute('/')({ ssr: () => { if (typeof window === 'undefined') { diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/solid/2-delete-nodes-empty/ssr-data-only.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/solid/2-delete-nodes-empty/ssr-data-only.tsx index e6a51d19ea..50cdfdeb49 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/solid/2-delete-nodes-empty/ssr-data-only.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/solid/2-delete-nodes-empty/ssr-data-only.tsx @@ -1,5 +1,4 @@ import { createFileRoute } from '@tanstack/solid-router' - export const Route = createFileRoute('/')({ ssr: 'data-only', component: () => { diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/solid/2-delete-nodes-empty/ssr-false.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/solid/2-delete-nodes-empty/ssr-false.tsx index 31eda25da3..178109f8d7 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/solid/2-delete-nodes-empty/ssr-false.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/solid/2-delete-nodes-empty/ssr-false.tsx @@ -1,5 +1,4 @@ import { createFileRoute } from '@tanstack/solid-router' - export const Route = createFileRoute('/')({ ssr: false, component: () => { diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/solid/2-delete-nodes-empty/ssr-function.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/solid/2-delete-nodes-empty/ssr-function.tsx index a111e03c8d..d16a74bb7a 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/solid/2-delete-nodes-empty/ssr-function.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/solid/2-delete-nodes-empty/ssr-function.tsx @@ -1,5 +1,4 @@ import { createFileRoute } from '@tanstack/solid-router' - export const Route = createFileRoute('/')({ ssr: () => { if (typeof window === 'undefined') { diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/solid/3-delete-nodes-ssr/ssr-data-only.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/solid/3-delete-nodes-ssr/ssr-data-only.tsx index 77e05f3b12..7ed1de7be5 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/solid/3-delete-nodes-ssr/ssr-data-only.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/solid/3-delete-nodes-ssr/ssr-data-only.tsx @@ -1,6 +1,6 @@ -import { createFileRoute } from '@tanstack/solid-router'; +import { createFileRoute } from '@tanstack/solid-router' export const Route = createFileRoute('/')({ component: () => { - return
hello world
; - } -}); \ No newline at end of file + return
hello world
+ }, +}) diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/solid/3-delete-nodes-ssr/ssr-false.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/solid/3-delete-nodes-ssr/ssr-false.tsx index 77e05f3b12..7ed1de7be5 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/solid/3-delete-nodes-ssr/ssr-false.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/solid/3-delete-nodes-ssr/ssr-false.tsx @@ -1,6 +1,6 @@ -import { createFileRoute } from '@tanstack/solid-router'; +import { createFileRoute } from '@tanstack/solid-router' export const Route = createFileRoute('/')({ component: () => { - return
hello world
; - } -}); \ No newline at end of file + return
hello world
+ }, +}) diff --git a/packages/router-plugin/tests/delete-nodes/snapshots/solid/3-delete-nodes-ssr/ssr-function.tsx b/packages/router-plugin/tests/delete-nodes/snapshots/solid/3-delete-nodes-ssr/ssr-function.tsx index 77e05f3b12..7ed1de7be5 100644 --- a/packages/router-plugin/tests/delete-nodes/snapshots/solid/3-delete-nodes-ssr/ssr-function.tsx +++ b/packages/router-plugin/tests/delete-nodes/snapshots/solid/3-delete-nodes-ssr/ssr-function.tsx @@ -1,6 +1,6 @@ -import { createFileRoute } from '@tanstack/solid-router'; +import { createFileRoute } from '@tanstack/solid-router' export const Route = createFileRoute('/')({ component: () => { - return
hello world
; - } -}); \ No newline at end of file + return
hello world
+ }, +}) diff --git a/packages/router-plugin/tests/esbuild.test.ts b/packages/router-plugin/tests/esbuild.test.ts new file mode 100644 index 0000000000..7a7a57a515 --- /dev/null +++ b/packages/router-plugin/tests/esbuild.test.ts @@ -0,0 +1,28 @@ +import { describe, expect, test } from 'vitest' +import { + TanStackRouterCodeSplitterEsbuild, + TanStackRouterGeneratorEsbuild, + tanstackRouter, +} from '../src/esbuild' + +describe('esbuild plugin', () => { + test('refuses autoCodeSplitting', () => { + expect(() => + tanstackRouter({ target: 'react', autoCodeSplitting: true }), + ).toThrow(/autoCodeSplitting/) + }) + + test('refuses the code splitter entry', () => { + expect(() => TanStackRouterCodeSplitterEsbuild()).toThrow( + /autoCodeSplitting/, + ) + }) + + test('accepts route generation without code splitting', () => { + expect(() => tanstackRouter({ target: 'react' })).not.toThrow() + expect(() => + tanstackRouter({ target: 'react', autoCodeSplitting: false }), + ).not.toThrow() + expect(() => TanStackRouterGeneratorEsbuild()).not.toThrow() + }) +}) diff --git a/packages/router-plugin/tests/format-snapshot.ts b/packages/router-plugin/tests/format-snapshot.ts new file mode 100644 index 0000000000..d152094bea --- /dev/null +++ b/packages/router-plugin/tests/format-snapshot.ts @@ -0,0 +1,69 @@ +import { format } from 'prettier' +import { parsers } from 'prettier/plugins/typescript' +import type { ParserOptions } from 'prettier' + +/** + * Formats compiler output before it is compared with a file snapshot, so that + * snapshots record the emitted program instead of the layout choices of the + * code generator (object wrapping, blank lines, parentheses around JSX, ...). + * + * Comments are kept: they are part of the output. Output that does not parse + * is returned unchanged. + */ +export async function formatSnapshot(code: string, filepath: string) { + try { + return await format(await removeBlankLines(code, filepath), { + filepath, + parser: 'typescript', + semi: false, + singleQuote: true, + trailingComma: 'all', + // Do not keep an object expanded because the generator printed it + // over several lines. + objectWrap: 'collapse', + }) + } catch { + return code + } +} + +/** + * Prettier keeps single blank lines from its input. Outside template literals, + * line breaks are not significant, so blank lines can be dropped. + */ +async function removeBlankLines(code: string, filepath: string) { + const parser = parsers.typescript + const ast = await parser.parse(code, { filepath } as ParserOptions) + const templateRanges: Array<[number, number]> = [] + const visit = (node: unknown): void => { + if (Array.isArray(node)) { + node.forEach(visit) + return + } + if (!node || typeof node !== 'object') { + return + } + if ((node as { type?: unknown }).type === 'TemplateElement') { + templateRanges.push([parser.locStart(node), parser.locEnd(node)]) + } + for (const [key, value] of Object.entries(node)) { + if (key !== 'loc' && key !== 'range') { + visit(value) + } + } + } + visit(ast) + + const lines: Array = [] + let lineStart = 0 + for (const line of code.split('\n')) { + const isInTemplate = templateRanges.some( + ([start, end]) => start < lineStart && lineStart < end, + ) + if (line.trim() !== '' || isInTemplate) { + lines.push(line) + } + lineStart += line.length + 1 + } + return lines.join('\n') +} diff --git a/packages/router-plugin/tests/production-warnings.test.ts b/packages/router-plugin/tests/production-warnings.test.ts new file mode 100644 index 0000000000..1ace6edf50 --- /dev/null +++ b/packages/router-plugin/tests/production-warnings.test.ts @@ -0,0 +1,209 @@ +/** + * A production client build ships none of the code splitter's development + * warnings, whatever the build process's `NODE_ENV` (Vitest sets it to + * `test`, which behaves like a shell without it): the bundler's mode + * decides, and webpack and Rspack build in production when `mode` is left + * out. Such a warning would log in every visitor's console, with the + * absolute path of the route file on the build machine. + */ +import { + mkdir, + mkdtemp, + readFile, + readdir, + rm, + writeFile, +} from 'node:fs/promises' +import path from 'node:path' +import { rspack } from '@rsbuild/core' +import webpack from 'webpack' +import { describe, expect, test, vi } from 'vitest' + +const timeout = 60_000 + +/** + * The exported component stays in the route module unless the code splitter + * can split exports; the error component is split either way. + */ +const routeSource = `import { createFileRoute } from '@tanstack/react-router' + +export function ExportedPage() { + return 'MARK_EXPORTED_PAGE' +} + +function ErrorPage() { + return 'MARK_ERROR_PAGE' +} + +export const Route = createFileRoute('/')({ + component: ExportedPage, + errorComponent: ErrorPage, +}) +` + +const rootSource = `import { createRootRoute } from '@tanstack/react-router' +export const Route = createRootRoute({}) +` + +/** Writes `files` into a new app directory inside the package. */ +async function createApp(files: Record) { + // Keep the app inside the package so runtime imports resolve. + const root = await mkdtemp(path.join(__dirname, '.production-warnings-')) + await mkdir(path.join(root, 'routes')) + for (const [file, code] of Object.entries(files)) { + await writeFile(path.join(root, file), code) + } + return root +} + +function routerOptions(root: string) { + return { + target: 'react', + routesDirectory: path.join(root, 'routes'), + generatedRouteTree: path.join(root, 'routeTree.gen.ts'), + autoCodeSplitting: true, + } as const +} + +/** A client build of `entry` in `mode` (left out when undefined), unminified. */ +function compilerConfig( + root: string, + entry: string, + mode: 'production' | undefined, +) { + return { + context: root, + ...(mode ? { mode } : {}), + target: 'web', + entry: `./${entry}`, + output: { path: path.join(root, 'dist') }, + optimization: { minimize: false }, + } as const +} + +interface Compiler { + run: ( + callback: ( + error: Error | null, + stats?: { + hasErrors: () => boolean + toString: (options: object) => string + }, + ) => void, + ) => void + close: (callback: (error?: Error | null) => void) => void +} + +/** Runs one build and settles once the compiler has closed. */ +function runCompiler(compiler: Compiler) { + return new Promise((resolve, reject) => { + compiler.run((error, stats) => { + // The test removes the app afterwards: wait for the compiler to finish. + compiler.close((closeError) => { + if (error ?? closeError) { + reject(error ?? closeError) + } else if (stats?.hasErrors()) { + reject(new Error(stats.toString({ all: false, errors: true }))) + } else { + resolve() + } + }) + }) + }) +} + +const bundlers = [ + { + name: 'webpack', + // webpack parses no TypeScript: the router plugin is the only loader. + extension: 'js', + async build(root: string, entry: string, mode: 'production' | undefined) { + const { tanstackRouter } = await import('../src/webpack') + await runCompiler( + webpack({ + ...compilerConfig(root, entry, mode), + // The test app is not part of the package's TypeScript project. + resolve: { tsconfig: false }, + plugins: [tanstackRouter(routerOptions(root))], + }), + ) + }, + }, + { + name: 'rspack', + // As in Rsbuild: SWC compiles the router plugin's output. + extension: 'tsx', + async build(root: string, entry: string, mode: 'production' | undefined) { + const { tanstackRouter } = await import('../src/rspack') + await runCompiler( + rspack({ + ...compilerConfig(root, entry, mode), + module: { + rules: [ + { + test: /\.tsx?$/, + loader: 'builtin:swc-loader', + options: { + jsc: { parser: { syntax: 'typescript', tsx: true } }, + }, + type: 'javascript/auto', + }, + ], + }, + plugins: [tanstackRouter(routerOptions(root))], + }), + ) + }, + }, +] as const + +describe.each(bundlers)('$name build', (bundler) => { + test.each([ + { label: "mode: 'production'", mode: 'production' }, + { label: 'mode left out', mode: undefined }, + ] as const)( + 'with $label, the client JS logs no warning about an exported component', + async ({ mode }) => { + const routeFile = `routes/index.${bundler.extension}` + const entry = `entry.${bundler.extension}` + const root = await createApp({ + [`routes/__root.${bundler.extension}`]: rootSource, + [routeFile]: routeSource, + [entry]: `import { Route } from './${routeFile}'\nglobalThis.route = Route\n`, + }) + const warn = vi.spyOn(console, 'warn').mockImplementation(() => {}) + try { + await bundler.build(root, entry, mode) + const warned = warn.mock.calls.some((args) => + args.some((arg) => String(arg).includes('ExportedPage')), + ) + const dist = path.join(root, 'dist') + const chunks = new Map() + for (const file of await readdir(dist)) { + if (file.endsWith('.js')) { + chunks.set(file, await readFile(path.join(dist, file), 'utf8')) + } + } + expect( + chunks.get('main.js'), + 'the error component is split', + ).not.toContain('MARK_ERROR_PAGE') + // An exported component kept in the route module is reported. + const split = !chunks.get('main.js')!.includes('MARK_EXPORTED_PAGE') + expect(split || warned, 'split, or reported by the build').toBe(true) + // The app's directory name appears only in absolute paths. + const linesNamingTheApp = [...chunks].flatMap(([file, code]) => + code + .split('\n') + .filter((line) => line.includes(path.basename(root))) + .map((line) => `${file}: ${line.trim()}`), + ) + expect(linesNamingTheApp).toEqual([]) + } finally { + warn.mockRestore() + await rm(root, { recursive: true, force: true }) + } + }, + timeout, + ) +}) diff --git a/packages/router-plugin/tests/regression-helpers.ts b/packages/router-plugin/tests/regression-helpers.ts index 3cca5f6cff..df482ffe78 100644 --- a/packages/router-plugin/tests/regression-helpers.ts +++ b/packages/router-plugin/tests/regression-helpers.ts @@ -25,6 +25,7 @@ import { normalizePath } from '../src/core/utils' import { getModuleErrors } from './validate-module' import type { Config } from '../src/core/config' import type { CodeSplitGroupings } from '../src/core/constants' +import type { HmrStyle } from '../src/core/hmr' import type { TransformResult, UnpluginOptions } from 'unplugin' import type { ESTree } from 'vite' @@ -243,10 +244,11 @@ export function transformWithRouteHmrPlugin( file: routeFile('index'), routeId: '/', }, + hmrStyle?: HmrStyle, ) { const context = createRouterPluginContext() context.routesByFile.set(route.file, { routeId: route.routeId }) - const plugins = createRouterHmrPlugin(options, context) + const plugins = createRouterHmrPlugin(options, context, hmrStyle) const plugin = Array.isArray(plugins) ? plugins[0]! : plugins const output = runTransform(plugin, code, route.file) if (output === null) { diff --git a/packages/router-plugin/tests/router-plugin-context.test.ts b/packages/router-plugin/tests/router-plugin-context.test.ts index d3fb0563e6..b03e5f6701 100644 --- a/packages/router-plugin/tests/router-plugin-context.test.ts +++ b/packages/router-plugin/tests/router-plugin-context.test.ts @@ -77,16 +77,9 @@ function getCode(result: TransformResult | null | undefined) { return result.code } -function countProgramHotDeclarations(code: string) { - const ast = parseAst({ code }) - return ast.program.body.filter((statement) => { - return ( - t.isVariableDeclaration(statement) && - statement.declarations.some((declaration) => { - return t.isIdentifier(declaration.id) && declaration.id.name === 'hot' - }) - ) - }).length +/** How many times the route module accepts its own hot updates. */ +function countHotAccepts(code: string) { + return code.split('import.meta.hot.accept(').length - 1 } describe('router plugin context', () => { @@ -367,7 +360,7 @@ export const Route = createFileRoute('/owned')({ const firstCode = getCode(firstResult) expect(firstCode).not.toBeNull() - expect(countProgramHotDeclarations(firstCode!)).toBe(1) + expect(countHotAccepts(firstCode!)).toBe(1) const secondResult = await transformReferenceRoute( splitterB, diff --git a/packages/router-plugin/tests/source-maps.test.ts b/packages/router-plugin/tests/source-maps.test.ts new file mode 100644 index 0000000000..3217dd9aa3 --- /dev/null +++ b/packages/router-plugin/tests/source-maps.test.ts @@ -0,0 +1,322 @@ +/** + * Source maps of split routes point at the route file the user wrote: a throw + * in a split component, or in code the route module and a split chunk share, + * maps to its line in the route file, in real webpack and Rspack builds and + * in Vite's dev server, and the map names the route file itself, not the + * `?tsr-split` / `?tsr-shared` module id. Issues #3828 and #6667. + */ +import { + mkdir, + mkdtemp, + readFile, + readdir, + rm, + writeFile, +} from 'node:fs/promises' +import { SourceMap } from 'node:module' +import path from 'node:path' +import { rspack } from '@rsbuild/core' +import { createServer } from 'vite' +import webpack from 'webpack' +import { describe, expect, test } from 'vitest' +import type { SourceMapPayload } from 'node:module' + +const timeout = 60_000 + +/** + * A route whose split component throws, and whose loader and component share + * a function that throws, each on its own line. + */ +function routeSource({ types }: { types: boolean }) { + const never = types ? ': never' : '' + return `import { createFileRoute } from '@tanstack/react-router' + +function fail()${never} { + throw new Error('MARK_SHARED_THROW') +} + +function Page()${never} { + throw new Error('MARK_PAGE_THROW ' + typeof fail) +} + +export const Route = createFileRoute('/')({ + loader: () => fail(), + component: Page, +}) +` +} + +const rootSource = `import { createRootRoute } from '@tanstack/react-router' +export const Route = createRootRoute({}) +` + +/** The 1-based line of `marker` in `code`. */ +function lineOf(code: string, marker: string) { + return code.slice(0, code.indexOf(marker)).split('\n').length +} + +/** + * Where `code`'s source map sends the opening quote of the string `marker`: + * the source as `source` gives it, and the 1-based line. + */ +function originalPositionOf( + code: string, + map: SourceMapPayload, + marker: string, + source: (name: string) => string, +) { + const lines = code.slice(0, code.indexOf(marker) - 1).split('\n') + const entry = new SourceMap(map).findEntry( + lines.length - 1, + lines.at(-1)!.length, + ) + if (!('originalSource' in entry)) { + return undefined + } + return { + source: source(entry.originalSource), + line: entry.originalLine + 1, + } +} + +/** Writes `files` into a new app directory inside the package. */ +async function createApp(files: Record) { + // Keep the app inside the package so runtime imports resolve. + const root = await mkdtemp(path.join(__dirname, '.source-maps-')) + await mkdir(path.join(root, 'routes')) + for (const [file, code] of Object.entries(files)) { + await writeFile(path.join(root, file), code) + } + return root +} + +function routerOptions(root: string) { + return { + target: 'react', + routesDirectory: path.join(root, 'routes'), + generatedRouteTree: path.join(root, 'routeTree.gen.ts'), + autoCodeSplitting: true, + codeSplittingOptions: { addHmr: false }, + } as const +} + +/** A client production build of `entry`, unminified, with source maps. */ +function compilerConfig(root: string, entry: string) { + return { + context: root, + mode: 'production', + target: 'web', + devtool: 'source-map', + entry: `./${entry}`, + output: { path: path.join(root, 'dist') }, + optimization: { minimize: false }, + } as const +} + +interface Compiler { + run: ( + callback: ( + error: Error | null, + stats?: { + hasErrors: () => boolean + toString: (options: object) => string + }, + ) => void, + ) => void + close: (callback: (error?: Error | null) => void) => void +} + +/** Runs one build and settles once the compiler has closed. */ +function runCompiler(compiler: Compiler) { + return new Promise((resolve, reject) => { + compiler.run((error, stats) => { + // The test removes the app afterwards: wait for the compiler to finish. + compiler.close((closeError) => { + if (error ?? closeError) { + reject(error ?? closeError) + } else if (stats?.hasErrors()) { + reject(new Error(stats.toString({ all: false, errors: true }))) + } else { + resolve() + } + }) + }) + }) +} + +const bundlers = [ + { + name: 'webpack', + // webpack parses no TypeScript: the router plugin is the only loader. + extension: 'js', + async build(root: string, entry: string) { + const { tanstackRouter } = await import('../src/webpack') + await runCompiler( + webpack({ + ...compilerConfig(root, entry), + // The test app is not part of the package's TypeScript project. + resolve: { tsconfig: false }, + plugins: [tanstackRouter(routerOptions(root))], + }), + ) + }, + }, + { + name: 'rspack', + // As in Rsbuild: SWC compiles the router plugin's output. + extension: 'tsx', + async build(root: string, entry: string) { + const { tanstackRouter } = await import('../src/rspack') + await runCompiler( + rspack({ + ...compilerConfig(root, entry), + module: { + rules: [ + { + test: /\.tsx?$/, + loader: 'builtin:swc-loader', + options: { + jsc: { parser: { syntax: 'typescript', tsx: true } }, + }, + type: 'javascript/auto', + }, + ], + }, + plugins: [tanstackRouter(routerOptions(root))], + }), + ) + }, + }, +] as const + +describe.each(bundlers)('$name build', (bundler) => { + test( + 'a throw in a split component, and in code it shares, maps to its line in the route file', + async () => { + const route = routeSource({ types: bundler.extension === 'tsx' }) + const routeFile = `routes/index.${bundler.extension}` + const entry = `entry.${bundler.extension}` + const root = await createApp({ + [`routes/__root.${bundler.extension}`]: rootSource, + [routeFile]: route, + [entry]: `import { Route } from './${routeFile}'\nglobalThis.route = Route\n`, + }) + try { + await bundler.build(root, entry) + const dist = path.join(root, 'dist') + const chunks = new Map() + for (const file of await readdir(dist)) { + if (file.endsWith('.js')) { + chunks.set(file, await readFile(path.join(dist, file), 'utf8')) + } + } + for (const marker of ['MARK_PAGE_THROW', 'MARK_SHARED_THROW']) { + const [file, code] = + [...chunks].find(([, chunk]) => chunk.includes(marker)) ?? [] + expect(file, `the chunk holding ${marker}`).toBeDefined() + if (marker === 'MARK_PAGE_THROW') { + expect(file, 'the component is split').not.toBe('main.js') + } + const map = JSON.parse( + await readFile(path.join(dist, `${file}.map`), 'utf8'), + ) as SourceMapPayload + expect( + originalPositionOf(code!, map, marker, (source) => + source.replace(/^webpack:\/\/[^/]*\/\.\//, ''), + ), + `${marker} in ${file}`, + ).toEqual({ source: routeFile, line: lineOf(route, marker) }) + } + } finally { + await rm(root, { recursive: true, force: true }) + } + }, + timeout, + ) +}) + +function inlineSourceMap(code: string) { + const data = + /\/\/# sourceMappingURL=data:application\/json;(?:charset=utf-8;)?base64,(\S+)\s*$/.exec( + code, + )?.[1] + expect(data, 'the module has an inline source map').toBeDefined() + return JSON.parse( + Buffer.from(data!, 'base64').toString('utf8'), + ) as SourceMapPayload +} + +/** + * The route module served at `routeUrl` and every module derived from it + * (imports of the route file's path with a query), by URL. + */ +async function routeModules(routeUrl: URL) { + const modules = new Map() + const pending = [routeUrl.href] + while (pending.length > 0) { + const url = pending.pop()! + if (modules.has(url)) { + continue + } + const code = await (await fetch(url)).text() + modules.set(url, code) + for (const [, specifier] of code.matchAll(/["']([^"'\s]+)["']/g)) { + const derived = new URL(specifier!, url) + if (derived.pathname === routeUrl.pathname && derived.search) { + pending.push(derived.href) + } + } + } + return modules +} + +describe('vite dev', () => { + test( + 'the modules of a split route map a throw to its line in the route file, which their maps name as their source', + async () => { + const route = routeSource({ types: true }) + const root = await createApp({ + 'routes/__root.tsx': rootSource, + 'routes/index.tsx': route, + }) + const { tanstackRouter } = await import('../src/vite') + const server = await createServer({ + root, + configFile: false, + logLevel: 'silent', + plugins: [tanstackRouter(routerOptions(root))], + optimizeDeps: { noDiscovery: true, include: [] }, + server: { port: 0, hmr: false, ws: false }, + }) + try { + await server.listen() + const routeUrl = new URL( + '/routes/index.tsx', + server.resolvedUrls!.local[0], + ) + const modules = await routeModules(routeUrl) + for (const marker of ['MARK_PAGE_THROW', 'MARK_SHARED_THROW']) { + const [url, code] = + [...modules].find(([, module]) => module.includes(marker)) ?? [] + expect(url, `the module holding ${marker}`).toBeDefined() + if (marker === 'MARK_PAGE_THROW') { + expect(url, 'the component is split').not.toBe(routeUrl.href) + } + expect( + originalPositionOf( + code!, + inlineSourceMap(code!), + marker, + (source) => new URL(source, url).href, + ), + `${marker} in ${url}`, + ).toEqual({ source: routeUrl.href, line: lineOf(route, marker) }) + } + } finally { + await server.close() + await rm(root, { recursive: true, force: true }) + } + }, + timeout, + ) +}) diff --git a/packages/router-plugin/tests/utils.test.ts b/packages/router-plugin/tests/utils.test.ts index 6812b59bc3..530880858e 100644 --- a/packages/router-plugin/tests/utils.test.ts +++ b/packages/router-plugin/tests/utils.test.ts @@ -1,13 +1,12 @@ import * as babel from '@babel/core' -import * as t from '@babel/types' import { parseAst } from '@tanstack/router-utils' import { describe, expect, it } from 'vitest' import { - getObjectPropertyKeyName, getUniqueProgramIdentifier, normalizePath, routeFactoryCallCodeFilter, } from '../src/core/utils' +import type * as t from '@babel/types' import type { NodePath } from '@babel/core' function matchesRouteFactoryCallCodeFilter(code: string) { @@ -140,40 +139,3 @@ describe('routeFactoryCallCodeFilter', () => { ).toBe(true) }) }) - -describe('getObjectPropertyKeyName', () => { - it('returns identifier keys', () => { - const prop = t.objectProperty(t.identifier('component'), t.identifier('x')) - - expect(getObjectPropertyKeyName(prop)).toBe('component') - }) - - it('returns string literal keys', () => { - const prop = t.objectProperty( - t.stringLiteral('errorComponent'), - t.identifier('x'), - ) - - expect(getObjectPropertyKeyName(prop)).toBe('errorComponent') - }) - - it('returns undefined for computed identifier keys', () => { - const prop = t.objectProperty( - t.identifier('component'), - t.identifier('x'), - true, - ) - - expect(getObjectPropertyKeyName(prop)).toBeUndefined() - }) - - it('returns undefined for computed member expression keys', () => { - const prop = t.objectProperty( - t.memberExpression(t.identifier('foo'), t.identifier('bar')), - t.identifier('x'), - true, - ) - - expect(getObjectPropertyKeyName(prop)).toBeUndefined() - }) -}) diff --git a/packages/router-ssr-query-core/AGENTS.md b/packages/router-ssr-query-core/AGENTS.md index a1799ae8f3..76d3fe022f 100644 --- a/packages/router-ssr-query-core/AGENTS.md +++ b/packages/router-ssr-query-core/AGENTS.md @@ -5,5 +5,5 @@ Register QueryClient teardown at SSR attachment, before loading/dehydration can For query retention or cleanup changes, enable the GC tests that normal unit runs skip. `RUN_SSR_GC_TESTS=1` configures forked workers with exposed GC. Bypass Nx cache so a previous run with the gate disabled cannot count as validation. ```sh -RUN_SSR_GC_TESTS=1 CI=1 NX_DAEMON=false pnpm nx run @tanstack/router-ssr-query-core:test:unit --outputStyle=stream --skipRemoteCache --skipNxCache -- tests/index.test.ts +RUN_SSR_GC_TESTS=1 CI=1 NX_DAEMON=false pnpm nx run-many -p @tanstack/router-ssr-query-core -t test:unit --skipRemoteCache --skipNxCache -- tests/index.test.ts ``` diff --git a/packages/router-ssr-query-core/tests/dehydrate.bench.ts b/packages/router-ssr-query-core/tests/dehydrate.bench.ts index 7e90ab4a71..7f9dfeb9b6 100644 --- a/packages/router-ssr-query-core/tests/dehydrate.bench.ts +++ b/packages/router-ssr-query-core/tests/dehydrate.bench.ts @@ -1,7 +1,7 @@ // @vitest-environment node import { QueryClient, dehydrate, dehydrateQuery } from '@tanstack/query-core' -import { afterAll, bench, describe, expect } from 'vitest' +import { afterAll, describe, expect, test } from 'vitest' import type { Query } from '@tanstack/query-core' type DehydratedQuery = ReturnType @@ -49,20 +49,24 @@ describe.each([ afterAll(() => queryClient.clear()) - bench('filter full query cache', () => { - const dehydratedQueries = dehydrate(queryClient, { - shouldDehydrateQuery: (query) => - selectedQueryHashes.has(query.queryHash), - }).queries - benchmarkSink = consumeQueries(dehydratedQueries) + test('filter full query cache', async ({ bench }) => { + await bench('filter full query cache', () => { + const dehydratedQueries = dehydrate(queryClient, { + shouldDehydrateQuery: (query) => + selectedQueryHashes.has(query.queryHash), + }).queries + benchmarkSink = consumeQueries(dehydratedQueries) + }).run() }) - bench('dehydrate direct query references', () => { - const dehydratedQueries = new Array() - for (const query of selectedQueries.values()) { - dehydratedQueries.push(dehydrateQuery(query)) - } - benchmarkSink = consumeQueries(dehydratedQueries) + test('dehydrate direct query references', async ({ bench }) => { + await bench('dehydrate direct query references', () => { + const dehydratedQueries = new Array() + for (const query of selectedQueries.values()) { + dehydratedQueries.push(dehydrateQuery(query)) + } + benchmarkSink = consumeQueries(dehydratedQueries) + }).run() }) }, ) diff --git a/packages/router-ssr-query-core/tests/server-lifecycle.bench.ts b/packages/router-ssr-query-core/tests/server-lifecycle.bench.ts index bf115f61fb..f66e3f234b 100644 --- a/packages/router-ssr-query-core/tests/server-lifecycle.bench.ts +++ b/packages/router-ssr-query-core/tests/server-lifecycle.bench.ts @@ -1,21 +1,23 @@ // @vitest-environment node import { QueryClient } from '@tanstack/query-core' -import { afterAll, bench, describe } from 'vitest' +import { afterAll, describe, test } from 'vitest' import { setupCoreRouterSsrQueryIntegration } from '../src' let benchmarkSink = 0 describe('server request lifecycle', () => { - bench('create and close a ReadableStream', () => { - let controller!: ReadableStreamDefaultController - const stream = new ReadableStream({ - start(value) { - controller = value - }, - }) - controller.close() - benchmarkSink += stream.locked ? 1 : 0 + test('create and close a ReadableStream', async ({ bench }) => { + await bench('create and close a ReadableStream', () => { + let controller!: ReadableStreamDefaultController + const stream = new ReadableStream({ + start(value) { + controller = value + }, + }) + controller.close() + benchmarkSink += stream.locked ? 1 : 0 + }).run() }) const subscriptionClient = new QueryClient() @@ -23,58 +25,68 @@ describe('server request lifecycle', () => { const listener = () => {} afterAll(() => subscriptionClient.clear()) - bench('subscribe and unsubscribe from QueryCache', () => { - const unsubscribe = queryCache.subscribe(listener) - unsubscribe() + test('subscribe and unsubscribe from QueryCache', async ({ bench }) => { + await bench('subscribe and unsubscribe from QueryCache', () => { + const unsubscribe = queryCache.subscribe(listener) + unsubscribe() + }).run() }) - bench('setup and cleanup before dehydrate', () => { - const queryClient = new QueryClient() - const fixture = createServerRouter() + test('setup and cleanup before dehydrate', async ({ bench }) => { + await bench('setup and cleanup before dehydrate', () => { + const queryClient = new QueryClient() + const fixture = createServerRouter() - setupCoreRouterSsrQueryIntegration({ - router: fixture.router as any, - queryClient, - }) - fixture.attach() - fixture.cleanup() - benchmarkSink += fixture.cleanupListenerCount() + setupCoreRouterSsrQueryIntegration({ + router: fixture.router as any, + queryClient, + }) + fixture.attach() + fixture.cleanup() + benchmarkSink += fixture.cleanupListenerCount() + }).run() }) - bench('setup and dehydrate an empty request', async () => { - const queryClient = new QueryClient() - const fixture = createServerRouter() + test('setup and dehydrate an empty request', async ({ bench }) => { + await bench('setup and dehydrate an empty request', async () => { + const queryClient = new QueryClient() + const fixture = createServerRouter() - setupCoreRouterSsrQueryIntegration({ - router: fixture.router as any, - queryClient, - }) - fixture.attach() - const dehydrated = await fixture.router.options.dehydrate?.() - fixture.finishRender() - fixture.cleanup() - benchmarkSink += dehydrated?.query.stream.locked ? 1 : 0 + setupCoreRouterSsrQueryIntegration({ + router: fixture.router as any, + queryClient, + }) + fixture.attach() + const dehydrated = await fixture.router.options.dehydrate?.() + fixture.finishRender() + fixture.cleanup() + benchmarkSink += dehydrated?.query.stream.locked ? 1 : 0 + }).run() }) - bench('write 100 loader queries without integration', () => { - const queryClient = new QueryClient() - populateQueryClient(queryClient, 100) - benchmarkSink += queryClient.getQueryCache().getAll().length - queryClient.clear() + test('write 100 loader queries without integration', async ({ bench }) => { + await bench('write 100 loader queries without integration', () => { + const queryClient = new QueryClient() + populateQueryClient(queryClient, 100) + benchmarkSink += queryClient.getQueryCache().getAll().length + queryClient.clear() + }).run() }) - bench('write 100 loader queries before dehydrate', () => { - const queryClient = new QueryClient() - const fixture = createServerRouter() + test('write 100 loader queries before dehydrate', async ({ bench }) => { + await bench('write 100 loader queries before dehydrate', () => { + const queryClient = new QueryClient() + const fixture = createServerRouter() - setupCoreRouterSsrQueryIntegration({ - router: fixture.router as any, - queryClient, - }) - fixture.attach() - populateQueryClient(queryClient, 100) - benchmarkSink += queryClient.getQueryCache().getAll().length - fixture.cleanup() + setupCoreRouterSsrQueryIntegration({ + router: fixture.router as any, + queryClient, + }) + fixture.attach() + populateQueryClient(queryClient, 100) + benchmarkSink += queryClient.getQueryCache().getAll().length + fixture.cleanup() + }).run() }) }) diff --git a/packages/router-utils/CHANGELOG.md b/packages/router-utils/CHANGELOG.md index e088b78fab..55ce3a571b 100644 --- a/packages/router-utils/CHANGELOG.md +++ b/packages/router-utils/CHANGELOG.md @@ -1,5 +1,21 @@ # @tanstack/router-utils +## 1.163.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 + +- [#8867](https://github.com/TanStack/router/pull/8867) [`ff157f0`](https://github.com/TanStack/router/commit/ff157f0079982e90d62be7fdeecfb77e4fdcec69) - Parse decorators placed after `export` (`export @dec class Store {}`). A route file with one is now read by the route generator and split, instead of logging a parse error, leaving the route tree unwritten and the route unsplit. Start's compilers, which share the parser, accept it too. + +## 1.162.4 + +### Patch Changes + +- [#8709](https://github.com/TanStack/router/pull/8709) [`923d98b`](https://github.com/TanStack/router/commit/923d98b18b6cd90b6219591e20e86115dc61048e) - Bump `diff` dependency to `^9.0.0`. + ## 1.162.3 ### Patch Changes diff --git a/packages/router-utils/package.json b/packages/router-utils/package.json index fe7ce16b32..0ce243718f 100644 --- a/packages/router-utils/package.json +++ b/packages/router-utils/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-utils", - "version": "1.162.3", + "version": "1.163.0", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", @@ -33,7 +33,7 @@ "test:types:ts59": "node ../../node_modules/typescript59/lib/tsc.js", "test:types:ts60": "tsc6", "test:types:ts70": "tsc", - "test:unit": "exit 0; vitest --typecheck", + "test:unit": "vitest", "test:build": "publint --strict && attw --ignore-rules no-resolution --pack .", "build": "vite build" }, @@ -60,7 +60,7 @@ "src" ], "engines": { - "node": ">=20.19" + "node": "^20.19.0 || >=22.12.0" }, "dependencies": { "@babel/generator": "^7.29.8", @@ -68,7 +68,7 @@ "@babel/types": "catalog:", "ansis": "^4.3.1", "babel-dead-code-elimination": "^1.0.12", - "diff": "^8.0.4", + "diff": "^9.0.0", "pathe": "catalog:", "tinyglobby": "catalog:" }, diff --git a/packages/router-utils/src/ast.ts b/packages/router-utils/src/ast.ts index 46e319c2c4..6448adcbad 100644 --- a/packages/router-utils/src/ast.ts +++ b/packages/router-utils/src/ast.ts @@ -39,7 +39,7 @@ function getDefaultParserPluginsForFilename( 'explicitResourceManagement', 'importAttributes', 'deprecatedImportAssert', - ['decorators', { decoratorsBeforeExport: true }], + 'decorators', 'decoratorAutoAccessors', ] diff --git a/packages/router-vite-plugin/CHANGELOG.md b/packages/router-vite-plugin/CHANGELOG.md index 084c222143..90d47e813e 100644 --- a/packages/router-vite-plugin/CHANGELOG.md +++ b/packages/router-vite-plugin/CHANGELOG.md @@ -1,5 +1,47 @@ # @tanstack/router-vite-plugin +## 1.167.49 + +### Patch Changes + +- Updated dependencies [[`1ba19a0`](https://github.com/TanStack/router/commit/1ba19a04456983ee0f8adffd038b6b1194441e15), [`94f36c4`](https://github.com/TanStack/router/commit/94f36c4a9ecf3062b326a8eb772e73b00c0644d9), [`446ce1b`](https://github.com/TanStack/router/commit/446ce1b30650d85f1fc78f2d1ee42712e40b75c6), [`533ca27`](https://github.com/TanStack/router/commit/533ca2704452f36c5fef5c5fe084554d9b5db1ab), [`13b6256`](https://github.com/TanStack/router/commit/13b625683030ea4ab359495ecda570e05e472587), [`b5e2ac9`](https://github.com/TanStack/router/commit/b5e2ac9c4cee4c5c6f464adc6cfddcddf6c84171), [`d250819`](https://github.com/TanStack/router/commit/d25081952dd04a5f5a44db7c8df5cbbf50fad054), [`f420d4a`](https://github.com/TanStack/router/commit/f420d4a6dacfaa81d306b7bbc9af8f1010d1a1bc)]: + - @tanstack/router-plugin@1.169.0 + +## 1.167.48 + +### Patch Changes + +- Updated dependencies [[`32a3360`](https://github.com/TanStack/router/commit/32a3360cba0e0f884b3215813a48c63467f5a53c), [`647cb73`](https://github.com/TanStack/router/commit/647cb737a5622813d276d6042766692ca5ae67ed)]: + - @tanstack/router-plugin@1.168.48 + +## 1.167.47 + +### Patch Changes + +- Updated dependencies []: + - @tanstack/router-plugin@1.168.47 + +## 1.167.46 + +### Patch Changes + +- Updated dependencies []: + - @tanstack/router-plugin@1.168.46 + +## 1.167.45 + +### Patch Changes + +- Updated dependencies []: + - @tanstack/router-plugin@1.168.45 + +## 1.167.44 + +### Patch Changes + +- Updated dependencies [[`e66da18`](https://github.com/TanStack/router/commit/e66da18266859ab49e20a7b8c858232449ee5290)]: + - @tanstack/router-plugin@1.168.44 + ## 1.167.43 ### Patch Changes diff --git a/packages/router-vite-plugin/package.json b/packages/router-vite-plugin/package.json index f33d83250b..8e411904cb 100644 --- a/packages/router-vite-plugin/package.json +++ b/packages/router-vite-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/router-vite-plugin", - "version": "1.167.43", + "version": "1.167.49", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-router-devtools/CHANGELOG.md b/packages/solid-router-devtools/CHANGELOG.md index 9684a0567d..709d8cd23d 100644 --- a/packages/solid-router-devtools/CHANGELOG.md +++ b/packages/solid-router-devtools/CHANGELOG.md @@ -1,5 +1,12 @@ # @tanstack/solid-router-devtools +## 1.167.3 + +### Patch Changes + +- Updated dependencies [[`bbf9b75`](https://github.com/TanStack/router/commit/bbf9b75808d8eee497a6dd1663f0cf08426512e0)]: + - @tanstack/router-devtools-core@1.168.3 + ## 1.167.2 ### Patch Changes diff --git a/packages/solid-router-devtools/package.json b/packages/solid-router-devtools/package.json index 80cdda7208..bcc006458f 100644 --- a/packages/solid-router-devtools/package.json +++ b/packages/solid-router-devtools/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-router-devtools", - "version": "1.167.2", + "version": "1.167.3", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-router/CHANGELOG.md b/packages/solid-router/CHANGELOG.md index 9cacc2b47f..3a40aa28c3 100644 --- a/packages/solid-router/CHANGELOG.md +++ b/packages/solid-router/CHANGELOG.md @@ -1,5 +1,35 @@ # @tanstack/solid-router +## 1.170.43 + +### 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.42 + +### Patch Changes + +- Updated dependencies [[`18154b1`](https://github.com/TanStack/router/commit/18154b1c45454a70aa77e9d6d27c8a6e0733d031)]: + - @tanstack/router-core@1.171.38 + +## 1.170.41 + +### Patch Changes + +- Updated dependencies [[`d6ba115`](https://github.com/TanStack/router/commit/d6ba115d5751c75e20943f0062577cf17b446d82)]: + - @tanstack/router-core@1.171.37 + +## 1.170.40 + +### Patch Changes + +- Updated dependencies [[`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5)]: + - @tanstack/router-core@1.171.36 + ## 1.170.39 ### Patch Changes diff --git a/packages/solid-router/package.json b/packages/solid-router/package.json index 488ac3fd42..80840069ea 100644 --- a/packages/solid-router/package.json +++ b/packages/solid-router/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-router", - "version": "1.170.39", + "version": "1.170.43", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-router/skills/solid-router/SKILL.md b/packages/solid-router/skills/solid-router/SKILL.md index 0cfd22ad73..e6bff33a42 100644 --- a/packages/solid-router/skills/solid-router/SKILL.md +++ b/packages/solid-router/skills/solid-router/SKILL.md @@ -21,7 +21,7 @@ sources: # Solid Router (`@tanstack/solid-router`) -This skill builds on router-core. Read [router-core](../../../router-core/skills/router-core/SKILL.md) first for foundational concepts. +This skill builds on router-core. Read `@tanstack/router-core#router-core` first for foundational concepts. > **CRITICAL**: TanStack Router types are FULLY INFERRED. Never cast, never annotate inferred values. > **CRITICAL**: TanStack Router is CLIENT-FIRST. Loaders run on the client by default, not on the server. @@ -495,4 +495,4 @@ Must set `target: 'solid'` in the router plugin config. Default is `'react'`. ## Cross-References -- [router-core/SKILL.md](../../../router-core/skills/router-core/SKILL.md) — all sub-skills for domain-specific patterns (search params, data loading, navigation, auth, SSR, etc.) +- `@tanstack/router-core#router-core` — all sub-skills for domain-specific patterns (search params, data loading, navigation, auth, SSR, etc.) diff --git a/packages/solid-router/tests/Scripts.test.tsx b/packages/solid-router/tests/Scripts.test.tsx index ca87e2fba0..bafcf0f4c0 100644 --- a/packages/solid-router/tests/Scripts.test.tsx +++ b/packages/solid-router/tests/Scripts.test.tsx @@ -447,6 +447,11 @@ describe('ssr scripts', () => { .querySelector('link[rel="modulepreload"]') ?.getAttribute('crossorigin'), ).toBe('anonymous') + expect( + document.head + .querySelector('link[rel="modulepreload"]') + ?.getAttribute('fetchpriority'), + ).toBe('low') }) test('renders runtime manifest inlineStyle', async () => { @@ -501,7 +506,7 @@ describe('ssr scripts', () => { ).toBe('.runtime{color:red}') }) - test('renders preload as script links for iife manifest preloads', async () => { + test('renders iife manifest preloads as low priority script links', async () => { const history = createTestBrowserHistory() const rootRoute = createRootRoute({ @@ -541,6 +546,11 @@ describe('ssr scripts', () => { }) expect(document.head.querySelector('link[rel="modulepreload"]')).toBeFalsy() + expect( + document.head + .querySelector('link[rel="preload"][as="script"]') + ?.getAttribute('fetchpriority'), + ).toBe('low') }) }) diff --git a/packages/solid-router/tests/blocker.test.tsx b/packages/solid-router/tests/blocker.test.tsx index be10c91ac6..ac27b633e5 100644 --- a/packages/solid-router/tests/blocker.test.tsx +++ b/packages/solid-router/tests/blocker.test.tsx @@ -1,4 +1,3 @@ -import '@testing-library/jest-dom/vitest' import { afterEach, describe, expect, test, vi } from 'vitest' import { cleanup, fireEvent, render, screen } from '@solidjs/testing-library' import combinate from 'combinate' diff --git a/packages/solid-router/tests/jest-dom.setup.ts b/packages/solid-router/tests/jest-dom.setup.ts new file mode 100644 index 0000000000..8f7cbf15be --- /dev/null +++ b/packages/solid-router/tests/jest-dom.setup.ts @@ -0,0 +1,18 @@ +import * as jestDomMatchers from '@testing-library/jest-dom/matchers' +import { expect } from 'vitest' +import type { TestingLibraryMatchers } from '@testing-library/jest-dom/matchers' + +// Workaround for Vitest 5: remove once testing-library/jest-dom#742 is merged +// and released, and go back to `import '@testing-library/jest-dom/vitest'`. +// That entry imports `vitest` from its own install location, which can resolve +// a different Vitest copy than the one running these tests, and its types +// augment Vitest 4's `Assertion` instead of Vitest 5's `Matchers`. +// Keep `jest-dom` in this file name: vite-plugin-solid only skips injecting +// `@testing-library/jest-dom/vitest` when a setup file path contains it. +expect.extend(jestDomMatchers) + +declare module 'vitest' { + // Type parameter names must match Vitest's declaration for the interfaces to merge. + // eslint-disable-next-line @typescript-eslint/naming-convention + interface Matchers extends TestingLibraryMatchers {} +} diff --git a/packages/solid-router/tests/link.bench.tsx b/packages/solid-router/tests/link.bench.tsx index 4f13f3cebb..30c2585d08 100644 --- a/packages/solid-router/tests/link.bench.tsx +++ b/packages/solid-router/tests/link.bench.tsx @@ -1,5 +1,5 @@ import { render } from '@solidjs/testing-library' -import { bench, describe } from 'vitest' +import { describe, test } from 'vitest' import { getRouteSegments } from '@tanstack/router-core' import { Link, @@ -83,22 +83,21 @@ describe.each([ ])('$name', ({ numberOfRoutes, numberOfLinks, matchedParamId }) => { const renderRouter = createRouterRenderer(numberOfRoutes) - bench( - 'hardcoded href', - () => { + test('hardcoded href', async ({ bench }) => { + await bench('hardcoded href', () => { const router = renderRouter( Array.from({ length: numberOfLinks }).map((_, i) => (
{i} )), ) render(() => ) - }, - { warmupIterations: 1 }, - ) + }).run({ + warmupIterations: 1, + }) + }) - bench( - 'interpolate path', - () => { + test('interpolate path', async ({ bench }) => { + await bench('interpolate path', () => { const router = renderRouter( Array.from({ length: numberOfLinks }).map((_, i) => ( ) - }, - { warmupIterations: 1 }, - ) + }).run({ + warmupIterations: 1, + }) + }) - bench( - 'build location', - () => { + test('build location', async ({ bench }) => { + await bench('build location', () => { const router = renderRouter( Array.from({ length: numberOfLinks }).map((_, i) => ( ) - }, - { warmupIterations: 1 }, - ) + }).run({ + warmupIterations: 1, + }) + }) - bench( - 'link to absolute path', - () => { + test('link to absolute path', async ({ bench }) => { + await bench('link to absolute path', () => { const router = renderRouter( Array.from({ length: numberOfLinks }).map((_, i) => ( ) - }, - { warmupIterations: 1 }, - ) + }).run({ + warmupIterations: 1, + }) + }) - bench( - 'link to relative path', - () => { + test('link to relative path', async ({ bench }) => { + await bench('link to relative path', () => { const router = renderRouter( Array.from({ length: numberOfLinks }).map((_, i) => { const to = `./params/$param${Math.min(i, matchedParamId)}` @@ -169,13 +168,13 @@ describe.each([ }), ) render(() => ) - }, - { warmupIterations: 1 }, - ) + }).run({ + warmupIterations: 1, + }) + }) - bench( - 'link to current path', - () => { + test('link to current path', async ({ bench }) => { + await bench('link to current path', () => { const router = renderRouter( Array.from({ length: numberOfLinks }).map((_, i) => ( @@ -184,7 +183,8 @@ describe.each([ )), ) render(() => ) - }, - { warmupIterations: 1 }, - ) + }).run({ + warmupIterations: 1, + }) + }) }) diff --git a/packages/solid-router/tests/server/HeadContent.test.tsx b/packages/solid-router/tests/server/HeadContent.test.tsx new file mode 100644 index 0000000000..0290588b19 --- /dev/null +++ b/packages/solid-router/tests/server/HeadContent.test.tsx @@ -0,0 +1,63 @@ +import { describe, expect, it } from 'vitest' +import { renderToStringAsync } from 'solid-js/web' +import { + HeadContent, + RouterProvider, + createMemoryHistory, + createRootRoute, + createRouter, +} from '../../src' +import type { Manifest } from '@tanstack/router-core' + +async function renderHeadContent(manifest: Omit = {}) { + const rootRoute = createRootRoute({ + component: () => ( + + + + + + + ), + }) + const router = createRouter({ + history: createMemoryHistory({ initialEntries: ['/'] }), + routeTree: rootRoute, + isServer: true, + }) + + router.ssr = { + manifest: { + ...manifest, + routes: { + [rootRoute.id]: { + preloads: ['/low-priority.js'], + }, + }, + }, + } + + await router.load() + + const html = await renderToStringAsync(() => ( + + )) + return html.match(/]*\/low-priority\.js[^>]*>/)?.[0] +} + +describe('HeadContent (server)', () => { + it('renders manifest module preloads with low fetch priority', async () => { + const link = await renderHeadContent() + + expect(link).toMatch(/\brel="modulepreload"/) + expect(link).toMatch(/\bfetchpriority="low"/i) + }) + + it('renders iife manifest preloads as low priority script links', async () => { + const link = await renderHeadContent({ scriptFormat: 'iife' }) + + expect(link).toMatch(/\brel="preload"/) + expect(link).toMatch(/\bas="script"/) + expect(link).toMatch(/\bfetchpriority="low"/i) + }) +}) diff --git a/packages/solid-router/tests/setupTests.tsx b/packages/solid-router/tests/setupTests.tsx index c3d7ec5cf7..6ab5039d6e 100644 --- a/packages/solid-router/tests/setupTests.tsx +++ b/packages/solid-router/tests/setupTests.tsx @@ -1,4 +1,3 @@ -import '@testing-library/jest-dom/vitest' import { vi } from 'vitest' // @ts-expect-error diff --git a/packages/solid-router/tests/useBlocker.test.tsx b/packages/solid-router/tests/useBlocker.test.tsx index 4af8cbdaf7..07239caf67 100644 --- a/packages/solid-router/tests/useBlocker.test.tsx +++ b/packages/solid-router/tests/useBlocker.test.tsx @@ -1,4 +1,3 @@ -import '@testing-library/jest-dom/vitest' import { afterEach, describe, expect, test, vi } from 'vitest' import { cleanup, fireEvent, render, screen } from '@solidjs/testing-library' diff --git a/packages/solid-router/tests/useNavigate.test.tsx b/packages/solid-router/tests/useNavigate.test.tsx index a90b63fd4f..47c14b284a 100644 --- a/packages/solid-router/tests/useNavigate.test.tsx +++ b/packages/solid-router/tests/useNavigate.test.tsx @@ -1,5 +1,4 @@ import * as Solid from 'solid-js' -import '@testing-library/jest-dom/vitest' import { afterEach, beforeEach, describe, expect, test } from 'vitest' import { cleanup, diff --git a/packages/solid-router/vite.config.ts b/packages/solid-router/vite.config.ts index ebaf79a9e2..3c9e49ec37 100644 --- a/packages/solid-router/vite.config.ts +++ b/packages/solid-router/vite.config.ts @@ -39,7 +39,7 @@ const config = defineConfig(({ mode }) => { watch: false, environment: 'jsdom', typecheck: { enabled: true }, - setupFiles: ['./tests/setupTests.tsx'], + setupFiles: ['./tests/jest-dom.setup.ts', './tests/setupTests.tsx'], server: { deps: { inline: [/@solidjs/, /@tanstack\/solid-store/], diff --git a/packages/solid-start-client/CHANGELOG.md b/packages/solid-start-client/CHANGELOG.md index 3761db8cfd..9f5223d04d 100644 --- a/packages/solid-start-client/CHANGELOG.md +++ b/packages/solid-start-client/CHANGELOG.md @@ -1,5 +1,41 @@ # @tanstack/solid-start-client +## 1.168.42 + +### Patch Changes + +- Updated dependencies [[`32a3360`](https://github.com/TanStack/router/commit/32a3360cba0e0f884b3215813a48c63467f5a53c)]: + - @tanstack/router-core@1.171.39 + - @tanstack/solid-router@1.170.43 + - @tanstack/start-client-core@1.170.39 + +## 1.168.41 + +### Patch Changes + +- Updated dependencies [[`18154b1`](https://github.com/TanStack/router/commit/18154b1c45454a70aa77e9d6d27c8a6e0733d031)]: + - @tanstack/router-core@1.171.38 + - @tanstack/solid-router@1.170.42 + - @tanstack/start-client-core@1.170.38 + +## 1.168.40 + +### 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/solid-router@1.170.41 + +## 1.168.39 + +### 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/solid-router@1.170.40 + ## 1.168.38 ### Patch Changes diff --git a/packages/solid-start-client/package.json b/packages/solid-start-client/package.json index 8a1bfb4d84..3e30225764 100644 --- a/packages/solid-start-client/package.json +++ b/packages/solid-start-client/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-client", - "version": "1.168.38", + "version": "1.168.42", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start-client/src/tests/createServerFn.test-d.tsx b/packages/solid-start-client/src/tests/createServerFn.test-d.tsx deleted file mode 100644 index 5311f27244..0000000000 --- a/packages/solid-start-client/src/tests/createServerFn.test-d.tsx +++ /dev/null @@ -1,15 +0,0 @@ -// import { expectTypeOf, test } from 'vitest' -// import { createServerFn } from '@tanstack/start-client-core' - -// test('createServerFn returns RSC', () => { -// const fn = createServerFn().handler(() => ({ -// rscs: [ -//
I'm an RSC
, -//
I'm an RSC
, -// ] as const, -// })) - -// expectTypeOf(fn()).toEqualTypeOf< -// Promise<{ rscs: readonly [ReadableStream, ReadableStream] }> -// >() -// }) diff --git a/packages/solid-start-client/src/tests/jest-dom.setup.ts b/packages/solid-start-client/src/tests/jest-dom.setup.ts new file mode 100644 index 0000000000..8f7cbf15be --- /dev/null +++ b/packages/solid-start-client/src/tests/jest-dom.setup.ts @@ -0,0 +1,18 @@ +import * as jestDomMatchers from '@testing-library/jest-dom/matchers' +import { expect } from 'vitest' +import type { TestingLibraryMatchers } from '@testing-library/jest-dom/matchers' + +// Workaround for Vitest 5: remove once testing-library/jest-dom#742 is merged +// and released, and go back to `import '@testing-library/jest-dom/vitest'`. +// That entry imports `vitest` from its own install location, which can resolve +// a different Vitest copy than the one running these tests, and its types +// augment Vitest 4's `Assertion` instead of Vitest 5's `Matchers`. +// Keep `jest-dom` in this file name: vite-plugin-solid only skips injecting +// `@testing-library/jest-dom/vitest` when a setup file path contains it. +expect.extend(jestDomMatchers) + +declare module 'vitest' { + // Type parameter names must match Vitest's declaration for the interfaces to merge. + // eslint-disable-next-line @typescript-eslint/naming-convention + interface Matchers extends TestingLibraryMatchers {} +} diff --git a/packages/solid-start-client/src/tests/setupTests.tsx b/packages/solid-start-client/src/tests/setupTests.tsx deleted file mode 100644 index a9d0dd31aa..0000000000 --- a/packages/solid-start-client/src/tests/setupTests.tsx +++ /dev/null @@ -1 +0,0 @@ -import '@testing-library/jest-dom/vitest' diff --git a/packages/solid-start-client/vite.config.ts b/packages/solid-start-client/vite.config.ts index dbfb60ea03..927e0588bd 100644 --- a/packages/solid-start-client/vite.config.ts +++ b/packages/solid-start-client/vite.config.ts @@ -11,7 +11,7 @@ const config = defineConfig({ name: packageJson.name, watch: false, environment: 'jsdom', - setupFiles: ['./src/tests/setupTests.tsx'], + setupFiles: ['./src/tests/jest-dom.setup.ts'], }, }) diff --git a/packages/solid-start-server/CHANGELOG.md b/packages/solid-start-server/CHANGELOG.md index 1aa6201382..a1a8b33dad 100644 --- a/packages/solid-start-server/CHANGELOG.md +++ b/packages/solid-start-server/CHANGELOG.md @@ -1,5 +1,54 @@ # @tanstack/solid-start-server +## 1.167.50 + +### Patch Changes + +- Updated dependencies [[`32a3360`](https://github.com/TanStack/router/commit/32a3360cba0e0f884b3215813a48c63467f5a53c)]: + - @tanstack/router-core@1.171.39 + - @tanstack/solid-router@1.170.43 + - @tanstack/start-server-core@1.169.45 + +## 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/solid-router@1.170.42 + +## 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/solid-router@1.170.41 + +## 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/solid-router@1.170.40 + ## 1.167.45 ### Patch Changes diff --git a/packages/solid-start-server/package.json b/packages/solid-start-server/package.json index f0484e9c22..a87cad7b94 100644 --- a/packages/solid-start-server/package.json +++ b/packages/solid-start-server/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start-server", - "version": "1.167.45", + "version": "1.167.50", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/solid-start/CHANGELOG.md b/packages/solid-start/CHANGELOG.md index 58a2873232..4de784d03c 100644 --- a/packages/solid-start/CHANGELOG.md +++ b/packages/solid-start/CHANGELOG.md @@ -1,5 +1,96 @@ # @tanstack/solid-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. + +- 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/solid-router@1.170.43 + - @tanstack/start-client-core@1.170.39 + - @tanstack/start-server-core@1.169.45 + - @tanstack/start-plugin-core@1.171.55 + - @tanstack/solid-start-client@1.168.42 + - @tanstack/solid-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/solid-router@1.170.42 + - @tanstack/solid-start-client@1.168.41 + - @tanstack/solid-start-server@1.167.49 + - @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)]: + - @tanstack/start-server-core@1.169.43 + - @tanstack/start-plugin-core@1.171.53 + - @tanstack/solid-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/solid-start-server@1.167.47 + - @tanstack/start-plugin-core@1.171.52 + - @tanstack/start-client-core@1.170.37 + - @tanstack/solid-router@1.170.41 + - @tanstack/solid-start-client@1.168.40 + +## 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/solid-start-server@1.167.46 + - @tanstack/solid-router@1.170.40 + - @tanstack/solid-start-client@1.168.39 + ## 1.168.58 ### Patch Changes diff --git a/packages/solid-start/package.json b/packages/solid-start/package.json index 09b54efa46..2f378426cc 100644 --- a/packages/solid-start/package.json +++ b/packages/solid-start/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/solid-start", - "version": "1.168.58", + "version": "1.169.6", "description": "Modern and scalable routing for Solid applications", "author": "Tanner Linsley", "license": "MIT", @@ -142,9 +142,9 @@ "rimraf": "catalog:" }, "peerDependencies": { - "@rsbuild/core": "^2.0.0", + "@rsbuild/core": "^2.0.5", "solid-js": ">=1.0.0", - "vite": ">=7.0.0" + "vite": ">=8.0.0" }, "peerDependenciesMeta": { "@rsbuild/core": { diff --git a/packages/solid-start/skills/solid-start/SKILL.md b/packages/solid-start/skills/solid-start/SKILL.md index 236bac2b0c..6c56711e0b 100644 --- a/packages/solid-start/skills/solid-start/SKILL.md +++ b/packages/solid-start/skills/solid-start/SKILL.md @@ -19,7 +19,7 @@ sources: # Solid Start (`@tanstack/solid-start`) -This skill builds on start-core. Read [start-core](../../../start-client-core/skills/start-core/SKILL.md) first for foundational concepts. +This skill builds on start-core. Read `@tanstack/start-client-core#start-core` first for foundational concepts. This skill covers the Solid-specific bindings, setup, and patterns for TanStack Start. @@ -37,7 +37,7 @@ This skill covers the Solid-specific bindings, setup, and patterns for TanStack All core APIs (`createServerFn`, `createMiddleware`, `createStart`, `createIsomorphicFn`, `createServerOnlyFn`, `createClientOnlyFn`) are available from `@tanstack/solid-start`. -Server utilities (`getRequest`, `getRequestHeader`, `setResponseHeader`, `setCookie`, `getCookie`, `useSession`) are imported from `@tanstack/solid-start/server`. +Server utilities (`getRequest`, `getRequestHeader`, `setResponseHeader`, `setCookie`, `getCookie`) are imported from `@tanstack/solid-start/server`. ## Full Project Setup @@ -276,6 +276,6 @@ plugins: [tanstackStart(), solidPlugin()] ## Cross-References -- [start-core](../../../start-client-core/skills/start-core/SKILL.md) — core Start concepts -- [router-core](../../../router-core/skills/router-core/SKILL.md) — routing fundamentals -- [solid-router](../../../solid-router/skills/solid-router/SKILL.md) — Solid Router hooks and components +- `@tanstack/start-client-core#start-core` — core Start concepts +- `@tanstack/router-core#router-core` — routing fundamentals +- `@tanstack/solid-router#solid-router` — Solid Router hooks and components diff --git a/packages/solid-start/src/default-entry/server.ts b/packages/solid-start/src/default-entry/server.ts index b8f3105c6a..ae38924363 100644 --- a/packages/solid-start/src/default-entry/server.ts +++ b/packages/solid-start/src/default-entry/server.ts @@ -1,6 +1,7 @@ import { createStartHandler, defaultStreamHandler, + createServerEntry as createCoreServerEntry, } from '@tanstack/solid-start/server' import type { Register } from '@tanstack/solid-router' import type { RequestHandler } from '@tanstack/solid-start/server' @@ -10,12 +11,8 @@ const fetch = createStartHandler(defaultStreamHandler) // Providing `RequestHandler` from `@tanstack/solid-start/server` is required so that the output types don't import it from `@tanstack/start-server-core` export type ServerEntry = { fetch: RequestHandler } -export function createServerEntry(entry: ServerEntry): ServerEntry { - return { - async fetch(...args) { - return await entry.fetch(...args) - }, - } -} +// Bind the shared request context and fallback error handling to Solid's Register. +export const createServerEntry: (entry: ServerEntry) => ServerEntry = + createCoreServerEntry export default createServerEntry({ fetch }) diff --git a/packages/start-client-core/CHANGELOG.md b/packages/start-client-core/CHANGELOG.md index 9df3cb2783..521960c1ac 100644 --- a/packages/start-client-core/CHANGELOG.md +++ b/packages/start-client-core/CHANGELOG.md @@ -1,5 +1,47 @@ # @tanstack/start-client-core +## 1.170.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. + +- Updated dependencies [[`32a3360`](https://github.com/TanStack/router/commit/32a3360cba0e0f884b3215813a48c63467f5a53c)]: + - @tanstack/router-core@1.171.39 + - @tanstack/start-storage-context@1.167.41 + +## 1.170.38 + +### Patch Changes + +- Updated dependencies [[`18154b1`](https://github.com/TanStack/router/commit/18154b1c45454a70aa77e9d6d27c8a6e0733d031)]: + - @tanstack/router-core@1.171.38 + - @tanstack/start-storage-context@1.167.40 + +## 1.170.37 + +### 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 + +## 1.170.36 + +### 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) - 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. + +- Updated dependencies [[`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5)]: + - @tanstack/router-core@1.171.36 + - @tanstack/start-storage-context@1.167.38 + ## 1.170.35 ### Patch Changes diff --git a/packages/start-client-core/package.json b/packages/start-client-core/package.json index cff8e5a0f7..c74dce13aa 100644 --- a/packages/start-client-core/package.json +++ b/packages/start-client-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-client-core", - "version": "1.170.35", + "version": "1.170.39", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", diff --git a/packages/start-client-core/skills/start-core/auth-server-primitives/SKILL.md b/packages/start-client-core/skills/start-core/auth-server-primitives/SKILL.md index 8f20dcaa27..eb50266b00 100644 --- a/packages/start-client-core/skills/start-core/auth-server-primitives/SKILL.md +++ b/packages/start-client-core/skills/start-core/auth-server-primitives/SKILL.md @@ -23,7 +23,7 @@ sources: # Auth Server Primitives -This skill covers the **server half** of authentication: session storage, cookie issuance, OAuth flow, password-reset hardening, CSRF, rate limiting. For the **routing half** (`_authenticated` layout, `beforeLoad` redirects, RBAC checks), see [router-core/auth-and-guards](../../../../router-core/skills/router-core/auth-and-guards/SKILL.md). +This skill covers the **server half** of authentication: session storage, cookie issuance, OAuth flow, password-reset hardening, CSRF, rate limiting. For the **routing half** (`_authenticated` layout, `beforeLoad` redirects, RBAC checks), see `@tanstack/router-core#router-core/auth-and-guards`. > **CRITICAL**: Protect the data/API boundary first. Server functions, server routes, and other API endpoints that touch private data must enforce auth **inside the handler** or middleware. Route guards are route UX, not the data security boundary. > **CRITICAL**: Validating the _shape_ of a client-supplied identifier (`z.string().uuid().parse(...)`) is not authorization. A parsed UUID is still _some_ tenant — re-check membership against the session principal before using it. @@ -48,47 +48,39 @@ The recommended session storage is an HTTP-only cookie holding either an opaque ```tsx // src/server/session.ts import { - getRequestHeader, - setResponseHeader, + deleteCookie, + getCookie, + setCookie, } from '@tanstack/react-start/server' const SESSION_COOKIE = '__Host-session' // __Host- prefix binds to the exact origin + path '/' const ONE_DAY = 60 * 60 * 24 +const sessionCookieOptions = { + httpOnly: true, // not readable from JS — defeats XSS exfiltration + secure: true, // HTTPS only (required for __Host- prefix) + sameSite: 'lax', // sent on top-level navigations, blocks most CSRF + path: '/', // required for __Host- prefix +} as const + export function setSessionCookie(token: string) { - setResponseHeader( - 'Set-Cookie', - [ - `${SESSION_COOKIE}=${token}`, - `HttpOnly`, // not readable from JS — defeats XSS exfiltration - `Secure`, // HTTPS only (required for __Host- prefix) - `SameSite=Lax`, // sent on top-level navigations, blocks most CSRF - `Path=/`, // required for __Host- prefix - `Max-Age=${ONE_DAY}`, - ].join('; '), - ) + setCookie(SESSION_COOKIE, token, { + ...sessionCookieOptions, + maxAge: ONE_DAY, + }) } export function clearSessionCookie() { - setResponseHeader( - 'Set-Cookie', - `${SESSION_COOKIE}=; HttpOnly; Secure; SameSite=Lax; Path=/; Max-Age=0`, - ) + deleteCookie(SESSION_COOKIE, sessionCookieOptions) } export function readSessionToken(): string | null { - const header = getRequestHeader('cookie') - if (!header) return null - for (const part of header.split(/;\s*/)) { - // Split only on the FIRST '=' — signed/base64 values often contain '='. - const eq = part.indexOf('=') - if (eq === -1) continue - if (part.slice(0, eq) === SESSION_COOKIE) return part.slice(eq + 1) - } - return null + return getCookie(SESSION_COOKIE) ?? null } ``` +Write cookies with `setCookie` (or `appendResponseHeader('set-cookie', serialized)` for a cookie that a library already serialized). Do not use `setResponseHeader('Set-Cookie', ...)` for this: it replaces every cookie on the outgoing response, including cookies set by other middleware or returned by a handler. + Flag rationale: - `HttpOnly` — JavaScript can't read the cookie, so an XSS bug can't steal the session. @@ -185,10 +177,7 @@ For OAuth authorization-code flow, generate a one-time `state` (CSRF defense) an // src/server/oauth.functions.ts import { createServerFn } from '@tanstack/react-start' import { redirect } from '@tanstack/react-router' -import { - getRequestHeader, - setResponseHeader, -} from '@tanstack/react-start/server' +import { setCookie } from '@tanstack/react-start/server' import crypto from 'node:crypto' const OAUTH_STATE_COOKIE = '__Host-oauth' // expires fast; one-shot @@ -209,10 +198,13 @@ export const startOAuth = createServerFn({ method: 'GET' }).handler( crypto.createHash('sha256').update(verifier).digest(), ) - setResponseHeader( - 'Set-Cookie', - `${OAUTH_STATE_COOKIE}=${signed({ state, verifier })}; HttpOnly; Secure; SameSite=Lax; Path=/; Max-Age=600`, - ) + setCookie(OAUTH_STATE_COOKIE, signed({ state, verifier }), { + httpOnly: true, + secure: true, + sameSite: 'lax', + path: '/', + maxAge: 600, + }) throw redirect({ href: @@ -417,7 +409,7 @@ A session token that never rotates is functionally a long-lived credential. Rota ## Cross-References -- [router-core/auth-and-guards](../../../../router-core/skills/router-core/auth-and-guards/SKILL.md) — the routing side: `_authenticated` layout, `beforeLoad`, `redirect`, RBAC checks. +- `@tanstack/router-core#router-core/auth-and-guards` — the routing side: `_authenticated` layout, `beforeLoad`, `redirect`, RBAC checks. - [start-core/server-functions](../server-functions/SKILL.md) — how to expose RPCs (and how the route guard does NOT cover them). - [start-core/middleware](../middleware/SKILL.md) — composing `authMiddleware` and others. - [start-core/execution-model](../execution-model/SKILL.md) — why module-level env/secret reads are wrong. diff --git a/packages/start-client-core/skills/start-core/middleware/SKILL.md b/packages/start-client-core/skills/start-core/middleware/SKILL.md index 972ed474af..f98d8b1852 100644 --- a/packages/start-client-core/skills/start-core/middleware/SKILL.md +++ b/packages/start-client-core/skills/start-core/middleware/SKILL.md @@ -244,7 +244,7 @@ const authMiddleware = createMiddleware().server(async ({ next, request }) => { }) ``` -> **Attach `authMiddleware` to every `createServerFn` that needs auth.** Server functions are API endpoints; a route `beforeLoad` does not protect their data, only the route's UI. Protect the endpoint that reads or mutates private data. See [router-core/auth-and-guards](../../../../router-core/skills/router-core/auth-and-guards/SKILL.md) and [start-core/auth-server-primitives](../auth-server-primitives/SKILL.md). +> **Attach `authMiddleware` to every `createServerFn` that needs auth.** Server functions are API endpoints; a route `beforeLoad` does not protect their data, only the route's UI. Protect the endpoint that reads or mutates private data. See `@tanstack/router-core#router-core/auth-and-guards` and [start-core/auth-server-primitives](../auth-server-primitives/SKILL.md). ```tsx type Permissions = Record @@ -396,4 +396,4 @@ createMiddleware({ type: 'function' }) - [start-core/server-functions](../server-functions/SKILL.md) — what middleware wraps - [start-core/server-routes](../server-routes/SKILL.md) — middleware on API endpoints - [start-core/auth-server-primitives](../auth-server-primitives/SKILL.md) — building the `authMiddleware` factory itself: session cookie reads, OAuth state, CSRF -- [router-core/auth-and-guards](../../../../router-core/skills/router-core/auth-and-guards/SKILL.md) — routing-side UX guards; data auth belongs in the server function, server route, or API endpoint handler/middleware +- `@tanstack/router-core#router-core/auth-and-guards` — routing-side UX guards; data auth belongs in the server function, server route, or API endpoint handler/middleware diff --git a/packages/start-client-core/skills/start-core/server-functions/SKILL.md b/packages/start-client-core/skills/start-core/server-functions/SKILL.md index 603cbfa2be..881e76b873 100644 --- a/packages/start-client-core/skills/start-core/server-functions/SKILL.md +++ b/packages/start-client-core/skills/start-core/server-functions/SKILL.md @@ -494,5 +494,5 @@ Relative `fetch` is fine in a browser-only event handler. It is not a universal - [start-core/execution-model](../execution-model/SKILL.md) — understanding where code runs - [start-core/middleware](../middleware/SKILL.md) — composing server functions with middleware -- [start-core/auth-server-primitives](../auth-server-primitives/SKILL.md) — sessions, cookies, OAuth, CSRF, rate limiting (the server-side half of auth; `getCurrentUser`/`useSession`-style helpers belong here, not at module scope) -- [router-core/auth-and-guards](../../../../router-core/skills/router-core/auth-and-guards/SKILL.md) — routing-side UX guards; data auth belongs in the server function, server route, or API endpoint handler/middleware +- [start-core/auth-server-primitives](../auth-server-primitives/SKILL.md) — sessions, cookies, OAuth, CSRF, rate limiting (the server-side half of auth; `getCurrentUser` and external session helpers belong here, not at module scope) +- `@tanstack/router-core#router-core/auth-and-guards` — routing-side UX guards; data auth belongs in the server function, server route, or API endpoint handler/middleware diff --git a/packages/start-client-core/src/client-rpc/serverFnFetcher.ts b/packages/start-client-core/src/client-rpc/serverFnFetcher.ts index 1720c44c2a..1d15747f95 100644 --- a/packages/start-client-core/src/client-rpc/serverFnFetcher.ts +++ b/packages/start-client-core/src/client-rpc/serverFnFetcher.ts @@ -243,9 +243,14 @@ async function getResponse(fn: () => Promise) { } } - if (response.headers.get(X_TSS_RAW_RESPONSE) === 'true') { + const raw = response.headers.get(X_TSS_RAW_RESPONSE) + if (raw === 'true') { return response } + // The server function threw this Response, so the call rejects with it. + if (raw === 'thrown') { + throw response + } const contentType = response.headers.get('content-type') if (!contentType) { @@ -304,9 +309,6 @@ async function getResponse(fn: () => Promise) { invariant() } - if (result instanceof Error) { - throw result - } return result } diff --git a/packages/start-client-core/src/createCsrfMiddleware.ts b/packages/start-client-core/src/createCsrfMiddleware.ts index 0715dd7e63..75cf65c81e 100644 --- a/packages/start-client-core/src/createCsrfMiddleware.ts +++ b/packages/start-client-core/src/createCsrfMiddleware.ts @@ -1,4 +1,5 @@ import { createIsomorphicFn } from '@tanstack/start-fn-stubs' +import { isPromise } from '@tanstack/router-core' import { createMiddleware } from './createMiddleware' import type { RequestMiddlewareAfterServer, @@ -78,18 +79,42 @@ type CreateCsrfMiddleware = ( ) => RequestMiddlewareAfterServer<{}, undefined, undefined> const innerCreateCsrfMiddleware: CreateCsrfMiddleware = (opts = {}) => { - const middleware = createMiddleware().server(async (ctx) => { + const continueRequest = ( + result: boolean | undefined, + ctx: RequestServerOptions, + ) => { + return isValidationResultAllowed(result, opts) + ? ctx.next() + : getFailureResponse(opts, ctx) + } + + const validateRequest = (ctx: RequestServerOptions) => { + const result = validateCsrfRequest(opts, ctx) + if (isPromise(result)) { + return result.then((result) => continueRequest(result, ctx)) + } + return continueRequest(result, ctx) + } + + // Synchronous checks can pass through next() without another promise chain. + const middleware = createMiddleware().server((ctx) => { const csrfCtx = ctx as RequestServerOptions - - if (opts.filter && !(await opts.filter(csrfCtx))) { - return ctx.next() + try { + if (opts.filter) { + const shouldValidate = opts.filter(csrfCtx) + if (isPromise(shouldValidate)) { + return shouldValidate.then((shouldValidate) => + shouldValidate ? validateRequest(csrfCtx) : ctx.next(), + ) + } + if (!shouldValidate) { + return ctx.next() + } + } + return validateRequest(csrfCtx) + } catch (error) { + return Promise.reject(error) } - - if (await isCsrfRequestAllowed(opts, csrfCtx)) { - return ctx.next() - } - - return getFailureResponse(opts, csrfCtx) }) if (process.env.NODE_ENV !== 'production') { @@ -106,7 +131,13 @@ export async function isCsrfRequestAllowed( opts: CsrfMiddlewareOptions, ctx: RequestServerOptions, ): Promise { - const result = await getCsrfRequestValidationResult(opts, ctx) + return isValidationResultAllowed(await validateCsrfRequest(opts, ctx), opts) +} + +function isValidationResultAllowed( + result: boolean | undefined, + opts: CsrfMiddlewareOptions, +): boolean { return ( result === true || (result === undefined && opts.allowRequestsWithoutOriginCheck === true) @@ -117,6 +148,13 @@ export async function getCsrfRequestValidationResult( opts: CsrfMiddlewareOptions, ctx: RequestServerOptions, ): Promise { + return validateCsrfRequest(opts, ctx) +} + +function validateCsrfRequest( + opts: CsrfMiddlewareOptions, + ctx: RequestServerOptions, +): boolean | undefined | Promise { const fetchSite = ctx.request.headers.get('Sec-Fetch-Site') if (fetchSite !== null) { return matchValue(opts.secFetchSite ?? 'same-origin', fetchSite, ctx) @@ -150,11 +188,11 @@ export async function getCsrfRequestValidationResult( return isRefererSameOrigin(referer, new URL(ctx.request.url).origin) } -async function matchValue( +function matchValue( matcher: CsrfMatcher, value: string, ctx: RequestServerOptions, -): Promise { +): boolean | Promise { if (typeof matcher === 'function') { return matcher(value, ctx) } @@ -176,17 +214,23 @@ function getOriginFromUrl(url: string): string | undefined { } function isRefererSameOrigin(referer: string, requestOrigin: string): boolean { - if (referer === requestOrigin) return true - if (!referer.startsWith(requestOrigin)) return false - if (referer.length === requestOrigin.length) return true + if (referer === requestOrigin) { + return true + } + if (!referer.startsWith(requestOrigin)) { + return false + } + if (referer.length === requestOrigin.length) { + return true + } const code = referer.charCodeAt(requestOrigin.length) return code === 47 /* '/' */ || code === 63 /* '?' */ || code === 35 /* '#' */ } -async function getFailureResponse( +function getFailureResponse( opts: CsrfMiddlewareOptions, ctx: RequestServerOptions, -): Promise { +): Response | Promise { if (typeof opts.failureResponse === 'function') { return opts.failureResponse(ctx) } diff --git a/packages/start-client-core/src/createMiddleware.ts b/packages/start-client-core/src/createMiddleware.ts index 50a197f401..9b19833d09 100644 --- a/packages/start-client-core/src/createMiddleware.ts +++ b/packages/start-client-core/src/createMiddleware.ts @@ -36,17 +36,6 @@ export const createMiddleware: CreateMiddlewareFn<{}> = (options, __opts) => { type: 'request', ...(__opts || options), } - const setValidator = (validator: any) => { - return createMiddleware( - {}, - Object.assign(resolvedOptions, { - validator, - // TODO remove upon stable - inputValidator: validator, - }), - ) - } - return { options: resolvedOptions, middleware: (middleware: any) => { @@ -55,9 +44,9 @@ export const createMiddleware: CreateMiddlewareFn<{}> = (options, __opts) => { Object.assign(resolvedOptions, { middleware }), ) }, - validator: setValidator, - // TODO remove upon stable - inputValidator: setValidator, + validator: (validator: any) => { + return createMiddleware({}, Object.assign(resolvedOptions, { validator })) + }, client: (client: any) => { return createMiddleware({}, Object.assign(resolvedOptions, { client })) }, @@ -178,9 +167,6 @@ export interface FunctionMiddlewareTypes< TClientSendContext > validator: TInputValidator - // TODO remove upon stable - /** @deprecated Use `validator` instead. */ - inputValidator: TInputValidator } /** @@ -390,9 +376,6 @@ export interface FunctionMiddlewareOptions< > { middleware?: TMiddlewares validator?: ConstrainValidator - // TODO remove upon stable - /** @deprecated Use `validator` instead. */ - inputValidator?: ConstrainValidator client?: FunctionMiddlewareClientFn< TRegister, TMiddlewares, @@ -684,11 +667,6 @@ export interface FunctionMiddlewareValidator { validator: ( validator: ConstrainValidator, ) => FunctionMiddlewareAfterValidator - // TODO remove upon stable - /** @deprecated Use `validator` instead. */ - inputValidator: ( - validator: ConstrainValidator, - ) => FunctionMiddlewareAfterValidator } export interface FunctionMiddlewareAfterValidator< diff --git a/packages/start-client-core/src/createServerFn.ts b/packages/start-client-core/src/createServerFn.ts index 3d74619cbd..ea1566aa37 100644 --- a/packages/start-client-core/src/createServerFn.ts +++ b/packages/start-client-core/src/createServerFn.ts @@ -1,6 +1,7 @@ import { mergeHeaders } from '@tanstack/router-core/ssr/client' import { isRedirect, parseRedirect } from '@tanstack/router-core' +import { isServer } from '@tanstack/router-core/isServer' import { TSS_SERVER_FUNCTION_FACTORY } from './constants' import { getStartOptions } from './getStartOptions' import { getStartContextServerOnly } from './getStartContextServerOnly' @@ -85,16 +86,6 @@ export const createServerFn: CreateServerFn = (options, __opts) => { resolvedOptions.method = 'GET' as Method } - const setValidator = (validator: any) => { - // TODO remove upon stable - const newOptions = { - ...resolvedOptions, - validator, - inputValidator: validator, - } - return createServerFn(undefined, newOptions) as any - } - const res: ServerFnBuilder = { options: resolvedOptions, middleware: (middleware) => { @@ -121,9 +112,13 @@ export const createServerFn: CreateServerFn = (options, __opts) => { res[TSS_SERVER_FUNCTION_FACTORY] = true return res }, - validator: setValidator, - // TODO remove upon stable - inputValidator: setValidator, + validator: (validator) => { + const newOptions = { + ...resolvedOptions, + validator, + } + return createServerFn(undefined, newOptions) as any + }, handler: (...args) => { // This function signature changes due to AST transformations // in the babel plugin. We need to cast it to the correct @@ -164,12 +159,11 @@ export const createServerFn: CreateServerFn = (options, __opts) => { context: createNullProtoObject(), }) - const redirect = parseRedirect(result.error) - if (redirect) { - throw redirect + // Only a failed call has an `error` key. Its value is whatever was + // thrown, so a thrown undefined or 0 still rejects the call. + if ('error' in result) { + throw parseRedirect(result.error) ?? result.error } - - if (result.error) throw result.error return result.result }, { @@ -179,40 +173,46 @@ export const createServerFn: CreateServerFn = (options, __opts) => { // can reject mismatched methods before parsing payloads method: resolvedOptions.method, // The extracted function on the server-side calls - // this function - __executeServer: async (opts: any) => { - const startContext = getStartContextServerOnly() - const serverContextAfterGlobalMiddlewares = - startContext.contextAfterGlobalMiddlewares - const ctx = { - ...extractedFn, - data: opts.data, - method: opts.method ?? resolvedOptions.method, - // Ensure we use the full serverFnMeta from the provider file's extractedFn - // (which has id, name, filename) rather than the partial one from SSR/client - // callers (which only has id) - serverFnMeta: extractedFn.serverFnMeta, - // Merge client context first so trusted server middleware context wins. - context: safeObjectMerge( - opts.context, - serverContextAfterGlobalMiddlewares, - ), - request: startContext.request, - } + // this function. Browsers never execute a server function. + __executeServer: + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- isServer is only known outside development + (isServer ?? typeof window === 'undefined') + ? async (opts: any) => { + const startContext = getStartContextServerOnly() + const serverContextAfterGlobalMiddlewares = + startContext.contextAfterGlobalMiddlewares + const ctx = { + ...extractedFn, + data: opts.data, + method: opts.method ?? resolvedOptions.method, + // Ensure we use the full serverFnMeta from the provider file's extractedFn + // (which has id, name, filename) rather than the partial one from SSR/client + // callers (which only has id) + serverFnMeta: extractedFn.serverFnMeta, + // Merge client context first so trusted server middleware context wins. + context: safeObjectMerge( + opts.context, + serverContextAfterGlobalMiddlewares, + ), + request: startContext.request, + } - const result = await executeMiddleware( - resolvedMiddleware, - 'server', - ctx, - ).then((d) => ({ - // Only send the result and sendContext back to the client - result: d.result, - error: d.error, - context: d.sendContext, - })) + const result = await executeMiddleware( + resolvedMiddleware, + 'server', + ctx, + ) - return result - }, + // Only send the result and sendContext back to the client. A + // failed call sends only its thrown value, under an `error` key. + if ('error' in result) { + return { error: result.error } + } + return result.sendContext === undefined + ? { result: result.result } + : { result: result.result, context: result.sendContext } + } + : undefined, }, ) as any }, @@ -227,147 +227,135 @@ export const createServerFn: CreateServerFn = (options, __opts) => { return Object.assign(fun, res) as any } +function mergeOptionalSendContext( + target: Record | undefined, + source: Record | null | undefined, +) { + return target === undefined && source === undefined + ? undefined + : safeObjectMerge(target, source) +} + +function mergeOptionalHeaders( + target: HeadersInit | undefined, + source: HeadersInit | undefined, +) { + return target || source ? mergeHeaders(target, source) : undefined +} + export async function executeMiddleware( middlewares: Array, env: 'client' | 'server', opts: ServerFnMiddlewareOptions, ): Promise { - const globalMiddlewares = getStartOptions()?.functionMiddleware || [] - let flattenedMiddlewares = flattenMiddlewares([ - ...globalMiddlewares, - ...middlewares, - ]) + const globalMiddlewares: Array = + getStartOptions()?.functionMiddleware || [] + // On the server, flattening skips middlewares that already executed in the + // request phase to prevent duplicate execution (issue #5239) + const flattenedMiddlewares = flattenMiddlewares( + globalMiddlewares.concat(middlewares), + undefined, + env === 'server' + ? new Set( + getStartContextServerOnly({ throwIfNotFound: false }) + ?.executedRequestMiddlewares, + ) + : undefined, + ) - // On server, filter out middlewares that already executed in the request phase - // to prevent duplicate execution (issue #5239) - if (env === 'server') { - const startContext = getStartContextServerOnly({ throwIfNotFound: false }) - if (startContext?.executedRequestMiddlewares) { - flattenedMiddlewares = flattenedMiddlewares.filter( - (m) => !startContext.executedRequestMiddlewares.has(m), + let index = 0 + + // Runs the remaining middlewares. A middleware's next() continues with its + // context merged with what it passed. Failures reject every pending next() + // up to the top, where they become `{ error }`. + const callNextMiddleware = async ( + callerCtx: ServerFnMiddlewareResult, + userCtx?: ServerFnMiddlewareResult, + ): Promise => { + let ctx = callerCtx + if (userCtx !== undefined) { + // Assign after the spreads: an object literal with properties after a + // second spread defines each of them through a slow runtime call. + ctx = { ...callerCtx, ...userCtx } + // Use safeObjectMerge for context objects to prevent prototype pollution + ctx.context = safeObjectMerge(callerCtx.context, userCtx.context) + ctx.sendContext = mergeOptionalSendContext( + callerCtx.sendContext, + userCtx.sendContext, ) - } - } - - const callNextMiddleware: NextFn = async (ctx) => { - // Get the next middleware - const nextMiddleware = flattenedMiddlewares.shift() - - // If there are no more middlewares, return the context - if (!nextMiddleware) { - return ctx + ctx.headers = mergeOptionalHeaders(callerCtx.headers, userCtx.headers) + ctx._callSiteFetch = callerCtx._callSiteFetch + ctx.fetch = callerCtx._callSiteFetch ?? userCtx.fetch ?? callerCtx.fetch + ctx.result = + userCtx.result !== undefined + ? userCtx.result + : userCtx instanceof Response + ? userCtx + : callerCtx.result } - // Execute the middleware - try { - let validator = - 'validator' in nextMiddleware.options - ? nextMiddleware.options.validator - : undefined - - // TODO remove upon stable - if (!validator && 'inputValidator' in nextMiddleware.options) { - validator = nextMiddleware.options.inputValidator + let result = ctx + // Middleware without a function for this environment only validates. + while (index < flattenedMiddlewares.length) { + const options = flattenedMiddlewares[index++]!.options as { + validator?: AnyValidator + client?: MiddlewareFn + server?: MiddlewareFn } - + const validator = options.validator if (validator && env === 'server') { // Execute the middleware's input function - ctx.data = await execValidator(validator as AnyValidator, ctx.data) - } - - let middlewareFn: MiddlewareFn | undefined = undefined - if (env === 'client') { - if ('client' in nextMiddleware.options) { - middlewareFn = nextMiddleware.options.client as - | MiddlewareFn - | undefined - } - } - // env === 'server' - else if ('server' in nextMiddleware.options) { - middlewareFn = nextMiddleware.options.server as MiddlewareFn | undefined + ctx.data = await execValidator(validator, ctx.data) } + const middlewareFn = env === 'client' ? options.client : options.server if (middlewareFn) { - const userNext = async ( - userCtx: ServerFnMiddlewareResult | undefined = {} as any, - ) => { - // Return the next middleware - // Use safeObjectMerge for context objects to prevent prototype pollution - const nextCtx = { - ...ctx, - ...userCtx, - context: safeObjectMerge(ctx.context, userCtx.context), - sendContext: safeObjectMerge(ctx.sendContext, userCtx.sendContext), - headers: mergeHeaders(ctx.headers, userCtx.headers), - _callSiteFetch: ctx._callSiteFetch, - fetch: ctx._callSiteFetch ?? userCtx.fetch ?? ctx.fetch, - result: - userCtx.result !== undefined - ? userCtx.result - : userCtx instanceof Response - ? userCtx - : (ctx as any).result, - error: userCtx.error ?? (ctx as any).error, - } - - const result = await callNextMiddleware(nextCtx) - - if (result.error) { - throw result.error - } - - return result - } - - // Execute the middleware - const result = await middlewareFn({ + result = await middlewareFn({ ...ctx, - next: userNext, + next: (nextCtx = {} as ServerFnMiddlewareResult) => + callNextMiddleware(ctx, nextCtx), }) - // If result is NOT a ctx object, we need to return it as - // the { result } - if (isRedirect(result)) { - return { - ...ctx, - error: result, - } - } - if (result instanceof Response) { - return { - ...ctx, - result, + // A returned redirect fails the call; any other Response is its + // result. + if (isRedirect(result)) { + throw result } - } - - if (!(result as any)) { + result = { ...ctx, result } + } else if (!(result as any)) { throw new Error( 'User middleware returned undefined. You must call next() or return a result in your middlewares.', ) } - - return result - } - - return callNextMiddleware(ctx) - } catch (error: any) { - return { - ...ctx, - error, + break } } + + if ('error' in result) { + throw result.error + } + return result } // Start the middleware chain - return callNextMiddleware({ + const initialCtx = { ...opts, - headers: opts.headers || {}, - sendContext: opts.sendContext || {}, + // Client next() results always expose HeadersInit. Server middleware does + // not require a headers value unless one was explicitly supplied. + headers: opts.headers || (env === 'client' ? {} : undefined), + sendContext: opts.sendContext, context: opts.context || createNullProtoObject(), _callSiteFetch: opts.fetch, - }) + } + if (initialCtx.sendContext !== undefined) { + initialCtx.sendContext ||= {} + } + try { + return await callNextMiddleware(initialCtx) + } catch (error) { + return { ...initialCtx, error } + } } export type CompiledFetcherFnOptions = { @@ -509,14 +497,6 @@ export type ServerFnBaseOptions< ReadonlyArray > validator?: ConstrainValidator - // TODO remove upon stable - /** @deprecated Use `validator` instead. */ - inputValidator?: ConstrainValidator< - TRegister, - TMethod, - TInputValidator, - TStrict - > extractedFn?: CompiledFetcherFn serverFn?: ServerFn< TRegister, @@ -670,9 +650,6 @@ export interface ServerFnValidator< TStrict extends ServerFnStrict, > { validator: ValidatorFn - // TODO remove upon stable - /** @deprecated Use `validator` instead. */ - inputValidator: ValidatorFn } export interface ServerFnAfterValidator< @@ -824,9 +801,6 @@ export interface ServerFnTypes< strict: TStrict middlewares: TMiddlewares validator: TInputValidator - // TODO remove upon stable - /** @deprecated Use `validator` instead. */ - inputValidator: TInputValidator response: TResponse allServerContext: AssignAllServerFnContext allInput: IntersectAllValidatorInputs @@ -835,10 +809,15 @@ export interface ServerFnTypes< export function flattenMiddlewares< T extends AnyFunctionMiddleware | AnyRequestMiddleware, ->(middlewares: Array, maxDepth: number = 100): Array { - const seen = new Set() +>( + middlewares: Array, + maxDepth: number = 100, + seen: Set = new Set(), +): Array { const flattened: Array = [] + // forEach skips holes, and a list that is not an array throws instead of + // silently dropping its middleware. const recurse = (middleware: Array, depth: number) => { if (depth > maxDepth) { throw new Error( @@ -877,6 +856,7 @@ export type ServerFnMiddlewareOptions = { export type ServerFnMiddlewareResult = ServerFnMiddlewareOptions & { result?: unknown + /** Present only when the call failed. Holds the thrown value, even `undefined`. */ error?: unknown } @@ -919,14 +899,10 @@ export async function execValidator( function serverFnBaseToMiddleware( options: ServerFnBaseOptions, ): AnyFunctionMiddleware { - // TODO remove upon stable - const validator = options.validator ?? options.inputValidator - return { '~types': undefined!, options: { - // TODO remove upon stable - inputValidator: validator, + validator: options.validator, client: async ({ next, sendContext, fetch, ...ctx }) => { const payload = { ...ctx, @@ -941,15 +917,18 @@ function serverFnBaseToMiddleware( return next(res) }, - server: async ({ next, ...ctx }) => { - // Execute the server function - const result = await options.serverFn?.(ctx) + // Always the last middleware, so it returns the result instead of + // passing it through next(). Browsers never execute a server function. + server: + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- isServer is only known outside development + (isServer ?? typeof window === 'undefined') + ? async ({ next: _next, ...ctx }) => { + // Execute the server function + const result = await options.serverFn?.(ctx) - return next({ - ...ctx, - result, - } as any) - }, + return { ...ctx, result } as any + } + : undefined, }, } } diff --git a/packages/start-client-core/src/createStart.ts b/packages/start-client-core/src/createStart.ts index e59adb452b..0929bc3b31 100644 --- a/packages/start-client-core/src/createStart.ts +++ b/packages/start-client-core/src/createStart.ts @@ -1,3 +1,4 @@ +import { isPromise } from '@tanstack/router-core' import { createMiddleware } from './createMiddleware' import type { TSS_SERVER_FUNCTION } from './constants' import type { @@ -100,6 +101,20 @@ function dedupeSerializationAdapters( } } +function dedupeOptions< + T extends { serializationAdapters?: ReadonlyArray }, +>(options: T): T { + if (options.serializationAdapters) { + const deduped = new Set() + dedupeSerializationAdapters( + deduped, + options.serializationAdapters as Array, + ) + options.serializationAdapters = Array.from(deduped) + } + return options +} + export const createStart = < const TSerializationAdapters extends ReadonlyArray = [], @@ -135,17 +150,14 @@ export const createStart = < TFunctionMiddlewares > => { return { - getOptions: async () => { - const options = await getOptions() - if (options.serializationAdapters) { - const deduped = new Set() - dedupeSerializationAdapters( - deduped, - options.serializationAdapters as unknown as Array, - ) - options.serializationAdapters = Array.from(deduped) as any - } - return options + // A synchronous factory returns synchronously so callers can skip a + // microtask per request. + getOptions: () => { + const options = getOptions() + // Promise.resolve adopts any thenable and returns a native promise as is. + return isPromise(options) + ? Promise.resolve(options).then(dedupeOptions) + : dedupeOptions(options) }, createMiddleware: createMiddleware, } as StartInstance< diff --git a/packages/start-client-core/src/safeObjectMerge.ts b/packages/start-client-core/src/safeObjectMerge.ts index e5eb6966b2..133a104324 100644 --- a/packages/start-client-core/src/safeObjectMerge.ts +++ b/packages/start-client-core/src/safeObjectMerge.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/prefer-for-of -- indexed loops avoid the iterator protocol on every merge */ function isSafeKey(key: string): boolean { return key !== '__proto__' && key !== 'constructor' && key !== 'prototype' } @@ -9,18 +10,26 @@ export function safeObjectMerge>( target: T | undefined, source: Record | null | undefined, ): T { - const result = Object.create(null) as T + const result: Record = Object.create(null) if (target) { - for (const key of Object.keys(target)) { - if (isSafeKey(key)) result[key as keyof T] = target[key] as T[keyof T] + const keys = Object.keys(target) + for (let i = 0; i < keys.length; i++) { + const key = keys[i]! + if (isSafeKey(key)) { + result[key] = target[key] + } } } if (source && typeof source === 'object') { - for (const key of Object.keys(source)) { - if (isSafeKey(key)) result[key as keyof T] = source[key] as T[keyof T] + const keys = Object.keys(source) + for (let i = 0; i < keys.length; i++) { + const key = keys[i]! + if (isSafeKey(key)) { + result[key] = source[key] + } } } - return result + return result as T } /** @@ -29,10 +38,9 @@ export function safeObjectMerge>( export function createNullProtoObject( source?: T, ): { [K in keyof T]: T[K] } { - if (!source) return Object.create(null) - const obj = Object.create(null) - for (const key of Object.keys(source)) { - if (isSafeKey(key)) obj[key] = (source as Record)[key] - } - return obj + return ( + source + ? safeObjectMerge(source as Record, undefined) + : Object.create(null) + ) as { [K in keyof T]: T[K] } } diff --git a/packages/start-client-core/src/tests/createServerFn.test-d.ts b/packages/start-client-core/src/tests/createServerFn.test-d.ts index bfe96dfc5e..f4defe813e 100644 --- a/packages/start-client-core/src/tests/createServerFn.test-d.ts +++ b/packages/start-client-core/src/tests/createServerFn.test-d.ts @@ -21,8 +21,6 @@ test('createServerFn without middleware', () => { expectTypeOf(createServerFn()).toHaveProperty('handler') expectTypeOf(createServerFn()).toHaveProperty('middleware') expectTypeOf(createServerFn()).toHaveProperty('validator') - // TODO remove upon stable - expectTypeOf(createServerFn()).toHaveProperty('inputValidator') createServerFn({ method: 'GET' }).handler((options) => { expectTypeOf(options).toEqualTypeOf<{ diff --git a/packages/start-client-core/src/tests/createServerMiddleware.test-d.ts b/packages/start-client-core/src/tests/createServerMiddleware.test-d.ts index ee6b91c8d2..f7bc33cb8a 100644 --- a/packages/start-client-core/src/tests/createServerMiddleware.test-d.ts +++ b/packages/start-client-core/src/tests/createServerMiddleware.test-d.ts @@ -11,8 +11,6 @@ test('createServeMiddleware removes middleware after middleware,', () => { expectTypeOf(middleware).toHaveProperty('middleware') expectTypeOf(middleware).toHaveProperty('server') expectTypeOf(middleware).toHaveProperty('validator') - // TODO remove upon stable - expectTypeOf(middleware).toHaveProperty('inputValidator') const middlewareAfterMiddleware = middleware.middleware([]) diff --git a/packages/start-client-core/tests/createServerFn.test.ts b/packages/start-client-core/tests/createServerFn.test.ts index 5958720a7b..69f756a8ac 100644 --- a/packages/start-client-core/tests/createServerFn.test.ts +++ b/packages/start-client-core/tests/createServerFn.test.ts @@ -1,6 +1,7 @@ -import { expect, test } from 'vitest' +import { describe, expect, test } from 'vitest' +import { runWithStartContext } from '@tanstack/start-storage-context' import { createMiddleware } from '../src/createMiddleware' -import { createServerFn } from '../src/createServerFn' +import { createServerFn, flattenMiddlewares } from '../src/createServerFn' test('appends factory middleware in order without changing source builders', () => { const first = createMiddleware({ type: 'function' }) @@ -52,3 +53,119 @@ test('does not register middleware appended while reading the input', () => { ]) expect(middlewares).toHaveLength(2) }) + +describe('client-side throws', () => { + function runOnClient(fn: () => Promise) { + return runWithStartContext( + { + getRouter() { + throw new Error('Client middleware does not need a router') + }, + request: new Request('http://localhost/'), + startOptions: {}, + contextAfterGlobalMiddlewares: {}, + executedRequestMiddlewares: new Set(), + handlerType: 'serverFn', + }, + fn, + ) + } + + test.each([undefined, null, 0, '', false])( + 'rejects when client middleware throws %s', + async (value) => { + let fetched = false + const extractedFn = Object.assign( + async () => { + fetched = true + return { result: 'fetched' } + }, + { + url: '/_serverFn/client-throw', + serverFnMeta: { id: 'client-throw' }, + }, + ) + const fn = ( + createServerFn().middleware([ + createMiddleware({ type: 'function' }).client(() => { + throw value + }), + ]).handler as unknown as ( + extractedFn: unknown, + ) => () => Promise + )(extractedFn) + + const outcome = await runOnClient(() => + fn().then( + (resolved) => ({ resolved }), + (rejected: unknown) => ({ rejected }), + ), + ) + + expect(outcome).toStrictEqual({ rejected: value }) + expect(fetched).toBe(false) + }, + ) +}) + +describe('flattenMiddlewares', () => { + const inner = createMiddleware({ type: 'function' }) + const middle = createMiddleware({ type: 'function' }).middleware([inner]) + const outer = createMiddleware({ type: 'function' }).middleware([ + inner, + middle, + ]) + const sibling = createMiddleware({ type: 'function' }) + const names = new Map([ + [inner, 'inner'], + [middle, 'middle'], + [outer, 'outer'], + [sibling, 'sibling'], + ]) + const nameAll = (middlewares: Array) => + middlewares.map((middleware) => names.get(middleware)) + + test('lists nested middleware before its parent and keeps first occurrences', () => { + expect(nameAll(flattenMiddlewares([outer, sibling, middle]))).toEqual([ + 'inner', + 'middle', + 'outer', + 'sibling', + ]) + }) + + test('skips middleware in the seen set but still lists its children', () => { + expect( + nameAll( + flattenMiddlewares([outer, sibling], undefined, new Set([middle])), + ), + ).toEqual(['inner', 'outer', 'sibling']) + }) + + test('skips empty slots in nested middleware arrays', () => { + const sparse: Array = [] + sparse[1] = inner + const parent = createMiddleware({ type: 'function' }).middleware(sparse) + names.set(parent, 'parent') + + expect(nameAll(flattenMiddlewares([parent]))).toEqual(['inner', 'parent']) + }) + + test('throws for a nested middleware list that is not an array', () => { + const guard = createMiddleware({ type: 'function' }) + const parent = createMiddleware({ type: 'function' }).middleware( + guard as never, + ) + + expect(() => flattenMiddlewares([parent])).toThrow(TypeError) + }) + + test('throws for nesting deeper than the limit', () => { + const looped = createMiddleware({ type: 'function' }) + looped.middleware([looped]) + + expect(() => flattenMiddlewares([looped], 3)).toThrow( + 'Middleware nesting depth exceeded maximum of 3. Check for circular references.', + ) + }) +}) diff --git a/packages/start-client-core/tests/createStart.test.ts b/packages/start-client-core/tests/createStart.test.ts new file mode 100644 index 0000000000..79a4994281 --- /dev/null +++ b/packages/start-client-core/tests/createStart.test.ts @@ -0,0 +1,62 @@ +import { expect, test } from 'vitest' +import { createSerializationAdapter } from '@tanstack/router-core' +import { createStart } from '../src/createStart' + +const base = createSerializationAdapter({ + key: 'base', + test: (value): value is 'base' => value === 'base', + toSerializable: () => 'base', + fromSerializable: () => 'base' as const, +}) +const extended = createSerializationAdapter({ + key: 'extended', + extends: [base], + test: (value): value is 'extended' => value === 'extended', + toSerializable: () => 'extended', + fromSerializable: () => 'extended' as const, +}) + +test('getOptions returns the options of a synchronous factory synchronously', () => { + const options = createStart(() => ({ + serializationAdapters: [extended, base, extended], + })).getOptions() + + expect(options).not.toBeInstanceOf(Promise) + expect( + (options as { serializationAdapters: Array }) + .serializationAdapters, + ).toEqual([extended, base]) +}) + +test('getOptions resolves the options of an asynchronous factory', async () => { + const options = await createStart(async () => ({ + serializationAdapters: [extended, base, extended], + })).getOptions() + + expect(options.serializationAdapters).toEqual([extended, base]) +}) + +test('getOptions adopts a thenable that a factory returns', async () => { + const error = new Error('boom') + const resolving = createStart( + () => + ({ + then(resolve: (value: unknown) => void) { + resolve({ serializationAdapters: [extended, base, extended] }) + }, + }) as never, + ) + const rejecting = createStart( + () => + ({ + then(_: unknown, reject: (reason: unknown) => void) { + reject(error) + }, + }) as never, + ) + + await expect(resolving.getOptions()).resolves.toEqual({ + serializationAdapters: [extended, base], + }) + await expect(rejecting.getOptions()).rejects.toBe(error) +}) diff --git a/packages/start-client-core/tests/function-middleware-headers.test.ts b/packages/start-client-core/tests/function-middleware-headers.test.ts new file mode 100644 index 0000000000..56a732ff6b --- /dev/null +++ b/packages/start-client-core/tests/function-middleware-headers.test.ts @@ -0,0 +1,234 @@ +import { expect, test } from 'vitest' +import { runWithStartContext } from '@tanstack/start-storage-context' +import { createMiddleware } from '../src/createMiddleware' +import { executeMiddleware } from '../src/createServerFn' + +function runMiddleware( + middlewares: Parameters[0], + env: 'client' | 'server', + headers?: HeadersInit, +) { + return runWithStartContext( + { + getRouter() { + throw new Error('Function middleware does not need a router') + }, + request: new Request('http://localhost/_serverFn/header-test'), + startOptions: {}, + contextAfterGlobalMiddlewares: {}, + executedRequestMiddlewares: new Set(), + handlerType: 'serverFn', + }, + () => + executeMiddleware(middlewares, env, { + method: 'POST', + data: undefined, + serverFnMeta: { id: 'header-test' }, + context: { request: 'request-context' }, + headers, + }), + ) +} + +test('client next() provides headers when no headers were supplied', async () => { + let observedHeaders: HeadersInit | undefined + const middleware = createMiddleware({ type: 'function' }).client( + async ({ next }) => { + const result = await next() + observedHeaders = result.headers + return result + }, + ) + + const result = await runMiddleware([middleware], 'client') + + expect(observedHeaders).toBeDefined() + expect(Array.from(new Headers(observedHeaders))).toEqual([]) + expect(result.headers).toBe(observedHeaders) +}) + +test.each([ + ['client', 'omitted'], + ['server', 'omitted'], + ['client', 'empty'], + ['server', 'empty'], +] as const)( + '%s next() preserves context with %s sendContext', + async (env, sendContext) => { + const options = + sendContext === 'omitted' + ? { context: { hop: 'kept' } } + : { context: { hop: 'kept' }, sendContext: {} } + const assertResult = (result: { + context?: unknown + sendContext?: unknown + }) => { + expect(result.context).toEqual({ + request: 'request-context', + hop: 'kept', + }) + if (sendContext === 'omitted') { + expect(result.sendContext).toBeUndefined() + } else { + expect(result.sendContext).toBeDefined() + expect(result.sendContext).toEqual({}) + } + } + const middleware = createMiddleware({ type: 'function' }) + .client(async ({ next }) => { + const result = await next(options) + assertResult(result) + return result + }) + .server(async ({ next }) => { + const result = await next(options) + assertResult(result) + return result + }) + + const result = await runMiddleware([middleware], env) + + expect(result.error).toBeUndefined() + assertResult(result) + }, +) + +test('server middleware preserves context and sendContext without headers', async () => { + const first = createMiddleware({ type: 'function' }).server(({ next }) => + next({ context: { first: 'one' }, sendContext: { firstReply: 'one' } }), + ) + const second = createMiddleware({ type: 'function' }) + .middleware([first]) + .server(({ context, next }) => { + expect(context.first).toBe('one') + return next({ + context: { second: 'two' }, + sendContext: { secondReply: 'two' }, + }) + }) + + const result = await runMiddleware([second], 'server') + + expect(result.context).toEqual({ + request: 'request-context', + first: 'one', + second: 'two', + }) + expect(result.sendContext).toEqual({ firstReply: 'one', secondReply: 'two' }) +}) + +test.each(['client', 'server'] as const)( + '%s middleware preserves explicitly supplied headers', + async (env) => { + const headers = new Headers({ 'x-call': 'preserved' }) + const middleware = createMiddleware({ type: 'function' }) + .client(({ next }) => next()) + .server(({ next }) => next()) + + const result = await runMiddleware([middleware], env, headers) + + expect(new Headers(result.headers).get('x-call')).toBe('preserved') + expect(headers.get('x-call')).toBe('preserved') + }, +) + +test('client middleware merges supplied headers without changing either input', async () => { + const headers = new Headers({ 'x-initial': 'one', 'x-shared': 'initial' }) + headers.append('set-cookie', 'first=one; Path=/') + const nextHeaders = new Headers({ 'x-next': 'two', 'x-shared': 'next' }) + nextHeaders.append('set-cookie', 'second=two; Path=/') + const originalHeaders = Array.from(headers) + const originalNextHeaders = Array.from(nextHeaders) + const middleware = createMiddleware({ type: 'function' }).client(({ next }) => + next({ headers: nextHeaders }), + ) + + const result = await runMiddleware([middleware], 'client', headers) + const merged = new Headers(result.headers) + + expect(merged.get('x-initial')).toBe('one') + expect(merged.get('x-next')).toBe('two') + expect(merged.get('x-shared')).toBe('next') + expect(merged.getSetCookie()).toEqual([ + 'first=one; Path=/', + 'second=two; Path=/', + ]) + expect(Array.from(headers)).toEqual(originalHeaders) + expect(Array.from(nextHeaders)).toEqual(originalNextHeaders) +}) + +test('client middleware can supply headers when the call supplied none', async () => { + const middleware = createMiddleware({ type: 'function' }).client(({ next }) => + next({ headers: { 'x-next': 'present' } }), + ) + + const result = await runMiddleware([middleware], 'client') + + expect(new Headers(result.headers).get('x-next')).toBe('present') +}) + +test.each(['client', 'server'] as const)( + '%s executor reads initial middleware options in order without repeating accessors', + async (env) => { + const reads: Array = [] + const ignoredSendContext = Object.freeze({ selected: 'first read' }) + const selectedSendContext = Object.freeze({ selected: 'second read' }) + const context = Object.freeze({ request: 'preserved' }) + const headers = new Headers({ 'x-initial': 'preserved' }) + const fetch = async () => new Response('unused') + let sendContextReads = 0 + + const result = await runWithStartContext( + { + getRouter() { + throw new Error('Function middleware does not need a router') + }, + request: new Request('http://localhost/_serverFn/accessor-test'), + startOptions: {}, + contextAfterGlobalMiddlewares: {}, + executedRequestMiddlewares: new Set(), + handlerType: 'serverFn', + }, + () => + executeMiddleware([], env, { + method: 'POST', + data: undefined, + serverFnMeta: { id: 'accessor-test' }, + get headers() { + reads.push('headers') + return headers + }, + get sendContext() { + reads.push('sendContext') + sendContextReads++ + return sendContextReads === 1 + ? ignoredSendContext + : selectedSendContext + }, + get context() { + reads.push('context') + return context + }, + get fetch() { + reads.push('fetch') + return fetch + }, + }), + ) + + expect(reads).toEqual([ + 'headers', + 'sendContext', + 'context', + 'fetch', + 'headers', + 'sendContext', + 'context', + 'fetch', + ]) + expect(result.sendContext).toBe(selectedSendContext) + expect(result.context).toBe(context) + expect(result.headers).toBe(headers) + expect(result.fetch).toBe(fetch) + }, +) diff --git a/packages/start-client-core/tests/function-middleware.bench.ts b/packages/start-client-core/tests/function-middleware.bench.ts new file mode 100644 index 0000000000..e4dce620a8 --- /dev/null +++ b/packages/start-client-core/tests/function-middleware.bench.ts @@ -0,0 +1,328 @@ +// @vitest-environment node + +import { afterAll, describe, expect, test } from 'vitest' +import { runWithStartContext } from '@tanstack/start-storage-context' +import { createMiddleware } from '../src/createMiddleware' +import { executeMiddleware } from '../src/createServerFn' +import type { StartStorageContext } from '@tanstack/start-storage-context' +import type { ServerFnMiddlewareOptions } from '../src/createServerFn' + +type SendContextMode = 'absent' | 'empty' | 'present' +type Context = Readonly> + +type Scenario = { + name: string + env: 'client' | 'server' + headers: 'absent' | 'supplied' + depth: 0 | 1 | 4 + initialSendContext: SendContextMode + nextSendContext: SendContextMode +} + +type NextOptions = { + context: Context + sendContext?: Context + headers?: Headers +} + +type InputOptions = Pick & + NextOptions & { + data: number + } + +type Input = { + options: Readonly + snapshot: ReturnType + storage: StartStorageContext +} + +const batchSize = 160 +const benchOptions = { warmupIterations: 100, time: 2_000, throws: true } +const sendContextScenarios: Array<{ + name: string + initial: SendContextMode + next: SendContextMode +}> = [ + { name: 'absent', initial: 'absent', next: 'absent' }, + { name: 'empty', initial: 'empty', next: 'empty' }, + { name: 'present', initial: 'present', next: 'present' }, + { name: 'empty-from-next', initial: 'absent', next: 'empty' }, + { name: 'present-from-next', initial: 'absent', next: 'present' }, +] + +const scenarios: Array = (['server', 'client'] as const).flatMap( + (env) => + (['absent', 'supplied'] as const).flatMap((headers) => + ([0, 1, 4] as const).flatMap((depth) => + sendContextScenarios + .filter((context) => depth > 0 || context.initial === context.next) + .map((context) => ({ + name: `${env}-headers-${headers}-send-${context.name}-layers-${depth}`, + env, + headers, + depth, + initialSendContext: context.initial, + nextSendContext: context.next, + })), + ), + ), +) + +function snapshotOptions(options: NextOptions) { + return { + keys: Object.keys(options), + context: { ...options.context }, + sendContext: + options.sendContext === undefined + ? undefined + : { ...options.sendContext }, + } +} + +function snapshotHeaders(headers: Headers) { + return { + headers, + entries: Array.from(headers), + cookies: headers.getSetCookie(), + } +} + +function createWorkload(scenario: Scenario) { + const suppliedHeaders = scenario.headers === 'supplied' + const initialHeaders = new Headers({ + 'x-initial': 'one', + 'x-shared': 'initial', + }) + initialHeaders.append('set-cookie', 'first=one; Path=/') + initialHeaders.append('set-cookie', 'second=two; Path=/') + const headerSnapshots = [snapshotHeaders(initialHeaders)] + const expectedHeaders = new Headers( + suppliedHeaders ? initialHeaders : undefined, + ) + const nextInputs: Array<{ + options: Readonly + snapshot: ReturnType + }> = [] + const middlewares = Array.from({ length: scenario.depth }, (_, index) => { + const nextOptions: NextOptions = { + context: Object.freeze({ [`hop${index}`]: index, shared: `hop${index}` }), + } + if (scenario.nextSendContext !== 'absent') { + nextOptions.sendContext = Object.freeze( + scenario.nextSendContext === 'empty' + ? {} + : { [`reply${index}`]: index, shared: `reply${index}` }, + ) + } + // Only client middleware can supply headers through its public next(). + if (scenario.env === 'client' && suppliedHeaders) { + const headers = new Headers({ + 'x-shared': `hop${index}`, + [`x-hop-${index}`]: String(index), + }) + headers.append('set-cookie', `hop${index}=${index}; Path=/`) + headerSnapshots.push(snapshotHeaders(headers)) + nextOptions.headers = headers + expectedHeaders.set('x-shared', `hop${index}`) + expectedHeaders.set(`x-hop-${index}`, String(index)) + expectedHeaders.append('set-cookie', `hop${index}=${index}; Path=/`) + } + nextInputs.push({ + options: Object.freeze(nextOptions), + snapshot: snapshotOptions(nextOptions), + }) + if (scenario.env === 'client') { + return createMiddleware({ type: 'function' }).client(({ next }) => + next(nextOptions), + ) + } + return createMiddleware({ type: 'function' }).server(({ next }) => + next(nextOptions), + ) + }) + const inputs = Array.from({ length: batchSize }, (_, index): Input => { + const options: InputOptions = { + method: 'POST', + data: index, + serverFnMeta: Object.freeze({ id: 'middleware-benchmark' }), + context: Object.freeze({ + seed: index, + trusted: 'server-context', + shared: 'initial', + }), + } + if (suppliedHeaders) { + options.headers = initialHeaders + } + if (scenario.initialSendContext !== 'absent') { + options.sendContext = Object.freeze( + scenario.initialSendContext === 'empty' + ? {} + : { initialReply: 'present', shared: 'initial' }, + ) + } + return { + options: Object.freeze(options), + snapshot: snapshotOptions(options), + storage: { + request: new Request( + `http://localhost/_serverFn/middleware-benchmark?i=${index}`, + ), + getRouter() { + throw new Error('Function middleware does not need a router') + }, + startOptions: {}, + contextAfterGlobalMiddlewares: {}, + executedRequestMiddlewares: new Set(), + handlerType: 'serverFn', + }, + } + }) + + // The client phase uses the real Start context used during SSR calls. + function invoke(input: Input) { + return runWithStartContext(input.storage, () => + executeMiddleware(middlewares, scenario.env, input.options), + ) + } + + async function verify() { + for (const input of inputs) { + const { options, snapshot } = input + const result = await invoke(input) + expect(result.error).toBeUndefined() + expect(result.data).toBe(options.data) + // Handler results and transport belong to the server-function benchmarks. + expect(result.result).toBeUndefined() + const context = { ...options.context } + const sendContext = { ...options.sendContext } + for (const next of nextInputs) { + Object.assign(context, next.options.context) + Object.assign(sendContext, next.options.sendContext) + } + expect({ ...result.context }).toEqual(context) + // Compare absent payload contents while preserving explicit empty objects. + expect({ ...result.sendContext }).toEqual(sendContext) + if (scenario.nextSendContext !== 'absent') { + expect(result.sendContext).toBeDefined() + } + if (scenario.env === 'client') { + expect(result.headers).toBeDefined() + } + const headers = new Headers(result.headers) + expect(Array.from(headers)).toEqual(Array.from(expectedHeaders)) + expect(headers.getSetCookie()).toEqual(expectedHeaders.getSetCookie()) + expect(snapshotOptions(options)).toEqual(snapshot) + } + for (const { options, snapshot } of nextInputs) { + expect(snapshotOptions(options)).toEqual(snapshot) + } + for (const { headers, entries, cookies } of headerSnapshots) { + expect(Array.from(headers)).toEqual(entries) + expect(headers.getSetCookie()).toEqual(cookies) + } + } + + async function batch() { + // Every call settles before the next; no work escapes the measured batch. + for (const input of inputs) { + await invoke(input) + } + } + + function invokeIndex(index: number) { + return invoke(inputs[index]!) + } + + return { verify, batch, invokeIndex } +} + +function createMixedWorkload(env: Scenario['env']) { + const absent = createWorkload({ + name: 'mixed-absent', + env, + headers: 'absent', + depth: 4, + initialSendContext: 'absent', + nextSendContext: 'absent', + }) + const supplied = createWorkload({ + name: 'mixed-supplied', + env, + headers: 'supplied', + depth: 4, + initialSendContext: 'present', + nextSendContext: 'present', + }) + + async function verify() { + await absent.verify() + await supplied.verify() + } + + async function batch() { + // Interleave 120 absent calls and 40 supplied calls in each 160-call batch. + for (let index = 0; index < batchSize; index++) { + await (index % 4 === 0 ? supplied : absent).invokeIndex(index) + } + } + + return { verify, batch } +} + +const workloads: Array< + ReturnType | ReturnType +> = [] + +afterAll(async () => { + for (const workload of workloads) { + await workload.verify() + } +}) + +for (const scenario of scenarios) { + describe(`function middleware ${scenario.name}`, () => { + let workload: ReturnType | undefined + + test('160 calls', async ({ bench }) => { + await bench( + '160 calls', + { + // Tinybench awaits beforeAll before warmup and measurement. Only + // selected cases allocate fixtures, and the measured callback + // contains no assertions. + beforeAll: async () => { + if (!workload) { + workload = createWorkload(scenario) + workloads.push(workload) + } + await workload.verify() + }, + }, + () => workload!.batch(), + ).run(benchOptions) + }) + }) +} + +for (const env of ['server', 'client'] as const) { + describe(`function middleware ${env}-mixed-75-absent-25-supplied-layers-4`, () => { + let workload: ReturnType | undefined + + test('160 calls', async ({ bench }) => { + await bench( + '160 calls', + { + beforeAll: async () => { + if (!workload) { + workload = createMixedWorkload(env) + workloads.push(workload) + } + await workload.verify() + }, + }, + () => workload!.batch(), + ).run(benchOptions) + }) + }) +} diff --git a/packages/start-client-core/tests/safeObjectMerge.test.ts b/packages/start-client-core/tests/safeObjectMerge.test.ts new file mode 100644 index 0000000000..354a633e55 --- /dev/null +++ b/packages/start-client-core/tests/safeObjectMerge.test.ts @@ -0,0 +1,37 @@ +import { expect, test } from 'vitest' +import { createNullProtoObject, safeObjectMerge } from '../src/safeObjectMerge' + +// JSON.parse creates `__proto__` as an own key, as a deserialized payload can. +const unsafe = JSON.parse( + '{"__proto__":{"polluted":true},"constructor":1,"kept":"source","prototype":2,"added":true}', +) + +test('safeObjectMerge copies own keys in order into a null-prototype object', () => { + const merged = safeObjectMerge>( + { first: 1, kept: 'target' }, + unsafe, + ) + + expect(Object.getPrototypeOf(merged)).toBeNull() + expect(Object.keys(merged)).toEqual(['first', 'kept', 'added']) + expect(merged.kept).toBe('source') + expect(({} as Record).polluted).toBeUndefined() +}) + +test('safeObjectMerge ignores a source that is not an object', () => { + const merged = safeObjectMerge>( + { first: 1 }, + 'source' as never, + ) + + expect(Object.keys(merged)).toEqual(['first']) +}) + +test('createNullProtoObject copies own keys without prototype keys', () => { + expect(Object.getPrototypeOf(createNullProtoObject())).toBeNull() + + const copy = createNullProtoObject(unsafe) + + expect(Object.getPrototypeOf(copy)).toBeNull() + expect(Object.keys(copy)).toEqual(['kept', 'added']) +}) diff --git a/packages/start-plugin-core/CHANGELOG.md b/packages/start-plugin-core/CHANGELOG.md index 7a5dfbb34b..3d705069c1 100644 --- a/packages/start-plugin-core/CHANGELOG.md +++ b/packages/start-plugin-core/CHANGELOG.md @@ -1,5 +1,102 @@ # @tanstack/start-plugin-core +## 1.171.57 + +### Patch Changes + +- [#8889](https://github.com/TanStack/router/pull/8889) [`3f22686`](https://github.com/TanStack/router/commit/3f226869e0af211ff7f1de5d7343e43462dbb101) - fix: Rsbuild dev SSR now includes stylesheet links when the server environment runs outside the build process, such as in workerd with `rsbuild-plugin-cloudflare`. The dev manifest is written into the server's manifest module instead of being stored on the build process's `globalThis`. + +- [#8892](https://github.com/TanStack/router/pull/8892) [`559c7de`](https://github.com/TanStack/router/commit/559c7ded6e2a6eeda3f91c80d8c03f4cfeb9a206) - fix: Rsbuild dev with React Server Components includes stylesheet links in SSR again. The client and server compile concurrently, so the server's manifest module is now rebuilt once the client build is available, as in production builds. + +## 1.171.56 + +### 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. + +- [#8805](https://github.com/TanStack/router/pull/8805) [`c5320d7`](https://github.com/TanStack/router/commit/c5320d7ca23eca82d720ac5629d2bad5cf7d9b02) - With `spa.enabled`, the Rsbuild dev server answers the SPA shell, as Vite's dev server does, instead of rendering the route and running its loaders on the server. + +- [#8871](https://github.com/TanStack/router/pull/8871) [`545a8d3`](https://github.com/TanStack/router/commit/545a8d3790989ca502153c3292c6b1e8063257f4) - Require `exsolve` `^1.1.3`: a failed lookup that exsolve caches no longer keeps its callers alive, so Start's cached failed lookups no longer hold on to each build's objects. Entry lookups bypass exsolve's process-wide cache, so a dev server restart finds an entry file (such as `src/start.ts`) created since. + +- [#8861](https://github.com/TanStack/router/pull/8861) [`da8c28c`](https://github.com/TanStack/router/commit/da8c28c498230a5730ce75b2693baeeb3ef68ac1) - Start's router options now reach the route generator and the code splitter as they do in a router app: + - Generator plugins given as `router.plugins` run ([#7768](https://github.com/TanStack/router/issues/7768)). Start's own generator plugins used to replace them. + - A function-form `router.routeTreeFileFooter` is called at every print of the route tree. Start's Vite plugin used to print its first result for the whole dev server. + - Start's Rsbuild plugin keeps `router.codeSplittingOptions.deleteNodes` for the server build. It used to drop the option there. + - Start's Vite plugin finds the client route tree by its exact module id ([#8839](https://github.com/TanStack/router/issues/8839)). With a regular-expression character in the project path, such as `+`, the client used to get the full route tree, server-only routes included; a file whose name differed from the route tree's by one character (`routeTree-gen.ts`) was replaced by the client route tree. + +- Updated dependencies [[`1ba19a0`](https://github.com/TanStack/router/commit/1ba19a04456983ee0f8adffd038b6b1194441e15), [`94f36c4`](https://github.com/TanStack/router/commit/94f36c4a9ecf3062b326a8eb772e73b00c0644d9), [`446ce1b`](https://github.com/TanStack/router/commit/446ce1b30650d85f1fc78f2d1ee42712e40b75c6), [`ad5b3b7`](https://github.com/TanStack/router/commit/ad5b3b7a0990eed7351d672ea6695d341108e0d6), [`533ca27`](https://github.com/TanStack/router/commit/533ca2704452f36c5fef5c5fe084554d9b5db1ab), [`13b6256`](https://github.com/TanStack/router/commit/13b625683030ea4ab359495ecda570e05e472587), [`b5e2ac9`](https://github.com/TanStack/router/commit/b5e2ac9c4cee4c5c6f464adc6cfddcddf6c84171), [`d250819`](https://github.com/TanStack/router/commit/d25081952dd04a5f5a44db7c8df5cbbf50fad054), [`f420d4a`](https://github.com/TanStack/router/commit/f420d4a6dacfaa81d306b7bbc9af8f1010d1a1bc), [`ff157f0`](https://github.com/TanStack/router/commit/ff157f0079982e90d62be7fdeecfb77e4fdcec69)]: + - @tanstack/router-plugin@1.169.0 + - @tanstack/router-generator@1.168.0 + - @tanstack/router-utils@1.163.0 + +## 1.171.55 + +### Patch Changes + +- [#8748](https://github.com/TanStack/router/pull/8748) [`ed55775`](https://github.com/TanStack/router/commit/ed5577593a749b8c7193cc7b5d945fd084bfac2f) - Skip the Rsbuild import-protection loader and its plugins when import protection is disabled, so modules no longer pass through the loader. + +- [#8750](https://github.com/TanStack/router/pull/8750) [`63a886d`](https://github.com/TanStack/router/commit/63a886da9040c4b039ea3bf5b3a841771375cddb) - Skip the server function resolver rebuild in Rsbuild dev when the resolver has not changed, so most edits no longer rebuild the whole server chunk graph. + +- [#8758](https://github.com/TanStack/router/pull/8758) [`d9b07e8`](https://github.com/TanStack/router/commit/d9b07e8d3b724cdbfac0aa2fba4c1f7a3a241100) - Stop resolving top-level calls such as `z.object()` whose receiver is not a namespace import. They can never be a `createServerOnlyFn` or `createClientOnlyFn` call, and resolving them made the dev compiler load and parse the receiver's module (all of zod, for example). + +- Updated dependencies [[`32a3360`](https://github.com/TanStack/router/commit/32a3360cba0e0f884b3215813a48c63467f5a53c), [`647cb73`](https://github.com/TanStack/router/commit/647cb737a5622813d276d6042766692ca5ae67ed)]: + - @tanstack/router-core@1.171.39 + - @tanstack/router-plugin@1.168.48 + - @tanstack/start-server-core@1.169.45 + - @tanstack/router-generator@1.167.46 + +## 1.171.54 + +### 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/router-generator@1.167.45 + - @tanstack/router-plugin@1.168.47 + +## 1.171.53 + +### Patch Changes + +- [#8708](https://github.com/TanStack/router/pull/8708) [`fdc10fa`](https://github.com/TanStack/router/commit/fdc10fa13fbac758615f9a3d37075088d1cc1e1f) - Update `srvx` to `^1.0.0`. + +- Updated dependencies [[`71d9694`](https://github.com/TanStack/router/commit/71d9694da6346fbece2cda4ecde92b0b12a7ee08), [`923d98b`](https://github.com/TanStack/router/commit/923d98b18b6cd90b6219591e20e86115dc61048e)]: + - @tanstack/start-server-core@1.169.43 + - @tanstack/router-utils@1.162.4 + - @tanstack/router-generator@1.167.44 + - @tanstack/router-plugin@1.168.46 + +## 1.171.52 + +### 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/router-generator@1.167.43 + - @tanstack/router-plugin@1.168.45 + +## 1.171.51 + +### 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. + +- [#8692](https://github.com/TanStack/router/pull/8692) [`f3d7ee3`](https://github.com/TanStack/router/commit/f3d7ee3374c660e0fe82a03ac580a90ed2e2fa98) - Image and news sitemap entries are now emitted in their declared XML namespaces, so sitemaps with images or news are valid XML. + +- [#8695](https://github.com/TanStack/router/pull/8695) [`4104b8e`](https://github.com/TanStack/router/commit/4104b8ef11498706b5059c5a915f2ae47ffbc5ba) - Walk the static import graph when building route preloads so Rolldown and Rsbuild builds preload every dependency chunk, and derive Rsbuild chunk imports from the module graph so shared chunks no longer attach unrelated route CSS to the SSR 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. + +- [#8691](https://github.com/TanStack/router/pull/8691) [`19524cc`](https://github.com/TanStack/router/commit/19524ccdd75870ce1db2f324518eeb3f23cc0f97) - Publish only validated public page fields in pages.json and sitemap.xml so prerender headers and other private page data, including extra data returned by `prerender.onSuccess`, stay private. Invalid sitemap metadata returned by `prerender.onSuccess` now fails the build instead of being written to sitemap.xml without validation. + +- Updated dependencies [[`57bd1a9`](https://github.com/TanStack/router/commit/57bd1a92f9839af5bf773c3b36d039569fb1a41e), [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5), [`94d6d8e`](https://github.com/TanStack/router/commit/94d6d8e49694e225cb07e2a6777633d08aeeb3c5), [`e66da18`](https://github.com/TanStack/router/commit/e66da18266859ab49e20a7b8c858232449ee5290), [`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-generator@1.167.42 + - @tanstack/router-core@1.171.36 + - @tanstack/start-server-core@1.169.41 + - @tanstack/router-plugin@1.168.44 + ## 1.171.50 ### Patch Changes diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json index 6ab02f91e5..1945ab7ba6 100644 --- a/packages/start-plugin-core/package.json +++ b/packages/start-plugin-core/package.json @@ -1,6 +1,6 @@ { "name": "@tanstack/start-plugin-core", - "version": "1.171.50", + "version": "1.171.57", "description": "Modern and scalable routing for React applications", "author": "Tanner Linsley", "license": "MIT", @@ -27,8 +27,9 @@ "scripts": { "clean": "rimraf ./dist && rimraf ./coverage", "clean:snapshots": "rimraf **/*snapshot* --glob", - "test": "pnpm test:eslint && pnpm test:types && pnpm test:build && pnpm test:unit", - "test:unit": "vitest", + "test": "pnpm test:eslint && pnpm test:types && pnpm test:build && pnpm test:unit && pnpm test:integration", + "test:unit": "vitest --project unit", + "test:integration": "vitest --project integration", "test:eslint": "eslint ./src", "test:types": "pnpm run \"/^test:types:ts[0-9]{2}$/\"", "test:types:ts56": "node ../../node_modules/typescript56/lib/tsc.js", @@ -40,6 +41,28 @@ "test:build": "publint --strict && attw --ignore-rules no-resolution --pack .", "build": "vite build" }, + "nx": { + "targets": { + "test:integration": { + "cache": true, + "dependsOn": [ + "^build", + "build", + { + "projects": [ + "@tanstack/react-start" + ], + "target": "build" + } + ], + "inputs": [ + "default", + "^production", + "dependentTaskOutputs" + ] + } + } + }, "type": "module", "types": "dist/esm/index.d.ts", "module": "dist/esm/index.js", @@ -94,13 +117,13 @@ "@tanstack/router-plugin": "workspace:*", "@tanstack/router-utils": "workspace:*", "@tanstack/start-server-core": "workspace:*", - "exsolve": "^1.1.1", + "exsolve": "^1.1.3", "lightningcss": "^1.33.0", "pathe": "catalog:", "picomatch": "^4.0.7", "seroval": "^1.6.7", "source-map": "^0.7.6", - "srvx": "^0.11.22", + "srvx": "^1.0.0", "tinyglobby": "catalog:", "ufo": "^1.6.4", "vitefu": "^1.1.3", @@ -113,6 +136,7 @@ "@types/babel__core": "^7.20.5", "@types/node": ">=20", "@types/picomatch": "^4.0.2", + "prettier": "^3.9.6", "vite": "*", "@tanstack/vite-config": "catalog:", "vitest": "catalog:", @@ -121,8 +145,8 @@ "rimraf": "catalog:" }, "peerDependencies": { - "@rsbuild/core": "^2.0.0", - "vite": ">=7.0.0" + "@rsbuild/core": "^2.0.5", + "vite": ">=8.0.0" }, "peerDependenciesMeta": { "@rsbuild/core": { diff --git a/packages/start-plugin-core/src/build-sitemap.ts b/packages/start-plugin-core/src/build-sitemap.ts index 9d2c5c1ecd..744096a2ff 100644 --- a/packages/start-plugin-core/src/build-sitemap.ts +++ b/packages/start-plugin-core/src/build-sitemap.ts @@ -1,8 +1,10 @@ import { writeFileSync } from 'node:fs' import path from 'node:path' import { create } from 'xmlbuilder2' +import { z } from 'zod' +import { pageBaseSchema } from './schema' import { createLogger } from './utils' -import type { TanStackStartOutputConfig } from './schema' +import type { PageBase, TanStackStartOutputConfig } from './schema' import type { XMLBuilder } from 'xmlbuilder2/lib/interfaces' export type SitemapUrl = { @@ -19,7 +21,7 @@ export type SitemapUrl = { | 'never' alternateRefs?: Array<{ href: string - hreflang?: string + hreflang: string }> images?: Array<{ loc: string @@ -40,10 +42,7 @@ export type SitemapData = { urls: Array } -function buildSitemapJson( - pages: TanStackStartOutputConfig['pages'], - host: string, -): SitemapData { +function buildSitemapJson(pages: Array, host: string): SitemapData { const slash = checkSlash(host) const urls: Array = pages @@ -168,8 +167,20 @@ export function buildSitemap({ logger.info('Building Sitemap...') - // Build the sitemap data - const sitemapData = buildSitemapJson(pages, host) + // Validate pages before writing anything. The schema strips private fields + // (prerender headers, extra data returned by `prerender.onSuccess`), so both + // public outputs are built from the same validated page data. + const publicPages = pages.map((page) => { + const result = pageBaseSchema.safeParse(page) + if (!result.success) { + throw new Error( + `Invalid sitemap data for page "${page.path}". Check the value returned by \`prerender.onSuccess\`.\n${z.prettifyError(result.error)}`, + { cause: result.error }, + ) + } + return result.data + }) + const sitemapData = buildSitemapJson(publicPages, host) // Generate output paths const xmlOutputPath = path.join(publicDir, outputPath) @@ -186,7 +197,7 @@ export function buildSitemap({ pagesOutputPath, JSON.stringify( { - pages, + pages: publicPages, host, lastBuilt: new Date().toISOString(), }, @@ -204,6 +215,8 @@ function createXml(elementName: 'urlset' | 'sitemapindex'): XMLBuilder { .ele(elementName, { xmlns: 'http://www.sitemaps.org/schemas/sitemap/0.9', 'xmlns:xhtml': 'http://www.w3.org/1999/xhtml', + 'xmlns:image': 'http://www.google.com/schemas/sitemap-image/1.1', + 'xmlns:news': 'http://www.google.com/schemas/sitemap-news/0.9', }) .com(`This file was automatically generated by TanStack Start.`) } diff --git a/packages/start-plugin-core/src/resolve-entries.ts b/packages/start-plugin-core/src/resolve-entries.ts index dd28815fa0..23eb4c651c 100644 --- a/packages/start-plugin-core/src/resolve-entries.ts +++ b/packages/start-plugin-core/src/resolve-entries.ts @@ -13,6 +13,10 @@ function resolveModule(opts: ResolveModuleOptions): string | undefined { from: opts.from, extensions: ['.ts', '.js', '.mts', '.mjs', '.tsx', '.jsx'], try: true, + // exsolve's default cache is process-wide and keeps misses: a dev server + // restart would not see an entry created since. The plugin already + // resolves the entries once per instance. + cache: false, }) } diff --git a/packages/start-plugin-core/src/rsbuild/import-protection.ts b/packages/start-plugin-core/src/rsbuild/import-protection.ts index c5e58ee6cf..f9d46505e3 100644 --- a/packages/start-plugin-core/src/rsbuild/import-protection.ts +++ b/packages/start-plugin-core/src/rsbuild/import-protection.ts @@ -1505,7 +1505,10 @@ export function registerImportProtection( applyUserConfig() const envName = utils.environment.name + // When import protection is disabled, register nothing, as the Vite plugin + // does, so modules do not pass through the loader. if ( + !config.enabled || !opts.environments.some((environment) => environment.name === envName) ) { return diff --git a/packages/start-plugin-core/src/rsbuild/normalized-client-build.ts b/packages/start-plugin-core/src/rsbuild/normalized-client-build.ts index 126f281f95..a7dae0c379 100644 --- a/packages/start-plugin-core/src/rsbuild/normalized-client-build.ts +++ b/packages/start-plugin-core/src/rsbuild/normalized-client-build.ts @@ -143,6 +143,45 @@ function getChunkJsFiles(chunk: RspackCompilationChunk): Array { return jsFiles } +/** + * Get unique CSS file names from both primary and auxiliary chunk assets. + */ +function getChunkCssFiles(chunk: RspackCompilationChunk): Array { + const cssFiles: Array = [] + const seen = new Set() + + for (const file of [...chunk.auxiliaryFiles, ...chunk.files]) { + if (file.endsWith('.css') && !seen.has(file)) { + seen.add(file) + cssFiles.push(file) + } + } + + return cssFiles +} + +/** + * Include inner modules so concatenation does not hide route metadata or + * static dependency edges. + */ +function getModulesIncludingConcatenated( + modules: Array, +): Array { + const allModules = new Set(modules) + for (const module of allModules) { + const concatenatedModules = ( + module as RspackModule & { modules?: Array } + ).modules + if (concatenatedModules) { + for (const concatenatedModule of concatenatedModules) { + allModules.add(concatenatedModule) + } + } + } + + return Array.from(allModules) +} + /** * Compute dynamicImports for a chunk by traversing its chunk groups' * childrenIterable (async/dynamic import edges). @@ -173,36 +212,162 @@ function computeDynamicImports(chunk: RspackCompilationChunk): Array { } /** - * Compute static imports (sibling chunks) for an async chunk. - * - * In rspack/webpack, an async chunk's ChunkGroup contains ALL chunks needed to - * satisfy that dynamic import — the async chunk itself plus any shared/vendor - * chunks it statically imports. This is analogous to Rollup's - * `OutputChunk.imports` for async chunks. - * - * We collect JS files from all sibling chunks in the group (excluding the - * current chunk's own file) to populate the `imports` field. + * Compute the emitted chunks reached by active static module dependencies. + * Dependencies nested in async blocks are deliberately excluded: those are + * represented by chunk-group children in `dynamicImports` instead. */ -function computeAsyncChunkImports( +function computeStaticDependencyChunks( + compilation: RspackCompilation, chunk: RspackCompilationChunk, - currentFile: string, -): Array { - const imports: Array = [] - const seen = new Set() - seen.add(currentFile) - + chunksOfModule: (module: RspackModule) => Array, +): Array { + const importedChunks: Array = [] + const seen = new Set([chunk]) + const modules = getModulesIncludingConcatenated( + compilation.chunkGraph.getChunkModules(chunk), + ) + const localModules = new Set(modules) + const runtime = Array.from(chunk.runtime) + // A shared chunk can belong to several route groups. Group membership + // limits where dependencies can be loaded from; it does not establish + // an import from the shared chunk back to every route in those groups. + // A chunk counts as available only when every group of this chunk (or + // one of its ancestors) has it: a module duplicated into each route's + // chunk is satisfied per group, by that group's own chunk, so neither + // route's chunk is a dependency of the shared chunk (#8780). + let availableChunks: Set | undefined for (const group of chunk.groupsIterable) { - for (const siblingChunk of group.chunks) { - for (const file of siblingChunk.files) { - if (isManifestJsAsset(file) && !seen.has(file)) { - seen.add(file) - imports.push(file) + const groupChunks = new Set() + const ancestors = new Set([group]) + for (const ancestor of ancestors) { + for (const availableChunk of ancestor.chunks) { + groupChunks.add(availableChunk) + } + for (const parent of ancestor.getParents()) { + ancestors.add(parent) + } + } + if (availableChunks === undefined) { + availableChunks = groupChunks + } else { + for (const availableChunk of availableChunks) { + if (!groupChunks.has(availableChunk)) { + availableChunks.delete(availableChunk) + } + } + } + } + availableChunks ??= new Set() + + // Every connection to a module adds the same chunks, so a module counts + // once, from its first active connection (an inactive one adds nothing and + // leaves the module to a later active one). + const counted = new Set() + for (const module of modules) { + for (const dependency of module.dependencies) { + const connection = compilation.moduleGraph.getConnection(dependency) + const importedModule = connection?.module + if ( + !connection || + !importedModule || + localModules.has(importedModule) || + counted.has(importedModule) + ) { + continue + } + if (connection.getActiveState(runtime) === false) { + continue + } + counted.add(importedModule) + + for (const importedChunk of chunksOfModule(importedModule)) { + if (availableChunks.has(importedChunk) && !seen.has(importedChunk)) { + seen.add(importedChunk) + importedChunks.push(importedChunk) } } } } - return imports + return importedChunks +} + +type GetStaticDependencyChunks = ( + chunk: RspackCompilationChunk, +) => Array + +/** + * Memoize static dependency resolution per chunk. Every chunk is resolved once + * for its own `imports`, and CSS-only chunks are resolved again from each + * importer that reaches them. A module's chunks are read once, for every chunk + * that imports it. Both memos live as long as the resolver, which is created + * per normalized compilation. + */ +function createStaticDependencyChunkResolver( + compilation: RspackCompilation, +): GetStaticDependencyChunks { + const cache = new Map>() + const moduleChunks = new Map>() + const chunksOfModule = (module: RspackModule) => { + let chunks = moduleChunks.get(module) + if (!chunks) { + chunks = Array.from( + compilation.chunkGraph.getModuleChunksIterable(module), + ) + moduleChunks.set(module, chunks) + } + return chunks + } + + return (chunk) => { + let importedChunks = cache.get(chunk) + if (!importedChunks) { + importedChunks = computeStaticDependencyChunks( + compilation, + chunk, + chunksOfModule, + ) + cache.set(chunk, importedChunks) + } + return importedChunks + } +} + +/** + * Collect CSS from dependency chunks that have no JavaScript asset of their + * own, preserving dependency-before-importer order across nested CSS chunks. + */ +function computeCssOnlyDependencyFiles( + getStaticDependencyChunks: GetStaticDependencyChunks, + chunks: Array, +): Array { + const cssFiles: Array = [] + const seenChunks = new Set() + const seenFiles = new Set() + + const visit = (chunk: RspackCompilationChunk) => { + if (seenChunks.has(chunk) || getChunkJsFiles(chunk).length > 0) { + return + } + seenChunks.add(chunk) + + for (const importedChunk of getStaticDependencyChunks(chunk)) { + visit(importedChunk) + } + + for (const cssFile of getChunkCssFiles(chunk)) { + if (!seenFiles.has(cssFile)) { + seenFiles.add(cssFile) + cssFiles.push(cssFile) + } + } + } + + for (const chunk of chunks) { + visit(chunk) + } + + return cssFiles } /** @@ -235,27 +400,17 @@ export function normalizeRspackClientBuild( } } + const getStaticDependencyChunks = + createStaticDependencyChunkResolver(compilation) + // Iterate ALL chunks (initial + async) to capture route-split chunks for (const chunk of compilation.chunks) { - const modules = compilation.chunkGraph.getChunkModules(chunk) + const modules = getModulesIncludingConcatenated( + compilation.chunkGraph.getChunkModules(chunk), + ) const routeFilePaths = getRouteFilePathsFromModules(modules) const hydrationIds = getHydrationIdsFromModules(modules) - const cssFiles: Array = [] - const seenCssFiles = new Set() - - for (const auxFile of chunk.auxiliaryFiles) { - if (auxFile.endsWith('.css') && !seenCssFiles.has(auxFile)) { - seenCssFiles.add(auxFile) - cssFiles.push(auxFile) - } - } - - for (const mainFile of chunk.files) { - if (mainFile.endsWith('.css') && !seenCssFiles.has(mainFile)) { - seenCssFiles.add(mainFile) - cssFiles.push(mainFile) - } - } + const cssFiles = getChunkCssFiles(chunk) // The entry chunk is the one named 'index' in the 'index' entrypoint const isEntryChunk = chunk.name === 'index' && entryChunkSet.has(chunk) @@ -265,16 +420,22 @@ export function normalizeRspackClientBuild( // Compute dynamicImports from chunk group children const dynamicImports = computeDynamicImports(chunk) + const staticDependencyChunks = getStaticDependencyChunks(chunk) + const dependencyCssFiles = computeCssOnlyDependencyFiles( + getStaticDependencyChunks, + staticDependencyChunks, + ).filter((cssFile) => !cssFiles.includes(cssFile)) + if (dependencyCssFiles.length > 0) { + cssFiles.unshift(...dependencyCssFiles) + } for (const file of jsFiles) { // For the entry chunk, `imports` contains all sibling initial chunks - // (vendor/shared). For async chunks, `imports` contains all sibling - // chunks from the ChunkGroup (shared dependencies the browser must - // load alongside this chunk). This mirrors Rollup's - // OutputChunk.imports which lists statically imported chunks. + // (vendor/shared). For other chunks, it contains the emitted chunks + // reached through active static module dependencies. const imports = isEntryChunk ? initialJsFileNames.filter((f) => f !== file) - : computeAsyncChunkImports(chunk, file) + : staticDependencyChunks.flatMap(getChunkJsFiles) const normalizedChunk: NormalizedClientChunk = { fileName: file, diff --git a/packages/start-plugin-core/src/rsbuild/plugin.ts b/packages/start-plugin-core/src/rsbuild/plugin.ts index 54ac57e9b7..c4660728b4 100644 --- a/packages/start-plugin-core/src/rsbuild/plugin.ts +++ b/packages/start-plugin-core/src/rsbuild/plugin.ts @@ -1,5 +1,5 @@ import { existsSync, readdirSync, realpathSync, statSync } from 'node:fs' -import { dirname, join, resolve } from 'node:path' +import { dirname, isAbsolute, join, resolve } from 'node:path' import { fileURLToPath } from 'node:url' import { joinURL } from 'ufo' import { @@ -27,6 +27,7 @@ import { } from './virtual-modules' import { createServerSetup } from './server-middleware' import { registerClientBuildCapture } from './normalized-client-build' +import { tapServerFnResolverRebuild } from './server-fn-resolver-rebuild' import { registerRouterPlugins } from './start-router-plugin' import { postBuildWithRsbuild } from './post-build' import { enableSwcReactServerComponents } from './swc-rsc' @@ -112,10 +113,15 @@ export function tanStackStartRsbuild( // 1. modifyRsbuildConfig — resolve config, set up environments // --------------------------------------------------------------- api.modifyRsbuildConfig((rsbuildConfig, { mergeRsbuildConfig }) => { - const root = - typeof rsbuildConfig.root === 'string' + // Rsbuild passes `root` on as written; its resolved root (against its + // `cwd`) is `rootPath`. Canonical (no trailing separator), as the + // virtual modules' paths must match Rspack's module paths. + const root = resolve( + typeof rsbuildConfig.root === 'string' && + isAbsolute(rsbuildConfig.root) ? rsbuildConfig.root - : process.cwd() + : api.context.rootPath, + ) const serverBase = rsbuildConfig.server?.base const assetPrefix = rsbuildConfig.output?.assetPrefix @@ -209,6 +215,18 @@ export function tanStackStartRsbuild( 'process.env.TSS_ROUTER_BASEPATH': JSON.stringify(routerBasepath), 'import.meta.env.TSS_ROUTER_BASEPATH': JSON.stringify(routerBasepath), + // In dev, SPA mode answers the shell (as Vite's dev server); + // a build leaves it to the prerendered shell (#8543) + ...(isDev + ? { + 'process.env.TSS_SHELL': JSON.stringify( + startConfig.spa?.enabled ? 'true' : 'false', + ), + 'import.meta.env.TSS_SHELL': JSON.stringify( + startConfig.spa?.enabled ? 'true' : 'false', + ), + } + : {}), 'process.env.TSS_DEV_SERVER': JSON.stringify( isDev ? 'true' : 'false', ), @@ -250,9 +268,15 @@ export function tanStackStartRsbuild( rsbuildConfig.server.printUrls === true ? { printUrls: ({ urls }: { urls: Array }) => urls } : {}), - // Rsbuild compression currently treats Node's raw header array - // writeHead form as an object, which corrupts SSR response headers. - compress: false, + // Off unless the app turns it on (#8544): compressed SSR streams + // reach the browser only when they end (the SSR middleware's + // srvx response does not flush the compression middleware), and + // @rsbuild/core < 2.0.5 corrupted the SSR response headers. + // `rsbuildConfig` already holds Rsbuild's default (`true`), so + // read the app's own config. + ...(api.getRsbuildConfig('original').server?.compress === undefined + ? { compress: false } + : {}), // SSR apps render every route on the server — disable HTML // fallback so rsbuild doesn't intercept /_serverFn/ URLs. htmlFallback: false, @@ -320,7 +344,7 @@ export function tanStackStartRsbuild( // RSC runtime, RSC HMR // --------------------------------------------------------------- const virtualModuleState = registerVirtualModules(api, { - root: resolvedStartConfig.root || process.cwd(), + getRoot: () => resolvedStartConfig.root, getConfig, serverFnsById, providerEnvName: serverFnProviderEnv, @@ -343,22 +367,24 @@ export function tanStackStartRsbuild( return } + const environmentName = utils.environment.name config.plugins.push({ apply(compiler: RspackCompiler) { - compiler.hooks.finishMake.tapPromise( - { - name: 'TanStackStartServerFnResolverRebuild', - stage: -10, - }, - async (compilation: RspackCompilationExtended) => { + tapServerFnResolverRebuild(compiler, { + name: 'TanStackStartServerFnResolverRebuild', + updateResolver: () => { virtualModuleState.updateServerFnResolver() - - await rebuildModulesContaining( + }, + getResolverWriteCount: () => + virtualModuleState.getServerFnResolverWriteCount( + environmentName, + ), + rebuildResolver: (compilation) => + rebuildModulesContaining( compilation, virtualModuleState.serverFnResolverPath, - ) - }, - ) + ), + }) }, }) }) @@ -377,11 +403,9 @@ export function tanStackStartRsbuild( // patching emitted server assets afterwards. // --------------------------------------------------------------- if (api.context.action !== 'dev') { - const normalizedManifestPath = normalizePath( - virtualModuleState.manifestPath, - ) + // (read when a module is transformed: the virtual paths need the resolved root) const matchesManifestPath = (id: string) => - normalizePath(id) === normalizedManifestPath + normalizePath(id) === normalizePath(virtualModuleState.manifestPath) api.transform( { @@ -537,57 +561,70 @@ export function tanStackStartRsbuild( config.plugins.push({ apply(compiler: RspackCompiler) { + tapServerFnResolverRebuild(compiler, { + name: 'TanStackStartRscServerFnResolverRebuild', + updateResolver: () => { + virtualModuleState.tryUpdateServerFnResolver( + virtualModuleState.generateCurrentResolverContent(true), + ) + }, + getResolverWriteCount: () => + virtualModuleState.getServerFnResolverWriteCount( + RSBUILD_ENVIRONMENT_NAMES.server, + ), + rebuildResolver: (compilation) => + rebuildModulesContaining( + compilation, + virtualModuleState.serverFnResolverPath, + ), + }) + }, + }) + + config.plugins.push({ + apply(compiler: RspackCompiler) { + // Dev manifest write count this compiler last rebuilt from. + let rebuiltAtWriteCount: number | undefined + compiler.hooks.finishMake.tapPromise( { - name: 'TanStackStartRscServerFnResolverRebuild', - stage: -10, + name: 'TanStackStartRscManifestRebuild', + // The native RSC ServerPlugin completes the client-entry + // handoff during its finishMake hook. Rebuild the manifest + // after that point so it reflects the client build: the + // build transform emits the final source instead of the + // placeholder, and dev picks up a manifest written while + // this compilation was already running. + stage: 10, }, async (compilation: RspackCompilationExtended) => { - const resolverContent = - virtualModuleState.generateCurrentResolverContent(true) - virtualModuleState.tryUpdateServerFnResolver( - resolverContent, - ) + const clientBuild = getClientBuild() + + if (!clientBuild) { + return + } + + virtualModuleState.updateManifest(clientBuild) + + if (api.context.action === 'dev') { + // Only rebuild when the manifest changed: rebuilding an + // unchanged module can rebuild the whole chunk graph. + const writeCount = + virtualModuleState.getDevManifestWriteCount() + if (writeCount === rebuiltAtWriteCount) { + return + } + rebuiltAtWriteCount = writeCount + } await rebuildModulesContaining( compilation, - virtualModuleState.serverFnResolverPath, + virtualModuleState.manifestPath, ) }, ) }, }) - - if (api.context.action !== 'dev') { - config.plugins.push({ - apply(compiler: RspackCompiler) { - compiler.hooks.finishMake.tapPromise( - { - name: 'TanStackStartRscManifestRebuild', - // The native RSC ServerPlugin completes the client-entry - // handoff during its finishMake hook. Rebuild the manifest - // after that point so the transform hook can emit the final - // manifest source instead of the placeholder. - stage: 10, - }, - async (compilation: RspackCompilationExtended) => { - const clientBuild = getClientBuild() - - if (!clientBuild) { - return - } - - virtualModuleState.updateManifest(clientBuild) - - await rebuildModulesContaining( - compilation, - virtualModuleState.manifestPath, - ) - }, - ) - }, - }) - } } if (isClientEnv) { diff --git a/packages/start-plugin-core/src/rsbuild/server-fn-resolver-rebuild.ts b/packages/start-plugin-core/src/rsbuild/server-fn-resolver-rebuild.ts new file mode 100644 index 0000000000..75c54ecf93 --- /dev/null +++ b/packages/start-plugin-core/src/rsbuild/server-fn-resolver-rebuild.ts @@ -0,0 +1,53 @@ +import type { Rspack } from '@rsbuild/core' + +export interface ServerFnResolverRebuildOptions { + /** Name of the finishMake tap. */ + name: string + /** Writes the current resolver content to its virtual module. */ + updateResolver: () => void + /** Returns how many times this environment's resolver has been written. */ + getResolverWriteCount: () => number + /** Rebuilds the resolver module in the given compilation. */ + rebuildResolver: (compilation: Rspack.Compilation) => Promise +} + +/** + * Rebuilds the server function resolver module at finishMake stage -10, + * after stage -20 has refreshed the server function registry. + * + * Skips the rebuild when the resolver has not been written since this + * compiler last rebuilt it. In development the resolver is written only when + * its content changes. Rebuilding an unchanged resolver can make Rspack + * rebuild the whole chunk graph. + */ +export function tapServerFnResolverRebuild( + compiler: Rspack.Compiler, + options: ServerFnResolverRebuildOptions, +): void { + // Write count of the resolver content this compiler last rebuilt from. + let rebuiltAtWriteCount: number | undefined + + compiler.hooks.finishMake.tapPromise( + { name: options.name, stage: -10 }, + async (compilation) => { + options.updateResolver() + + // Child compilers copy finishMake taps from their parent. Child + // compilations always rebuild and do not change this compiler's state. + if (compilation.compiler !== compiler) { + await options.rebuildResolver(compilation) + return + } + + // Read the count before the rebuild reads the resolver, so a write + // that lands during the rebuild causes another rebuild next time. + const writeCount = options.getResolverWriteCount() + if (writeCount === rebuiltAtWriteCount) { + return + } + + await options.rebuildResolver(compilation) + rebuiltAtWriteCount = writeCount + }, + ) +} diff --git a/packages/start-plugin-core/src/rsbuild/start-router-plugin.ts b/packages/start-plugin-core/src/rsbuild/start-router-plugin.ts index 40dfb9e42a..7c3106be28 100644 --- a/packages/start-plugin-core/src/rsbuild/start-router-plugin.ts +++ b/packages/start-plugin-core/src/rsbuild/start-router-plugin.ts @@ -1,12 +1,9 @@ -import path from 'pathe' import { createRouterPluginContext } from '@tanstack/router-plugin/context' import { TanStackRouterCodeSplitterRspack, TanStackRouterGeneratorRspack, } from '@tanstack/router-plugin/rspack' -import { routesManifestPlugin } from '../start-router-plugin/generator-plugins/routes-manifest-plugin' -import { prerenderRoutesPlugin } from '../start-router-plugin/generator-plugins/prerender-routes-plugin' -import { buildRouteTreeFileFooterFromConfig } from '../start-router-plugin/route-tree-footer' +import { startGeneratorConfig } from '../start-router-plugin/generator-config' import { RSBUILD_ENVIRONMENT_NAMES } from './planning' import type { RsbuildPluginAPI } from '@rsbuild/core' import type { GetConfigFn, TanStackStartCoreOptions } from '../types' @@ -38,25 +35,11 @@ export function registerRouterPlugins( // Generator only runs once — register for the client environment if (envName === RSBUILD_ENVIRONMENT_NAMES.client) { const generatorPlugin = TanStackRouterGeneratorRspack( - { - ...routerConfig, - target: opts.corePluginOpts.framework, - routeTreeFileFooter: () => { - return buildRouteTreeFileFooterFromConfig({ - generatedRouteTreePath: path.resolve( - routerConfig.generatedRouteTree, - ), - getConfig: opts.getConfig, - corePluginOpts: opts.corePluginOpts, - }) - }, - plugins: [ - routesManifestPlugin(), - ...(opts.startPluginOpts.prerender?.enabled === true - ? [prerenderRoutesPlugin()] - : []), - ], - }, + startGeneratorConfig({ + getConfig: opts.getConfig, + corePluginOpts: opts.corePluginOpts, + prerender: opts.startPluginOpts.prerender?.enabled === true, + }), routerPluginContext, ) utils.appendPlugins(generatorPlugin) @@ -73,7 +56,9 @@ export function registerRouterPlugins( target: opts.corePluginOpts.framework, codeSplittingOptions: { ...routerConfig.codeSplittingOptions, - deleteNodes: isClient ? ['ssr', 'server', 'headers'] : undefined, + deleteNodes: isClient + ? ['ssr', 'server', 'headers'] + : routerConfig.codeSplittingOptions?.deleteNodes, addHmr: isClient, }, }, diff --git a/packages/start-plugin-core/src/rsbuild/swc-rsc.ts b/packages/start-plugin-core/src/rsbuild/swc-rsc.ts index 16e21145b5..534a7860bb 100644 --- a/packages/start-plugin-core/src/rsbuild/swc-rsc.ts +++ b/packages/start-plugin-core/src/rsbuild/swc-rsc.ts @@ -3,6 +3,7 @@ import type { ModifyRspackConfigFn, Rspack } from '@rsbuild/core' type RspackConfig = Parameters[0] type RspackRule = Rspack.RuleSetRule +type Falsy = false | 0 | '' | null | undefined /** * Walk the rspack config's module.rules and inject @@ -27,7 +28,12 @@ export function enableSwcReactServerComponents( return [] } - return typeof use === 'function' ? [] : Array.isArray(use) ? use : [use] + const loaders = + typeof use === 'function' ? [] : Array.isArray(use) ? use : [use] + // Rspack allows falsy entries in `use` for conditionally disabled loaders. + return loaders.filter( + (loader): loader is Exclude => !!loader, + ) } const getLoaderPath = ( loader: ReturnType[number], @@ -66,7 +72,9 @@ export function enableSwcReactServerComponents( } if (Array.isArray(use)) { - return use.map((loader) => cloneLoader(loader)) as RspackRule['use'] + return use.map((loader) => + loader ? cloneLoader(loader) : loader, + ) as RspackRule['use'] } return cloneLoader(use) as RspackRule['use'] diff --git a/packages/start-plugin-core/src/rsbuild/virtual-modules.ts b/packages/start-plugin-core/src/rsbuild/virtual-modules.ts index 36a3427830..c5e28e96c7 100644 --- a/packages/start-plugin-core/src/rsbuild/virtual-modules.ts +++ b/packages/start-plugin-core/src/rsbuild/virtual-modules.ts @@ -28,7 +28,6 @@ const RSC_HMR_VIRTUAL_ID = 'virtual:tanstack-rsc-hmr' const RSC_BROWSER_DECODE_VIRTUAL_ID = 'virtual:tanstack-rsc-browser-decode' const RSC_SSR_DECODE_VIRTUAL_ID = 'virtual:tanstack-rsc-ssr-decode' export const START_MANIFEST_PLACEHOLDER = '__TSS_START_MANIFEST_PLACEHOLDER__' -const DEV_START_MANIFEST_GLOBAL = '__TSS_DEV_START_MANIFEST__' /** * VirtualModulesPlugin resolves module paths relative to compiler.context. * Prefix them under the app root so they are unique and watcher-friendly. @@ -43,10 +42,14 @@ function virtualPath(root: string, moduleId: string): string { export interface VirtualModuleState { /** Call to update manifest content after client build completes */ updateManifest: (clientBuild: NormalizedClientBuild) => void + /** Number of times the dev manifest module was written */ + getDevManifestWriteCount: () => number /** Call to update server fn resolver content after compilation discovers fns */ updateServerFnResolver: () => void - /** Try to write explicit resolver content now; queues if env not ready */ + /** Write explicit server resolver content; queues if env not ready */ tryUpdateServerFnResolver: (content: string) => void + /** Number of times the server fn resolver was written for an environment */ + getServerFnResolverWriteCount: (environmentName: string) => number /** Get the virtual path for a given module ID */ getVirtualPath: (moduleId: string) => string /** Generate resolver module content from current serverFnsById state. @@ -81,36 +84,24 @@ function getEntryScriptAttrs( : `{ async: true, src: '${entryUrl}' }` } -function generateManifestModuleDev( +/** + * Dev manifest used until the first client build completes. The server bundle + * may run outside the build process (e.g. in workerd), so the real manifest is + * written into this module rather than shared through build-process globals. + */ +function generateFallbackManifestModuleDev( devClientEntryUrl: string, scriptFormat: ScriptFormat, ): string { const scriptFormatProperty = getScriptFormatProperty(scriptFormat) - return `const fallbackManifest = { + return `export const tsrStartManifest = () => ({ ${scriptFormatProperty} routes: { __root__: { preloads: ['${devClientEntryUrl}'], scripts: [{ attrs: ${getEntryScriptAttrs(devClientEntryUrl, scriptFormat)} }], }, }, -} -export const tsrStartManifest = () => globalThis[${JSON.stringify(DEV_START_MANIFEST_GLOBAL)}] ?? fallbackManifest` -} - -function buildStartManifestData( - clientBuild: NormalizedClientBuild, - publicBase: string, - inlineCss: InlineCssOptions, - scriptFormat: ScriptFormat, -) { - const routeTreeRoutes = globalThis.TSS_ROUTES_MANIFEST - return buildStartManifest({ - clientBuild, - routeTreeRoutes, - basePath: publicBase, - inlineCss, - scriptFormat, - }) +})` } function serializeStartManifestData( @@ -120,7 +111,13 @@ function serializeStartManifestData( scriptFormat: ScriptFormat, ): string { return JSON.stringify( - buildStartManifestData(clientBuild, publicBase, inlineCss, scriptFormat), + buildStartManifest({ + clientBuild, + routeTreeRoutes: globalThis.TSS_ROUTES_MANIFEST, + basePath: publicBase, + inlineCss, + scriptFormat, + }), ) } @@ -221,7 +218,8 @@ export function setupRscHmr() { // --------------------------------------------------------------------------- export interface RegisterVirtualModulesOptions { - root: string + /** The resolved project root (read when the first Rspack config is built, after `modifyRsbuildConfig`). */ + getRoot: () => string getConfig: GetConfigFn serverFnsById: Record providerEnvName: string @@ -249,24 +247,42 @@ export function registerVirtualModules( opts: RegisterVirtualModulesOptions, ): VirtualModuleState { const isDev = api.context.action === 'dev' - const root = opts.root - - // Virtual module paths keyed by module ID - const paths = { - manifest: virtualPath(root, VIRTUAL_MODULES.startManifest), - serverFnResolver: virtualPath(root, VIRTUAL_MODULES.serverFnResolver), - pluginAdapters: virtualPath(root, VIRTUAL_MODULES.pluginAdapters), - } - - // RSC virtual module paths (only defined when RSC is enabled) - const rscPaths = opts.rscEnabled - ? { - rscRuntime: virtualPath(root, RSC_RUNTIME_VIRTUAL_ID), - rscHmr: virtualPath(root, RSC_HMR_VIRTUAL_ID), - rscBrowserDecode: virtualPath(root, RSC_BROWSER_DECODE_VIRTUAL_ID), - rscSsrDecode: virtualPath(root, RSC_SSR_DECODE_VIRTUAL_ID), + // Virtual module paths keyed by module ID, under the resolved root (never `process.cwd()`) + let resolvedPaths: + | { + manifest: string + serverFnResolver: string + pluginAdapters: string + rsc: { + rscRuntime: string + rscHmr: string + rscBrowserDecode: string + rscSsrDecode: string + } | null } - : null + | undefined + const pathsOf = () => { + if (!resolvedPaths) { + const root = opts.getRoot() + resolvedPaths = { + manifest: virtualPath(root, VIRTUAL_MODULES.startManifest), + serverFnResolver: virtualPath(root, VIRTUAL_MODULES.serverFnResolver), + pluginAdapters: virtualPath(root, VIRTUAL_MODULES.pluginAdapters), + rsc: opts.rscEnabled + ? { + rscRuntime: virtualPath(root, RSC_RUNTIME_VIRTUAL_ID), + rscHmr: virtualPath(root, RSC_HMR_VIRTUAL_ID), + rscBrowserDecode: virtualPath( + root, + RSC_BROWSER_DECODE_VIRTUAL_ID, + ), + rscSsrDecode: virtualPath(root, RSC_SSR_DECODE_VIRTUAL_ID), + } + : null, + } + } + return resolvedPaths + } // Track VirtualModulesPlugin instances per environment for dynamic updates const vmPlugins: Record = {} @@ -274,8 +290,11 @@ export function registerVirtualModules( const pendingWrites = new Map>() let clientBuild: NormalizedClientBuild | undefined + let lastDevManifestContent: string | undefined + let devManifestWriteCount = 0 const lastResolverContentByEnvironment: Record = {} + const resolverWriteCountByEnvironment: Record = {} const hasSeparateProviderEnvironment = !opts.rscEnabled && opts.providerEnvName !== RSBUILD_ENVIRONMENT_NAMES.server @@ -307,7 +326,9 @@ export function registerVirtualModules( content !== lastResolverContentByEnvironment[environmentName] ) { lastResolverContentByEnvironment[environmentName] = content - tryWriteModule(environmentName, paths.serverFnResolver, content) + resolverWriteCountByEnvironment[environmentName] = + (resolverWriteCountByEnvironment[environmentName] ?? 0) + 1 + tryWriteModule(environmentName, pathsOf().serverFnResolver, content) } } @@ -370,6 +391,8 @@ export function registerVirtualModules( function getInitialContent(environmentName: string): Record { // Safe to call getConfig() here — this runs inside modifyRspackConfig const { resolvedStartConfig, startConfig } = opts.getConfig() + const paths = pathsOf() + const rscPaths = paths.rsc const isServerEnv = environmentName === RSBUILD_ENVIRONMENT_NAMES.server const isClientEnv = environmentName === RSBUILD_ENVIRONMENT_NAMES.client const content: Record = {} @@ -380,7 +403,10 @@ export function registerVirtualModules( resolvedStartConfig.basePaths.publicBase, ) content[paths.manifest] = isDev - ? generateManifestModuleDev(devClientEntryUrl, opts.scriptFormat) + ? generateFallbackManifestModuleDev( + devClientEntryUrl, + opts.scriptFormat, + ) : generateManifestModuleBuild( clientBuild, resolvedStartConfig.basePaths.publicBase, @@ -445,21 +471,22 @@ export function createFromReadableStream() { throw new Error('RSC SSR decode is // Build a map from virtual module IDs to their virtual file paths. // Scheme-like IDs are rewritten with NormalModuleReplacementPlugin because // rspack validates request schemes before normal alias resolution. - const aliasMap: Record = { - [VIRTUAL_MODULES.startManifest]: paths.manifest, - [VIRTUAL_MODULES.serverFnResolver]: paths.serverFnResolver, - } - - if (hasSerializationAdapters) { - aliasMap[VIRTUAL_MODULES.pluginAdapters] = paths.pluginAdapters - } - - // Add RSC virtual module aliases - if (rscPaths) { - aliasMap[RSC_RUNTIME_VIRTUAL_ID] = rscPaths.rscRuntime - aliasMap[RSC_HMR_VIRTUAL_ID] = rscPaths.rscHmr - aliasMap[RSC_BROWSER_DECODE_VIRTUAL_ID] = rscPaths.rscBrowserDecode - aliasMap[RSC_SSR_DECODE_VIRTUAL_ID] = rscPaths.rscSsrDecode + const aliasMapOf = (): Record => { + const paths = pathsOf() + const aliasMap: Record = { + [VIRTUAL_MODULES.startManifest]: paths.manifest, + [VIRTUAL_MODULES.serverFnResolver]: paths.serverFnResolver, + } + if (hasSerializationAdapters) { + aliasMap[VIRTUAL_MODULES.pluginAdapters] = paths.pluginAdapters + } + if (paths.rsc) { + aliasMap[RSC_RUNTIME_VIRTUAL_ID] = paths.rsc.rscRuntime + aliasMap[RSC_HMR_VIRTUAL_ID] = paths.rsc.rscHmr + aliasMap[RSC_BROWSER_DECODE_VIRTUAL_ID] = paths.rsc.rscBrowserDecode + aliasMap[RSC_SSR_DECODE_VIRTUAL_ID] = paths.rsc.rscSsrDecode + } + return aliasMap } // Register VirtualModulesPlugin per environment via modifyRspackConfig @@ -490,6 +517,7 @@ export function createFromReadableStream() { throw new Error('RSC SSR decode is }) // Rewrite scheme-like IDs to the VirtualModulesPlugin-backed file paths. + const aliasMap = aliasMapOf() for (const [moduleId, virtualFilePath] of Object.entries(aliasMap)) { const NMR = utils.rspack.NormalModuleReplacementPlugin config.plugins.push( @@ -499,23 +527,20 @@ export function createFromReadableStream() { throw new Error('RSC SSR decode is const resolve = config.resolve const resolveAlias = (resolve.alias ??= {}) as Record - resolveAlias[VIRTUAL_MODULES.serverFnResolver] = paths.serverFnResolver - if (hasSerializationAdapters) { - resolveAlias[VIRTUAL_MODULES.pluginAdapters] = paths.pluginAdapters - } - - // Add RSC-specific resolve aliases - if (rscPaths) { - resolveAlias[RSC_RUNTIME_VIRTUAL_ID] = rscPaths.rscRuntime - resolveAlias[RSC_HMR_VIRTUAL_ID] = rscPaths.rscHmr - resolveAlias[RSC_BROWSER_DECODE_VIRTUAL_ID] = rscPaths.rscBrowserDecode - resolveAlias[RSC_SSR_DECODE_VIRTUAL_ID] = rscPaths.rscSsrDecode + for (const [moduleId, virtualFilePath] of Object.entries(aliasMap)) { + if (moduleId !== VIRTUAL_MODULES.startManifest) { + resolveAlias[moduleId] = virtualFilePath + } } }) return { - serverFnResolverPath: paths.serverFnResolver, - manifestPath: paths.manifest, + get serverFnResolverPath() { + return pathsOf().serverFnResolver + }, + get manifestPath() { + return pathsOf().manifest + }, vmPlugins, generateCurrentResolverContent(forProvider?: boolean): string { @@ -556,18 +581,26 @@ export function createFromReadableStream() { throw new Error('RSC SSR decode is updateManifest(newClientBuild: NormalizedClientBuild) { clientBuild = newClientBuild + if (!isDev) { + return + } + // Safe to call getConfig() here — runs after client build const { resolvedStartConfig } = opts.getConfig() - if (isDev) { - ;( - globalThis as typeof globalThis & { - [DEV_START_MANIFEST_GLOBAL]?: ReturnType - } - )[DEV_START_MANIFEST_GLOBAL] = buildStartManifestData( - clientBuild, - resolvedStartConfig.basePaths.publicBase, - { enabled: false, transformAssets: false }, - opts.scriptFormat, + const content = `export const tsrStartManifest = () => (${serializeStartManifestData( + clientBuild, + resolvedStartConfig.basePaths.publicBase, + { enabled: false, transformAssets: false }, + opts.scriptFormat, + )})` + // Only rewrite on change: each write rebuilds the server environment. + if (content !== lastDevManifestContent) { + lastDevManifestContent = content + devManifestWriteCount++ + tryWriteModule( + RSBUILD_ENVIRONMENT_NAMES.server, + pathsOf().manifest, + content, ) } }, @@ -591,17 +624,19 @@ export function createFromReadableStream() { throw new Error('RSC SSR decode is }, tryUpdateServerFnResolver(content: string) { - lastResolverContentByEnvironment[RSBUILD_ENVIRONMENT_NAMES.server] = - content - tryWriteModule( - RSBUILD_ENVIRONMENT_NAMES.server, - paths.serverFnResolver, - content, - ) + writeResolverContent(RSBUILD_ENVIRONMENT_NAMES.server, content) + }, + + getDevManifestWriteCount(): number { + return devManifestWriteCount + }, + + getServerFnResolverWriteCount(environmentName: string): number { + return resolverWriteCountByEnvironment[environmentName] ?? 0 }, getVirtualPath(moduleId: string): string { - return virtualPath(root, moduleId) + return virtualPath(opts.getRoot(), moduleId) }, } } diff --git a/packages/start-plugin-core/src/schema.ts b/packages/start-plugin-core/src/schema.ts index ab0bb9660a..413ac4673f 100644 --- a/packages/start-plugin-core/src/schema.ts +++ b/packages/start-plugin-core/src/schema.ts @@ -131,7 +131,7 @@ const pageSitemapOptionsSchema = z.object({ .optional(), }) -const pageBaseSchema = z.object({ +export const pageBaseSchema = z.object({ path: z.string(), sitemap: pageSitemapOptionsSchema.optional(), fromCrawl: z.boolean().optional(), @@ -302,6 +302,7 @@ export const tanstackStartOptionsSchema = tanstackStartOptionsObjectSchema .optional() .prefault({}) +export type PageBase = z.infer export type Page = z.infer type TanStackStartOptionsInput = NonNullable< diff --git a/packages/start-plugin-core/src/start-compiler/compiler.ts b/packages/start-plugin-core/src/start-compiler/compiler.ts index cbb2978ec0..13193f7249 100644 --- a/packages/start-plugin-core/src/start-compiler/compiler.ts +++ b/packages/start-plugin-core/src/start-compiler/compiler.ts @@ -16,6 +16,11 @@ import { handleCreateIsomorphicFn } from './handleCreateIsomorphicFn' import { handleEnvOnlyFn } from './handleEnvOnly' import { handleClientOnlyJSX } from './handleClientOnlyJSX' import { cleanId } from './utils' +import { + customIdCheck, + customIdError, + customIdWarning, +} from './server-fn-id-check' import type { CompilationContext, DevServerFnModuleSpecifierEncoder, @@ -425,6 +430,31 @@ function isTopLevelDirectCallCandidate( ) } +/** + * Whether the call is `receiver.method()` with a receiver that is not a + * namespace import, e.g. `z.object()` with `import { z } from 'zod'`. + * + * Resolution gives such a call the kind of the receiver itself, which only + * yields a direct-call candidate when the receiver is a factory and the code + * calls one of its properties (`createServerOnlyFn.bind()`). Skipping these + * calls saves loading the receiver's module (all of zod, here) only to learn + * that `z` is not a Start factory. + */ +function isMemberCallOnNonNamespaceReceiver( + node: t.CallExpression, + bindings: Map, +): boolean { + if ( + !t.isMemberExpression(node.callee) || + !t.isIdentifier(node.callee.object) + ) { + return false + } + + const binding = bindings.get(node.callee.object.name) + return !(binding?.type === 'import' && binding.importedName === '*') +} + function isDirectCallCandidateForKind( kind: Exclude, externalLookupSetup?: Map, @@ -606,11 +636,15 @@ export class StartCompiler { * In dev mode, uses a base64-encoded JSON with file path and export name. * In build mode, uses SHA256 hash or custom generator. */ - private generateFunctionId(opts: { - filename: string - functionName: string - extractedFilename: string - }): string { + private generateFunctionId( + opts: { + filename: string + functionName: string + variableName: string + extractedFilename: string + }, + warn: ((message: string) => void) | undefined, + ): string { if (this.mode === 'dev') { // In dev, encode the file path and export name for direct lookup. // Each bundler adapter supplies its own strategy for encoding @@ -648,11 +682,25 @@ export class StartCompiler { functionId = knownFn.functionId } - if (this.options.generateFunctionId) { - functionId ??= this.options.generateFunctionId({ + if (functionId === undefined && this.options.generateFunctionId) { + functionId = this.options.generateFunctionId({ filename: opts.filename, functionName: opts.functionName, }) + if (functionId) { + const subject = { + name: opts.variableName, + functionName: opts.functionName, + rootRel: opts.filename, + } + const check = customIdCheck(functionId) + if (check === 'error') { + throw new Error(customIdError(subject, functionId)) + } + if (check === 'deprecated') { + warn?.(customIdWarning(subject, functionId)) + } + } } if (!functionId) { functionId = crypto.createHash('sha256').update(entryId).digest('hex') @@ -1125,7 +1173,13 @@ export class StartCompiler { } } - if (isTopLevelDirectCallCandidate(path)) { + if ( + isTopLevelDirectCallCandidate(path) && + !isMemberCallOnNonNamespaceReceiver( + node, + moduleInfo.bindings, + ) + ) { candidatePaths.push({ path }) } }, @@ -1172,7 +1226,11 @@ export class StartCompiler { } } - if (checkDirectCalls && isTopLevelDirectCallCandidate(path)) { + if ( + checkDirectCalls && + isTopLevelDirectCallCandidate(path) && + !isMemberCallOnNonNamespaceReceiver(node, moduleInfo.bindings) + ) { candidatePaths.push({ path }) return } @@ -1297,8 +1355,6 @@ export class StartCompiler { const methodChain: MethodChainPaths = { middleware: null, validator: null, - // TODO remove upon stable - inputValidator: null, handler: null, server: null, client: null, @@ -1367,7 +1423,7 @@ export class StartCompiler { })(), warn: warnFn, - generateFunctionId: (opts) => this.generateFunctionId(opts), + generateFunctionId: (opts) => this.generateFunctionId(opts, warnFn), getKnownServerFns: this.options.getKnownServerFns, serverFnProviderModuleDirectives: this.options.serverFnProviderModuleDirectives, diff --git a/packages/start-plugin-core/src/start-compiler/handleCreateMiddleware.ts b/packages/start-plugin-core/src/start-compiler/handleCreateMiddleware.ts index 5a37803954..22575ccc50 100644 --- a/packages/start-plugin-core/src/start-compiler/handleCreateMiddleware.ts +++ b/packages/start-plugin-core/src/start-compiler/handleCreateMiddleware.ts @@ -1,24 +1,5 @@ import { stripMethodCall } from './utils' -import type { - CompilationContext, - MethodCallInfo, - RewriteCandidate, -} from './types' - -// TODO remove upon stable -function warnInputValidatorDeprecation( - context: CompilationContext, - inputValidator: MethodCallInfo, -): void { - const loc = inputValidator.callPath.node.loc?.start - const location = loc - ? `${context.id}:${loc.line}:${loc.column + 1} ` - : `${context.id} ` - - context.warn?.( - `${location}createMiddleware().inputValidator() is deprecated. Use createMiddleware().validator() instead.`, - ) -} +import type { CompilationContext, RewriteCandidate } from './types' /** * Handles createMiddleware transformations for a batch of candidates. @@ -35,32 +16,19 @@ export function handleCreateMiddleware( } for (const candidate of candidates) { - const { validator, inputValidator, server } = candidate.methodChain + const { validator, server } = candidate.methodChain - // TODO remove upon stable - if (inputValidator) { - warnInputValidatorDeprecation(context, inputValidator) - } - - for (const [methodName, methodCall] of [ - ['validator', validator], - // TODO remove upon stable - ['inputValidator', inputValidator], - ] as const) { - if (!methodCall) { - continue - } - - const innerInputExpression = methodCall.callPath.node.arguments[0] + if (validator) { + const innerInputExpression = validator.callPath.node.arguments[0] if (!innerInputExpression) { throw new Error( - `createMiddleware().${methodName}() must be called with a validator!`, + 'createMiddleware().validator() must be called with a validator!', ) } // remove the validator call expression - stripMethodCall(methodCall.callPath) + stripMethodCall(validator.callPath) } if (server) { diff --git a/packages/start-plugin-core/src/start-compiler/handleCreateServerFn.ts b/packages/start-plugin-core/src/start-compiler/handleCreateServerFn.ts index 3d4a8a2542..dd152bdaa4 100644 --- a/packages/start-plugin-core/src/start-compiler/handleCreateServerFn.ts +++ b/packages/start-plugin-core/src/start-compiler/handleCreateServerFn.ts @@ -4,12 +4,7 @@ import { hasKeys } from '@tanstack/router-core' import { getVariableDeclaratorForExpressionPath } from '@tanstack/router-utils' import path from 'pathe' import { cleanId, codeFrameError, stripMethodCall } from './utils' -import type { - CompilationContext, - MethodCallInfo, - RewriteCandidate, - ServerFn, -} from './types' +import type { CompilationContext, RewriteCandidate, ServerFn } from './types' import type { CompileStartFrameworkOptions } from '../types' const TSS_SERVERFN_SPLIT_PARAM = 'tss-serverfn-split' @@ -47,21 +42,6 @@ const ssrRpcManifestTemplate = babel.template.expression( `createSsrRpc(%%functionId%%)`, ) -// TODO remove upon stable -function warnInputValidatorDeprecation( - context: CompilationContext, - inputValidator: MethodCallInfo, -): void { - const loc = inputValidator.callPath.node.loc?.start - const location = loc - ? `${context.id}:${loc.line}:${loc.column + 1} ` - : `${context.id} ` - - context.warn?.( - `${location}createServerFn().inputValidator() is deprecated. Use createServerFn().validator() instead.`, - ) -} - // ============================================================================ // Runtime code cache (cached per framework to avoid repeated AST generation) // ============================================================================ @@ -241,7 +221,7 @@ export function handleCreateServerFn( for (const candidate of candidates) { const { path: candidatePath, methodChain } = candidate - const { validator, inputValidator, handler } = methodChain + const { validator, handler } = methodChain const candidateVariableDeclarator = getVariableDeclaratorForExpressionPath( candidatePath as babel.NodePath, @@ -275,6 +255,7 @@ export function handleCreateServerFn( const functionId = context.generateFunctionId({ filename: relativeFilename, functionName, + variableName: existingVariableName, extractedFilename, }) @@ -294,32 +275,19 @@ export function handleCreateServerFn( const canonicalExtractedFilename = knownFn?.extractedFilename ?? extractedFilename - // TODO remove upon stable - if (inputValidator) { - warnInputValidatorDeprecation(context, inputValidator) - } - // Handle validators - remove on client - for (const [methodName, methodCall] of [ - ['validator', validator], - // TODO remove upon stable - ['inputValidator', inputValidator], - ] as const) { - if (!methodCall) { - continue - } - - const innerInputExpression = methodCall.callPath.node.arguments[0] + if (validator) { + const innerInputExpression = validator.callPath.node.arguments[0] if (!innerInputExpression) { throw new Error( - `createServerFn().${methodName}() must be called with a validator!`, + 'createServerFn().validator() must be called with a validator!', ) } // If we're on the client, remove the validator call expression if (context.env === 'client') { - stripMethodCall(methodCall.callPath) + stripMethodCall(validator.callPath) } } diff --git a/packages/start-plugin-core/src/start-compiler/server-fn-id-check.ts b/packages/start-plugin-core/src/start-compiler/server-fn-id-check.ts new file mode 100644 index 0000000000..7ddaafce5b --- /dev/null +++ b/packages/start-plugin-core/src/start-compiler/server-fn-id-check.ts @@ -0,0 +1,75 @@ +/** + * Which ids a custom `serverFns.generateFunctionId` may return. The client + * puts the id after `TSS_SERVER_FN_BASE` unencoded and the server reads that + * path segment back, so an id has to survive that trip whole. + */ + +interface CustomIdSubject { + /** The server function's variable name. */ + name: string + /** The `functionName` the generator received. */ + functionName: string + /** The defining file, relative to the root. */ + rootRel: string +} + +/** + * `error`: the id never reached its handler: a character that splits or + * ends the path or that a client percent-encodes, a dot segment, which URL + * parsing removes, or a percent-encoding the server decodes to another id + * or rejects (`readBack`). `deprecated`: an ASCII character outside RFC + * 3986's unreserved set and `$`, which reaches the server but which proxies + * and servers may encode or normalise. + */ +export function customIdCheck(id: string): 'ok' | 'deprecated' | 'error' { + if ( + id === '.' || + id === '..' || + /[^\x21-\x7e]|["#/<>?\\^`{}]/.test(id) || + (id.includes('%') && readBack(id) !== id) + ) { + return 'error' + } + return /^[A-Za-z0-9\-._~$]+$/.test(id) ? 'ok' : 'deprecated' +} + +/** + * The id the server reads from the URL of an id holding `%`: the request + * URL's path, decoded as Start's server does when the path holds `%` + * (router-core `getNormalizedURL`, `decodePath`: `decodeURI` keeping `%25` + * and `%5C`, then control characters and `"<>\`{}` encoded again) and + * parsed again; `undefined` when the decode throws (the server answers 400). + */ +function readBack(id: string): string | undefined { + const base = '/_/' + const { pathname } = new URL(base + id, 'http://localhost') + let decoded = '' + try { + for (const part of pathname.split(/(%25|%5C)/i)) { + decoded += /^%(25|5C)$/i.test(part) + ? part + : decodeURI(part).replace( + // eslint-disable-next-line no-control-regex + /[\x00-\x1f\x7f"<>`{}]/g, + (ch) => + `%${ch.charCodeAt(0).toString(16).toUpperCase().padStart(2, '0')}`, + ) + } + } catch { + return undefined + } + const read = new URL(decoded, 'http://localhost').pathname + return read.startsWith(base) + ? read.slice(base.length).split('/')[0] + : undefined +} + +/** The build error of a custom id `customIdCheck` refuses. */ +export function customIdError(fn: CustomIdSubject, id: string): string { + return `[tanstack-start] serverFns.generateFunctionId returned ${JSON.stringify(id)} for the server function ${fn.name} (functionName "${fn.functionName}") of ${fn.rootRel}. A server function id is one path segment of its URL: it cannot hold whitespace, control or non-ASCII characters or any of " # / < > ? \\ ^ \` { }, cannot be "." or "..", and cannot hold a percent-encoding the server reads as another id ("%41") or rejects. Use ASCII letters, digits, "-", ".", "_", "~" and "$".` +} + +/** The build warning of a custom id `customIdCheck` deprecates. */ +export function customIdWarning(fn: CustomIdSubject, id: string): string { + return `[tanstack-start] serverFns.generateFunctionId returned ${JSON.stringify(id)} for the server function ${fn.name} (functionName "${fn.functionName}") of ${fn.rootRel}. Server function ids with characters other than ASCII letters, digits, "-", ".", "_", "~" and "$" are deprecated, and the next major version of TanStack Start rejects them: proxies and servers may encode or normalise them in the URL.` +} diff --git a/packages/start-plugin-core/src/start-compiler/server-fn-resolver-module.ts b/packages/start-plugin-core/src/start-compiler/server-fn-resolver-module.ts index d03bec3341..2d50376a39 100644 --- a/packages/start-plugin-core/src/start-compiler/server-fn-resolver-module.ts +++ b/packages/start-plugin-core/src/start-compiler/server-fn-resolver-module.ts @@ -31,7 +31,8 @@ export function generateServerFnResolverModule( ? `,\n isClientReferenced: ${fn.isClientReferenced ?? true}` : '' - return `'${id}': { + // (a custom id can hold `'`) + return `'${id.replace(/[\\']/g, '\\$&')}': { functionName: '${fn.functionName}', ${moduleAccess}${clientReferenced} }` diff --git a/packages/start-plugin-core/src/start-compiler/types.ts b/packages/start-plugin-core/src/start-compiler/types.ts index 1371e7a973..91b39f5f8a 100644 --- a/packages/start-plugin-core/src/start-compiler/types.ts +++ b/packages/start-plugin-core/src/start-compiler/types.ts @@ -49,8 +49,6 @@ export interface MethodCallInfo { export interface MethodChainPaths { middleware: MethodCallInfo | null validator: MethodCallInfo | null - // TODO remove upon stable - inputValidator: MethodCallInfo | null handler: MethodCallInfo | null server: MethodCallInfo | null client: MethodCallInfo | null @@ -92,6 +90,8 @@ export interface ServerFn { export type GenerateFunctionIdFn = (opts: { filename: string functionName: string + /** The server function's variable name, for diagnostics. */ + variableName: string extractedFilename: string }) => string @@ -99,7 +99,10 @@ export type GenerateFunctionIdFn = (opts: { * Optional version that allows returning undefined to use default ID generation. */ export type GenerateFunctionIdFnOptional = ( - opts: Omit[0], 'extractedFilename'>, + opts: Omit< + Parameters[0], + 'extractedFilename' | 'variableName' + >, ) => string | undefined /** diff --git a/packages/start-plugin-core/src/start-manifest-plugin/manifestBuilder.ts b/packages/start-plugin-core/src/start-manifest-plugin/manifestBuilder.ts index 02a8586592..d5339f2983 100644 --- a/packages/start-plugin-core/src/start-manifest-plugin/manifestBuilder.ts +++ b/packages/start-plugin-core/src/start-manifest-plugin/manifestBuilder.ts @@ -17,8 +17,6 @@ import type { import type { InlineCssTemplate } from './inlineCss' import type { NormalizedClientBuild, NormalizedClientChunk } from '../types' -const VISITING_CHUNK = 1 - type RouteTreeRoute = { filePath?: string preloads?: Array @@ -40,9 +38,17 @@ interface ScannedClientChunks { interface ManifestAssetResolvers { getAssetPath: (fileName: string) => string getChunkPreloads: (chunk: NormalizedClientChunk) => Array + getChunkCssAssets: (chunk: NormalizedClientChunk) => Array getStylesheetLink: (cssFile: string) => ManifestCssLink } +interface StaticImportClosure { + /** File names reachable through static imports, in discovery order. */ + fileNames: Array + /** Chunks reachable through static imports, dependencies before importers. */ + dependenciesFirst: Array +} + type DedupeRoute = { preloads?: Array scripts?: Array @@ -265,7 +271,10 @@ export function buildStartManifest(options: { > }): StartManifest { const scannedChunks = scanClientChunks(options.clientBuild) - const assetResolvers = createManifestAssetResolvers(options.basePath) + const assetResolvers = createManifestAssetResolvers( + options.basePath, + scannedChunks.chunksByFileName, + ) const routes = buildRouteManifestRoutes({ routeTreeRoutes: options.routeTreeRoutes, @@ -355,10 +364,16 @@ export function scanClientChunks( export function createManifestAssetResolvers( basePath: string, + chunksByFileName: ReadonlyMap, ): ManifestAssetResolvers { const assetPathByFileName = new Map() const stylesheetLinkByFileName = new Map() + const closureByChunk = new Map() const preloadsByChunk = new Map>() + const cssAssetsByChunk = new Map< + NormalizedClientChunk, + Array + >() const getAssetPath = (fileName: string) => { const cachedPath = assetPathByFileName.get(fileName) @@ -384,87 +399,100 @@ export function createManifestAssetResolvers( return link } + // One depth-first walk over the static import graph serves both preloads and + // stylesheets. `imports` lists direct imports only, so transitive chunks are + // only reached by walking the graph. The walk records the file names it + // discovers for preloads and the chunks in post-order so dependency CSS + // precedes importer CSS. Cycles are cut by the seen set, so every chunk in a + // cycle still sees the whole cycle from its own walk. + const getStaticImportClosure = (chunk: NormalizedClientChunk) => { + const cachedClosure = closureByChunk.get(chunk) + if (cachedClosure) { + return cachedClosure + } + + const seen = new Set([chunk.fileName]) + const fileNames: Array = [] + const dependenciesFirst: Array = [] + const stack: Array<{ chunk: NormalizedClientChunk; index: number }> = [ + { chunk, index: 0 }, + ] + + while (stack.length > 0) { + const frame = stack[stack.length - 1]! + + if (frame.index < frame.chunk.imports.length) { + const fileName = frame.chunk.imports[frame.index++]! + if (seen.has(fileName)) { + continue + } + + seen.add(fileName) + fileNames.push(fileName) + + const importedChunk = chunksByFileName.get(fileName) + if (importedChunk) { + stack.push({ chunk: importedChunk, index: 0 }) + } + continue + } + + stack.pop() + dependenciesFirst.push(frame.chunk) + } + + const closure = { fileNames, dependenciesFirst } + closureByChunk.set(chunk, closure) + return closure + } + const getChunkPreloads = (chunk: NormalizedClientChunk) => { const cachedPreloads = preloadsByChunk.get(chunk) if (cachedPreloads) { return cachedPreloads } + const { fileNames } = getStaticImportClosure(chunk) const preloads = [getAssetPath(chunk.fileName)] - for (let i = 0; i < chunk.imports.length; i++) { - preloads.push(getAssetPath(chunk.imports[i]!)) + for (let i = 0; i < fileNames.length; i++) { + preloads.push(getAssetPath(fileNames[i]!)) } preloadsByChunk.set(chunk, preloads) return preloads } - return { - getAssetPath, - getChunkPreloads, - getStylesheetLink, - } -} - -export function createChunkCssAssetCollector(options: { - chunksByFileName: ReadonlyMap - getStylesheetLink: (cssFile: string) => ManifestCssLink -}) { - const linksByChunk = new Map>() - const stateByChunk = new Map() - - const appendAsset = ( - links: Array, - seenLinks: Set, - link: ManifestCssLink, - ) => { - if (seenLinks.has(link)) { - return - } - - seenLinks.add(link) - links.push(link) - } - - const getChunkCssAssets = ( - chunk: NormalizedClientChunk, - ): Array => { - const cachedLinks = linksByChunk.get(chunk) + const getChunkCssAssets = (chunk: NormalizedClientChunk) => { + const cachedLinks = cssAssetsByChunk.get(chunk) if (cachedLinks) { return cachedLinks } - if (stateByChunk.get(chunk) === VISITING_CHUNK) { - return [] - } - stateByChunk.set(chunk, VISITING_CHUNK) - + const { dependenciesFirst } = getStaticImportClosure(chunk) const links: Array = [] const seenLinks = new Set() - for (let i = 0; i < chunk.imports.length; i++) { - const importedChunk = options.chunksByFileName.get(chunk.imports[i]!) - if (!importedChunk) { - continue - } - - const importedLinks = getChunkCssAssets(importedChunk) - for (let j = 0; j < importedLinks.length; j++) { - appendAsset(links, seenLinks, importedLinks[j]!) + for (let i = 0; i < dependenciesFirst.length; i++) { + for (const cssFile of dependenciesFirst[i]!.css) { + const link = getStylesheetLink(cssFile) + if (!seenLinks.has(link)) { + seenLinks.add(link) + links.push(link) + } } } - for (const cssFile of chunk.css) { - appendAsset(links, seenLinks, options.getStylesheetLink(cssFile)) - } - - stateByChunk.delete(chunk) - linksByChunk.set(chunk, links) + cssAssetsByChunk.set(chunk, links) return links } - return { getChunkCssAssets } + return { + getAssetPath, + getChunkPreloads, + getChunkCssAssets, + getStylesheetLink, + } } function buildInlineCssManifestData(options: { @@ -491,13 +519,12 @@ function buildInlineCssManifestData(options: { ) } - const { getAssetPath } = createManifestAssetResolvers(options.basePath) const styles: Record = {} let templates: Record | undefined const missingHrefs = new Set(stylesheetHrefs) for (const [cssFile, css] of options.cssContentByFileName) { - const cssHref = getAssetPath(cssFile) + const cssHref = joinURL(options.basePath, cssFile) if (!stylesheetHrefs.has(cssHref)) { continue } @@ -544,10 +571,7 @@ export function buildRouteManifestRoutes(options: { > }) { const routes: Record = {} - const getChunkCssAssets = createChunkCssAssetCollector({ - chunksByFileName: options.chunksByFileName, - getStylesheetLink: options.assetResolvers.getStylesheetLink, - }).getChunkCssAssets + const getChunkCssAssets = options.assetResolvers.getChunkCssAssets for (const [routeId, route] of Object.entries(options.routeTreeRoutes)) { if (!route.filePath) { diff --git a/packages/start-plugin-core/src/start-router-plugin/generator-config.ts b/packages/start-plugin-core/src/start-router-plugin/generator-config.ts new file mode 100644 index 0000000000..3d3e5ea086 --- /dev/null +++ b/packages/start-plugin-core/src/start-router-plugin/generator-config.ts @@ -0,0 +1,41 @@ +import path from 'pathe' +import { buildRouteTreeFileFooterFromConfig } from './route-tree-footer' +import { routesManifestPlugin } from './generator-plugins/routes-manifest-plugin' +import { prerenderRoutesPlugin } from './generator-plugins/prerender-routes-plugin' +import type { GeneratorPlugin } from '@tanstack/router-generator' +import type { Config } from '@tanstack/router-plugin' +import type { GetConfigFn, TanStackStartCoreOptions } from '../types' + +/** + * The route generator configuration of a Start app, the same for the Vite + * and Rsbuild plugins: the app's router options as the Start config parsed + * them, the framework's target, Start's route tree footer (the router and + * Start config types, then the app's own lines; computed at every print, as + * a router app's function-form `routeTreeFileFooter` is), and the generator + * plugins: the client route tree (Vite), the routes manifest, prerendering + * when enabled, and the app's own (#7768). + */ +export function startGeneratorConfig(opts: { + getConfig: GetConfigFn + corePluginOpts: TanStackStartCoreOptions + prerender: boolean + clientRouteTree?: GeneratorPlugin +}): Config { + const router = opts.getConfig().startConfig.router + return { + ...router, + target: opts.corePluginOpts.framework, + routeTreeFileFooter: () => + buildRouteTreeFileFooterFromConfig({ + generatedRouteTreePath: path.resolve(router.generatedRouteTree), + getConfig: opts.getConfig, + corePluginOpts: opts.corePluginOpts, + }), + plugins: [ + ...(opts.clientRouteTree ? [opts.clientRouteTree] : []), + routesManifestPlugin(), + ...(opts.prerender ? [prerenderRoutesPlugin()] : []), + ...(router.plugins ?? []), + ], + } +} diff --git a/packages/start-plugin-core/src/types.ts b/packages/start-plugin-core/src/types.ts index 6ed89244f4..db94e343d5 100644 --- a/packages/start-plugin-core/src/types.ts +++ b/packages/start-plugin-core/src/types.ts @@ -110,6 +110,11 @@ export interface NormalizedOutputDirectories { export interface NormalizedClientChunk { fileName: string isEntry: boolean + /** + * Chunks this chunk imports statically. Rolldown and Rsbuild report direct + * imports only, so consumers must walk the graph to reach transitive chunks + * instead of treating the list as complete. + */ imports: Array dynamicImports: Array css: Array diff --git a/packages/start-plugin-core/src/utils.ts b/packages/start-plugin-core/src/utils.ts index 0569bf2efa..2fb1bb5b69 100644 --- a/packages/start-plugin-core/src/utils.ts +++ b/packages/start-plugin-core/src/utils.ts @@ -4,7 +4,11 @@ const isWindows: boolean = typeof process !== 'undefined' && process.platform === 'win32' const windowsSlashRE = /\\/g -/** Read `build.rollupOptions` or `build.rolldownOptions` from a build config. */ +/** + * Read `build.rolldownOptions` from a build config. Vite 8 still accepts + * `build.rollupOptions` as a deprecated alias, and a user config can reach a + * plugin before Vite maps it. + */ export function getBundlerOptions(build: any): any { return build?.rolldownOptions ?? build?.rollupOptions } diff --git a/packages/start-plugin-core/src/vite/planning.ts b/packages/start-plugin-core/src/vite/planning.ts index 258fd2dbd2..fa11b98c47 100644 --- a/packages/start-plugin-core/src/vite/planning.ts +++ b/packages/start-plugin-core/src/vite/planning.ts @@ -56,21 +56,17 @@ export function createViteConfigPlan(opts: { environments: { [START_ENVIRONMENT_NAMES.client]: { consumer: 'client', - build: (() => { - const input = - opts.command === 'serve' ? DEV_CLIENT_ENTRY : ENTRY_POINTS.client - - const bundlerOptions = { + build: { + rolldownOptions: { input: { - index: input, + index: + opts.command === 'serve' + ? DEV_CLIENT_ENTRY + : ENTRY_POINTS.client, }, - } - return { - rollupOptions: bundlerOptions, - rolldownOptions: bundlerOptions, - outDir: opts.clientOutputDirectory, - } - })(), + }, + outDir: opts.clientOutputDirectory, + }, optimizeDeps: { exclude: opts.optimizeDepsExclude, entries: escapeEntries([ @@ -83,19 +79,13 @@ export function createViteConfigPlan(opts: { consumer: 'server', build: { ssr: true, - ...(() => { - const bundlerOptions = { - input: - getBundlerOptions( - opts.viteConfig.environments?.[START_ENVIRONMENT_NAMES.server] - ?.build, - )?.input ?? opts.entryAliases.server, - } - return { - rollupOptions: bundlerOptions, - rolldownOptions: bundlerOptions, - } - })(), + rolldownOptions: { + input: + getBundlerOptions( + opts.viteConfig.environments?.[START_ENVIRONMENT_NAMES.server] + ?.build, + )?.input ?? opts.entryAliases.server, + }, outDir: opts.serverOutputDirectory, commonjsOptions: { include: [/node_modules/], diff --git a/packages/start-plugin-core/src/vite/plugin.ts b/packages/start-plugin-core/src/vite/plugin.ts index 5fd9356f1f..5e5bca4a2e 100644 --- a/packages/start-plugin-core/src/vite/plugin.ts +++ b/packages/start-plugin-core/src/vite/plugin.ts @@ -1,3 +1,5 @@ +import { realpathSync } from 'node:fs' +import { resolve } from 'node:path' import { crawlFrameworkPkgs } from 'vitefu' import { applyResolvedBaseAndOutput, @@ -140,7 +142,11 @@ export function tanStackStartVite( // see https://github.com/vitejs/vite/blob/557f797d29422027e8c451ca50dd84bf8c41b5f0/packages/vite/src/node/optimizer/index.ts#L1282 const crawlFrameworkPkgsResult = await crawlFrameworkPkgs({ - root: process.cwd(), + // (the configured root, which can be relative: resolved as Vite does, + // then physical, as Vite resolves the app's imports from there) + root: realpathSync( + viteConfig.root ? resolve(viteConfig.root) : process.cwd(), + ), isBuild: command === 'build', isFrameworkPkgByJson(pkgJson) { const peerDependencies = pkgJson['peerDependencies'] diff --git a/packages/start-plugin-core/src/vite/start-manifest-plugin/plugin.ts b/packages/start-plugin-core/src/vite/start-manifest-plugin/plugin.ts index bc31f4e147..03e84c32c2 100644 --- a/packages/start-plugin-core/src/vite/start-manifest-plugin/plugin.ts +++ b/packages/start-plugin-core/src/vite/start-manifest-plugin/plugin.ts @@ -4,7 +4,6 @@ import { rootRouteId } from '@tanstack/router-core' import { DEV_CLIENT_ENTRY, START_ENVIRONMENT_NAMES } from '../../constants' import { buildStartManifest, - createManifestAssetResolvers, serializeStartManifest, } from '../../start-manifest-plugin/manifestBuilder' import { createVirtualModule } from '../createVirtualModule' @@ -117,10 +116,10 @@ function getViteAdditionalRouteAssets(options: { ) } - const { getStylesheetLink } = createManifestAssetResolvers(options.basePath) - return { - [rootRouteId]: [getStylesheetLink(options.cssCodeSplitDisabledFileName)], + [rootRouteId]: [ + joinURL(options.basePath, options.cssCodeSplitDisabledFileName), + ], } } diff --git a/packages/start-plugin-core/src/vite/start-router-plugin/plugin.ts b/packages/start-plugin-core/src/vite/start-router-plugin/plugin.ts index e4f06893a7..8df06af4f5 100644 --- a/packages/start-plugin-core/src/vite/start-router-plugin/plugin.ts +++ b/packages/start-plugin-core/src/vite/start-router-plugin/plugin.ts @@ -6,11 +6,10 @@ import { import path from 'pathe' import { normalizePath } from 'vite' import { VITE_ENVIRONMENT_NAMES } from '../../constants' -import { routesManifestPlugin } from '../../start-router-plugin/generator-plugins/routes-manifest-plugin' -import { prerenderRoutesPlugin } from '../../start-router-plugin/generator-plugins/prerender-routes-plugin' -import { buildRouteTreeFileFooterFromConfig } from '../../start-router-plugin/route-tree-footer' +import { startGeneratorConfig } from '../../start-router-plugin/generator-config' import { pruneServerOnlySubtrees } from '../../start-router-plugin/pruneServerOnlySubtrees' import { SERVER_PROP } from '../../start-router-plugin/constants' +import { escapeRegExp } from '../../utils' import type { GetConfigFn } from '../../types' import type { TanStackStartVitePluginCoreOptions } from '../types' import type { @@ -72,22 +71,6 @@ export function tanStackStartRouter( }, } - let routeTreeFileFooter: Array | null = null - - function getRouteTreeFileFooter() { - if (routeTreeFileFooter) { - return routeTreeFileFooter - } - routeTreeFileFooter = [ - ...buildRouteTreeFileFooterFromConfig({ - generatedRouteTreePath: getGeneratedRouteTreePath(), - getConfig, - corePluginOpts, - }), - ] - return routeTreeFileFooter - } - let resolvedGeneratedRouteTreePath: string | null = null const clientTreePlugin: Plugin = { name: 'tanstack-start:route-tree-client-plugin', @@ -104,8 +87,13 @@ export function tanStackStartRouter( resolvedGeneratedRouteTreePath = normalizePath( getGeneratedRouteTreePath(), ) + // The route tree module itself, by its exact id (a query aside) ;(clientTreePlugin.load as LoadObjectHook).filter = { - id: { include: new RegExp(resolvedGeneratedRouteTreePath) }, + id: { + include: new RegExp( + `^${escapeRegExp(resolvedGeneratedRouteTreePath)}(?:\\?.*)?$`, + ), + }, } }, @@ -113,7 +101,13 @@ export function tanStackStartRouter( filter: { // this will be set in the config hook above since it relies on `config` hook being called first }, - async handler() { + async handler(id) { + if ( + normalizePath(id.replace(/\?.*$/, '')) !== + resolvedGeneratedRouteTreePath + ) { + return null + } if (!generatorInstance) { throw new Error('Generator instance not initialized') } @@ -144,19 +138,16 @@ export function tanStackStartRouter( } return [ clientTreePlugin, - tanstackRouterGenerator(() => { - const routerConfig = getConfig().startConfig.router - const plugins = [clientTreeGeneratorPlugin, routesManifestPlugin()] - if (startPluginOpts.prerender?.enabled === true) { - plugins.push(prerenderRoutesPlugin()) - } - return { - ...routerConfig, - target: corePluginOpts.framework, - routeTreeFileFooter: getRouteTreeFileFooter, - plugins, - } - }, routerPluginContext), + tanstackRouterGenerator( + () => + startGeneratorConfig({ + getConfig, + corePluginOpts, + prerender: startPluginOpts.prerender?.enabled === true, + clientRouteTree: clientTreeGeneratorPlugin, + }), + routerPluginContext, + ), tanStackRouterCodeSplitter(() => { const routerConfig = getConfig().startConfig.router return { diff --git a/packages/start-plugin-core/tests/clientOnlyJSX/clientOnlyJSX.test.ts b/packages/start-plugin-core/tests/clientOnlyJSX/clientOnlyJSX.test.ts index 4f645d73db..fa48668a38 100644 --- a/packages/start-plugin-core/tests/clientOnlyJSX/clientOnlyJSX.test.ts +++ b/packages/start-plugin-core/tests/clientOnlyJSX/clientOnlyJSX.test.ts @@ -6,6 +6,7 @@ import { detectKindsInCode, StartCompiler, } from '../../src/start-compiler/compiler' +import { formatSnapshot } from '../format-snapshot' // Default test options for StartCompiler function getDefaultTestOptions(env: 'client' | 'server') { @@ -72,9 +73,9 @@ describe('ClientOnlyJSX compiles correctly', async () => { }) if (compiledResult) { - await expect(compiledResult.code).toMatchFileSnapshot( - `./snapshots/server/${filename}`, - ) + await expect( + await formatSnapshot(compiledResult.code, filename), + ).toMatchFileSnapshot(`./snapshots/server/${filename}`) } else { // No transformation - for files where ClientOnly is not from TanStack await expect('no-transform').toMatchFileSnapshot( diff --git a/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyBasic.tsx b/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyBasic.tsx index 82195ff739..96de7844f6 100644 --- a/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyBasic.tsx +++ b/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyBasic.tsx @@ -1,6 +1,8 @@ -import { ClientOnly } from '@tanstack/react-router'; +import { ClientOnly } from '@tanstack/react-router' export function MyComponent() { - return
+ return ( +
Loading...
} /> -
; -} \ No newline at end of file +
+ ) +} diff --git a/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyMultiple.tsx b/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyMultiple.tsx index f437f41b05..6b95090d3f 100644 --- a/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyMultiple.tsx +++ b/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyMultiple.tsx @@ -1,8 +1,10 @@ -import { ClientOnly } from '@tanstack/react-router'; +import { ClientOnly } from '@tanstack/react-router' export function MyComponent() { - return
+ return ( +
Loading video...} />

Some server content

Loading audio...} /> -
; -} \ No newline at end of file +
+ ) +} diff --git a/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyNested.tsx b/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyNested.tsx index 9d48d6577d..f3d5d3b526 100644 --- a/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyNested.tsx +++ b/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyNested.tsx @@ -1,6 +1,8 @@ -import { ClientOnly } from '@tanstack/react-router'; +import { ClientOnly } from '@tanstack/react-router' export function MyComponent() { - return
+ return ( +
Outer loading
} /> -
; -} \ No newline at end of file +
+ ) +} diff --git a/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyNoFallback.tsx b/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyNoFallback.tsx index 9224aeb1cf..40551a6dad 100644 --- a/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyNoFallback.tsx +++ b/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyNoFallback.tsx @@ -1,6 +1,8 @@ -import { ClientOnly } from '@tanstack/react-router'; +import { ClientOnly } from '@tanstack/react-router' export function MyComponent() { - return
+ return ( +
-
; -} \ No newline at end of file +
+ ) +} diff --git a/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyRenamed.tsx b/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyRenamed.tsx index de9e376b63..9a537448b0 100644 --- a/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyRenamed.tsx +++ b/packages/start-plugin-core/tests/clientOnlyJSX/snapshots/server/clientOnlyRenamed.tsx @@ -1,7 +1,9 @@ // Test: ClientOnly imported with an alias should still be transformed -import { ClientOnly as CO } from '@tanstack/react-router'; +import { ClientOnly as CO } from '@tanstack/react-router' export function MyComponent() { - return
+ return ( +
Loading...
} /> -
; -} \ No newline at end of file +
+ ) +} diff --git a/packages/start-plugin-core/tests/compiler.test.ts b/packages/start-plugin-core/tests/compiler.test.ts index e5ab41dbc9..68e193204f 100644 --- a/packages/start-plugin-core/tests/compiler.test.ts +++ b/packages/start-plugin-core/tests/compiler.test.ts @@ -1407,6 +1407,129 @@ export const factory = createServerFn().middleware([middleware]);` ).resolves.toBeNull() }) +describe.each(['build', 'dev'] as const)( + 'top-level member calls in %s mode', + (mode) => { + function createCompilerWithModules( + env: 'client' | 'server', + virtualModules: Record, + ) { + const resolved: Array = [] + const loaded: Array = [] + const compiler: StartCompiler = new StartCompiler({ + ...getDefaultTestOptions(env), + env, + mode, + devServerFnModuleSpecifierEncoder: ({ extractedFilename, root }) => + `/@id${extractedFilename.slice(root.length)}`, + lookupKinds: getLookupKindsForEnv(env), + lookupConfigurations: getLookupConfigurationsForEnv(env, 'react'), + getKnownServerFns: () => ({}), + resolveId: async (id) => { + resolved.push(id) + return id in virtualModules ? id : null + }, + loadModule: async (id) => { + loaded.push(id) + const code = virtualModules[id] + if (code) { + compiler.ingestModule({ code, id }) + } + }, + }) + return { compiler, resolved, loaded } + } + + describe.each(['fast', 'full'] as const)('%s traversal', (traversal) => { + // An isomorphic function requires full traversal; server functions alone + // use the compiler's fast path. Let normal code detection choose the path. + const traversalCode = + traversal === 'full' + ? `import { createIsomorphicFn } from '@tanstack/react-start' + export const iso = createIsomorphicFn().client(() => 'client').server(() => 'server')` + : '' + + test.each(['client', 'ssr', 'provider'] as const)( + 'does not resolve or load named-import receivers in %s output', + async (output) => { + const env = output === 'client' ? 'client' : 'server' + const { compiler, resolved, loaded } = createCompilerWithModules( + env, + { + zod: `export const z = { object: (shape) => shape, string: () => ({}) }`, + './api': `export const api = { users: () => [] }`, + }, + ) + const code = ` + ${traversalCode} + import { createServerFn } from '@tanstack/react-start' + import { z } from 'zod' + import { api } from './api' + + const Input = z.object({ id: z.string() }) + const users = api.users() + + export const getUser = createServerFn() + .validator(Input) + .handler(async ({ data }) => ({ id: data.id, users })) + ` + + const result = await compiler.compile({ + id: + '/test/get-user.ts' + + (output === 'provider' ? '?tss-serverfn-split' : ''), + code, + detectedKinds: detectKindsInCode(code, env), + }) + + expect(result).not.toBeNull() + const rpc = { + client: 'createClientRpc', + ssr: 'createSsrRpc', + provider: 'createServerRpc', + } + expect(result!.code).toContain(rpc[output]) + expect(resolved).toEqual([]) + expect(loaded).toEqual([]) + }, + ) + + test.each(['client', 'server'] as const)( + 'still compiles a renamed env-only factory called through a namespace import on %s', + async (env) => { + const { compiler } = createCompilerWithModules(env, { + './factory': `export { createServerOnlyFn as serverOnly } from '@tanstack/start-fn-stubs'`, + }) + const code = ` + ${traversalCode} + import { createServerFn } from '@tanstack/react-start' + import * as factory from './factory' + + export const impl = factory.serverOnly(() => 'server-only-value') + + export const fn = createServerFn().handler(async () => impl()) + ` + + const result = await compiler.compile({ + id: '/test/namespace-factory.ts', + code, + detectedKinds: detectKindsInCode(code, env), + }) + + expect(result).not.toBeNull() + if (env === 'server') { + expect(result!.code).toContain('server-only-value') + expect(result!.code).not.toContain('factory.serverOnly') + } else { + expect(result!.code).not.toContain('server-only-value') + expect(result!.code).toContain('throw new Error') + } + }, + ) + }) + }, +) + test.each([ `(createServerOnlyFn)(() => 'server-value')`, `(createIsomorphicFn)().server(() => 'server-value').client(() => 'client-value')`, diff --git a/packages/start-plugin-core/tests/createIsomorphicFn/createIsomorphicFn.test.ts b/packages/start-plugin-core/tests/createIsomorphicFn/createIsomorphicFn.test.ts index c36c117692..0b6a5aa26a 100644 --- a/packages/start-plugin-core/tests/createIsomorphicFn/createIsomorphicFn.test.ts +++ b/packages/start-plugin-core/tests/createIsomorphicFn/createIsomorphicFn.test.ts @@ -3,6 +3,7 @@ import path from 'node:path' import { describe, expect, test } from 'vitest' import { StartCompiler } from '../../src/start-compiler/compiler' +import { formatSnapshot } from '../format-snapshot' // Default test options for StartCompiler function getDefaultTestOptions(env: 'client' | 'server') { @@ -68,9 +69,9 @@ describe('createIsomorphicFn compiles correctly', async () => { id: filename, }) - await expect(compiledResult!.code).toMatchFileSnapshot( - `./snapshots/${env}/${filename}`, - ) + await expect( + await formatSnapshot(compiledResult!.code, filename), + ).toMatchFileSnapshot(`./snapshots/${env}/${filename}`) }, ) }) diff --git a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/call-at-module-level.ts b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/call-at-module-level.ts index efc23cf31b..7e8ade3201 100644 --- a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/call-at-module-level.ts +++ b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/call-at-module-level.ts @@ -1,5 +1,5 @@ const getEnvironment = () => { - console.log('[CLIENT] getEnvironment called'); - return 'client'; -}; -const moduleLevel = getEnvironment(); \ No newline at end of file + console.log('[CLIENT] getEnvironment called') + return 'client' +} +const moduleLevel = getEnvironment() diff --git a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructured.tsx b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructured.tsx index 956fe05f98..20fbb3d4dc 100644 --- a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructured.tsx +++ b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructured.tsx @@ -1,13 +1,13 @@ -import { createIsomorphicFn } from '@tanstack/react-start'; -const noImpl = createIsomorphicFn(); -const serverOnlyFn = () => {}; -const clientOnlyFn = () => 'client'; -const serverThenClientFn = () => 'client'; -const clientThenServerFn = () => 'client'; -const serverOnlyFnAbstracted = () => {}; +import { createIsomorphicFn } from '@tanstack/react-start' +const noImpl = createIsomorphicFn() +const serverOnlyFn = () => {} +const clientOnlyFn = () => 'client' +const serverThenClientFn = () => 'client' +const clientThenServerFn = () => 'client' +const serverOnlyFnAbstracted = () => {} function abstractedClientFn() { - return 'client'; + return 'client' } -const clientOnlyFnAbstracted = abstractedClientFn; -const serverThenClientFnAbstracted = abstractedClientFn; -const clientThenServerFnAbstracted = abstractedClientFn; \ No newline at end of file +const clientOnlyFnAbstracted = abstractedClientFn +const serverThenClientFnAbstracted = abstractedClientFn +const clientThenServerFnAbstracted = abstractedClientFn diff --git a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructuredRename.tsx b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructuredRename.tsx index 5e167daeb6..d8f76d94b0 100644 --- a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructuredRename.tsx +++ b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnDestructuredRename.tsx @@ -1,13 +1,13 @@ -import { createIsomorphicFn as isomorphicFn } from '@tanstack/react-start'; -const noImpl = isomorphicFn(); -const serverOnlyFn = () => {}; -const clientOnlyFn = () => 'client'; -const serverThenClientFn = () => 'client'; -const clientThenServerFn = () => 'client'; -const serverOnlyFnAbstracted = () => {}; +import { createIsomorphicFn as isomorphicFn } from '@tanstack/react-start' +const noImpl = isomorphicFn() +const serverOnlyFn = () => {} +const clientOnlyFn = () => 'client' +const serverThenClientFn = () => 'client' +const clientThenServerFn = () => 'client' +const serverOnlyFnAbstracted = () => {} function abstractedClientFn() { - return 'client'; + return 'client' } -const clientOnlyFnAbstracted = abstractedClientFn; -const serverThenClientFnAbstracted = abstractedClientFn; -const clientThenServerFnAbstracted = abstractedClientFn; \ No newline at end of file +const clientOnlyFnAbstracted = abstractedClientFn +const serverThenClientFnAbstracted = abstractedClientFn +const clientThenServerFnAbstracted = abstractedClientFn diff --git a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnFactory.tsx b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnFactory.tsx index b54ad664b1..08772a9178 100644 --- a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnFactory.tsx +++ b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnFactory.tsx @@ -1,27 +1,22 @@ -import { createIsomorphicFn } from '@tanstack/react-start'; - +import { createIsomorphicFn } from '@tanstack/react-start' // Isomorphic function factory - returns a createIsomorphicFn with .client() and .server() calls export function createPlatformFn(platform: string) { - return () => `client-${platform}`; + return () => `client-${platform}` } - // Arrow function factory with only server implementation export const createServerImplFn = (name: string) => { - return () => {}; -}; - + return () => {} +} // Arrow function factory with only client implementation export const createClientImplFn = (name: string) => { return () => { - console.log(`Client: ${name}`); - return `client-${name}`; - }; -}; - + console.log(`Client: ${name}`) + return `client-${name}` + } +} // Factory returning no-implementation isomorphic fn export function createNoImplFn() { - return createIsomorphicFn(); + return createIsomorphicFn() } - // Top-level isomorphic fn for comparison -export const topLevelIsomorphicFn = () => 'client'; \ No newline at end of file +export const topLevelIsomorphicFn = () => 'client' diff --git a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnInline.tsx b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnInline.tsx index 09666623a6..28930701bd 100644 --- a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnInline.tsx +++ b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnInline.tsx @@ -1,41 +1,33 @@ // Create and immediately invoke isomorphic fn inside a function export function getPlatformValue() { - const fn = () => 'client-value'; - return fn(); + const fn = () => 'client-value' + return fn() } - // Arrow function that creates and invokes isomorphic fn export const getEnvironment = () => { - const envFn = () => 'running on client'; - return envFn(); -}; - + const envFn = () => 'running on client' + return envFn() +} // Create isomorphic fn inline without assigning to variable export function getDirectValue() { - return (() => 'direct-client')(); + return (() => 'direct-client')() } - // Multiple isomorphic fns created and used in same function export function getMultipleValues() { - const first = () => 'first-client'; - const second = () => 'second-client'; - return { - first: first(), - second: second() - }; + const first = () => 'first-client' + const second = () => 'second-client' + return { first: first(), second: second() } } - // Isomorphic fn with server-only implementation used inline export function getServerOnlyValue() { - const fn = () => {}; - return fn(); + const fn = () => {} + return fn() } - // Isomorphic fn with client-only implementation used inline export function getClientOnlyValue() { const fn = () => { - console.log('client side effect'); - return 'client-only-value'; - }; - return fn(); -} \ No newline at end of file + console.log('client side effect') + return 'client-only-value' + } + return fn() +} diff --git a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnStarImport.tsx b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnStarImport.tsx index 070f59d901..f8604d9723 100644 --- a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnStarImport.tsx +++ b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/client/createIsomorphicFnStarImport.tsx @@ -1,13 +1,13 @@ -import * as TanStackStart from '@tanstack/react-start'; -const noImpl = TanStackStart.createIsomorphicFn(); -const serverOnlyFn = () => {}; -const clientOnlyFn = () => 'client'; -const serverThenClientFn = () => 'client'; -const clientThenServerFn = () => 'client'; -const serverOnlyFnAbstracted = () => {}; +import * as TanStackStart from '@tanstack/react-start' +const noImpl = TanStackStart.createIsomorphicFn() +const serverOnlyFn = () => {} +const clientOnlyFn = () => 'client' +const serverThenClientFn = () => 'client' +const clientThenServerFn = () => 'client' +const serverOnlyFnAbstracted = () => {} function abstractedClientFn() { - return 'client'; + return 'client' } -const clientOnlyFnAbstracted = abstractedClientFn; -const serverThenClientFnAbstracted = abstractedClientFn; -const clientThenServerFnAbstracted = abstractedClientFn; \ No newline at end of file +const clientOnlyFnAbstracted = abstractedClientFn +const serverThenClientFnAbstracted = abstractedClientFn +const clientThenServerFnAbstracted = abstractedClientFn diff --git a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/call-at-module-level.ts b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/call-at-module-level.ts index 2fa99b5686..66c327f562 100644 --- a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/call-at-module-level.ts +++ b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/call-at-module-level.ts @@ -1,5 +1,5 @@ const getEnvironment = () => { - console.log('[SERVER] getEnvironment called'); - return 'server'; -}; -const moduleLevel = getEnvironment(); \ No newline at end of file + console.log('[SERVER] getEnvironment called') + return 'server' +} +const moduleLevel = getEnvironment() diff --git a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructured.tsx b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructured.tsx index 195cee12a6..ee54120ca1 100644 --- a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructured.tsx +++ b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructured.tsx @@ -1,13 +1,13 @@ -import { createIsomorphicFn } from '@tanstack/react-start'; -const noImpl = createIsomorphicFn(); -const serverOnlyFn = () => 'server'; -const clientOnlyFn = () => {}; -const serverThenClientFn = () => 'server'; -const clientThenServerFn = () => 'server'; +import { createIsomorphicFn } from '@tanstack/react-start' +const noImpl = createIsomorphicFn() +const serverOnlyFn = () => 'server' +const clientOnlyFn = () => {} +const serverThenClientFn = () => 'server' +const clientThenServerFn = () => 'server' function abstractedServerFn() { - return 'server'; + return 'server' } -const serverOnlyFnAbstracted = abstractedServerFn; -const clientOnlyFnAbstracted = () => {}; -const serverThenClientFnAbstracted = abstractedServerFn; -const clientThenServerFnAbstracted = abstractedServerFn; \ No newline at end of file +const serverOnlyFnAbstracted = abstractedServerFn +const clientOnlyFnAbstracted = () => {} +const serverThenClientFnAbstracted = abstractedServerFn +const clientThenServerFnAbstracted = abstractedServerFn diff --git a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructuredRename.tsx b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructuredRename.tsx index c50c274dd6..11289136e9 100644 --- a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructuredRename.tsx +++ b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnDestructuredRename.tsx @@ -1,13 +1,13 @@ -import { createIsomorphicFn as isomorphicFn } from '@tanstack/react-start'; -const noImpl = isomorphicFn(); -const serverOnlyFn = () => 'server'; -const clientOnlyFn = () => {}; -const serverThenClientFn = () => 'server'; -const clientThenServerFn = () => 'server'; +import { createIsomorphicFn as isomorphicFn } from '@tanstack/react-start' +const noImpl = isomorphicFn() +const serverOnlyFn = () => 'server' +const clientOnlyFn = () => {} +const serverThenClientFn = () => 'server' +const clientThenServerFn = () => 'server' function abstractedServerFn() { - return 'server'; + return 'server' } -const serverOnlyFnAbstracted = abstractedServerFn; -const clientOnlyFnAbstracted = () => {}; -const serverThenClientFnAbstracted = abstractedServerFn; -const clientThenServerFnAbstracted = abstractedServerFn; \ No newline at end of file +const serverOnlyFnAbstracted = abstractedServerFn +const clientOnlyFnAbstracted = () => {} +const serverThenClientFnAbstracted = abstractedServerFn +const clientThenServerFnAbstracted = abstractedServerFn diff --git a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnFactory.tsx b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnFactory.tsx index cce206bc8b..c1ec1e79f5 100644 --- a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnFactory.tsx +++ b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnFactory.tsx @@ -1,27 +1,22 @@ -import { createIsomorphicFn } from '@tanstack/react-start'; - +import { createIsomorphicFn } from '@tanstack/react-start' // Isomorphic function factory - returns a createIsomorphicFn with .client() and .server() calls export function createPlatformFn(platform: string) { - return () => `server-${platform}`; + return () => `server-${platform}` } - // Arrow function factory with only server implementation export const createServerImplFn = (name: string) => { return () => { - console.log(`Server: ${name}`); - return `server-${name}`; - }; -}; - + console.log(`Server: ${name}`) + return `server-${name}` + } +} // Arrow function factory with only client implementation export const createClientImplFn = (name: string) => { - return () => {}; -}; - + return () => {} +} // Factory returning no-implementation isomorphic fn export function createNoImplFn() { - return createIsomorphicFn(); + return createIsomorphicFn() } - // Top-level isomorphic fn for comparison -export const topLevelIsomorphicFn = () => 'server'; \ No newline at end of file +export const topLevelIsomorphicFn = () => 'server' diff --git a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnInline.tsx b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnInline.tsx index 9c058dfae8..c2b0d07284 100644 --- a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnInline.tsx +++ b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnInline.tsx @@ -1,41 +1,33 @@ // Create and immediately invoke isomorphic fn inside a function export function getPlatformValue() { - const fn = () => 'server-value'; - return fn(); + const fn = () => 'server-value' + return fn() } - // Arrow function that creates and invokes isomorphic fn export const getEnvironment = () => { - const envFn = () => 'running on server'; - return envFn(); -}; - + const envFn = () => 'running on server' + return envFn() +} // Create isomorphic fn inline without assigning to variable export function getDirectValue() { - return (() => 'direct-server')(); + return (() => 'direct-server')() } - // Multiple isomorphic fns created and used in same function export function getMultipleValues() { - const first = () => 'first-server'; - const second = () => 'second-server'; - return { - first: first(), - second: second() - }; + const first = () => 'first-server' + const second = () => 'second-server' + return { first: first(), second: second() } } - // Isomorphic fn with server-only implementation used inline export function getServerOnlyValue() { const fn = () => { - console.log('server side effect'); - return 'server-only-value'; - }; - return fn(); + console.log('server side effect') + return 'server-only-value' + } + return fn() } - // Isomorphic fn with client-only implementation used inline export function getClientOnlyValue() { - const fn = () => {}; - return fn(); -} \ No newline at end of file + const fn = () => {} + return fn() +} diff --git a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnStarImport.tsx b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnStarImport.tsx index 65e4fc18b1..6a1c429167 100644 --- a/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnStarImport.tsx +++ b/packages/start-plugin-core/tests/createIsomorphicFn/snapshots/server/createIsomorphicFnStarImport.tsx @@ -1,13 +1,13 @@ -import * as TanStackStart from '@tanstack/react-start'; -const noImpl = TanStackStart.createIsomorphicFn(); -const serverOnlyFn = () => 'server'; -const clientOnlyFn = () => {}; -const serverThenClientFn = () => 'server'; -const clientThenServerFn = () => 'server'; +import * as TanStackStart from '@tanstack/react-start' +const noImpl = TanStackStart.createIsomorphicFn() +const serverOnlyFn = () => 'server' +const clientOnlyFn = () => {} +const serverThenClientFn = () => 'server' +const clientThenServerFn = () => 'server' function abstractedServerFn() { - return 'server'; + return 'server' } -const serverOnlyFnAbstracted = abstractedServerFn; -const clientOnlyFnAbstracted = () => {}; -const serverThenClientFnAbstracted = abstractedServerFn; -const clientThenServerFnAbstracted = abstractedServerFn; \ No newline at end of file +const serverOnlyFnAbstracted = abstractedServerFn +const clientOnlyFnAbstracted = () => {} +const serverThenClientFnAbstracted = abstractedServerFn +const clientThenServerFnAbstracted = abstractedServerFn diff --git a/packages/start-plugin-core/tests/createMiddleware/createMiddleware.test.ts b/packages/start-plugin-core/tests/createMiddleware/createMiddleware.test.ts index 4747cfc848..94af6ed65e 100644 --- a/packages/start-plugin-core/tests/createMiddleware/createMiddleware.test.ts +++ b/packages/start-plugin-core/tests/createMiddleware/createMiddleware.test.ts @@ -2,6 +2,7 @@ import { readFile, readdir } from 'node:fs/promises' import path from 'node:path' import { describe, expect, test, vi } from 'vitest' import { StartCompiler } from '../../src/start-compiler/compiler' +import { formatSnapshot } from '../format-snapshot' // Default test options for StartCompiler function getDefaultTestOptions(env: 'client' | 'server') { @@ -22,7 +23,6 @@ async function compile(opts: { env: 'client' | 'server' code: string id: string - warn?: (message: string) => void }) { const compiler = new StartCompiler({ ...opts, @@ -43,7 +43,6 @@ async function compile(opts: { kind: 'Root', }, ], - warn: opts.warn, getKnownServerFns: () => ({}), resolveId: async (id) => { return id @@ -69,9 +68,9 @@ describe('createMiddleware compiles correctly', async () => { test(`should compile for ${filename} client`, async () => { const result = await compile({ env: 'client', code, id: filename }) - await expect(result!.code).toMatchFileSnapshot( - `./snapshots/client/${filename}`, - ) + await expect( + await formatSnapshot(result!.code, filename), + ).toMatchFileSnapshot(`./snapshots/client/${filename}`) }) }) @@ -90,37 +89,12 @@ describe('createMiddleware compiles correctly', async () => { id: 'test.ts', }) - expect(result!.code).toMatchInlineSnapshot(` - "import { createMiddleware } from '@tanstack/react-start'; - const myMiddleware = createMiddleware({ - type: 'function' - });" - `) - }) - - // TODO remove upon stable - test('should warn for deprecated inputValidator method', async () => { - const warn = vi.fn() - const code = ` - import { createMiddleware } from '@tanstack/react-start' + expect(await formatSnapshot(result!.code, 'test.ts')) + .toMatchInlineSnapshot(` + "import { createMiddleware } from '@tanstack/react-start' const myMiddleware = createMiddleware({ type: 'function' }) - .inputValidator((input: string) => input) - .server(async ({ next }) => { - return next() - })` - - await compile({ - env: 'client', - code, - id: 'test.ts', - warn, - }) - - expect(warn).toHaveBeenCalledWith( - expect.stringContaining( - 'createMiddleware().inputValidator() is deprecated. Use createMiddleware().validator() instead.', - ), - ) + " + `) }) test('should use fast path for direct imports from known library (no extra resolveId calls)', async () => { diff --git a/packages/start-plugin-core/tests/createMiddleware/snapshots/client/create-function-middleware.ts b/packages/start-plugin-core/tests/createMiddleware/snapshots/client/create-function-middleware.ts index b37e25e498..73d5910eef 100644 --- a/packages/start-plugin-core/tests/createMiddleware/snapshots/client/create-function-middleware.ts +++ b/packages/start-plugin-core/tests/createMiddleware/snapshots/client/create-function-middleware.ts @@ -1,6 +1,4 @@ -import { createMiddleware } from '@tanstack/react-start'; -export const fnMw = createMiddleware({ - type: 'function' -}).client(() => { - console.log('client'); -}); \ No newline at end of file +import { createMiddleware } from '@tanstack/react-start' +export const fnMw = createMiddleware({ type: 'function' }).client(() => { + console.log('client') +}) diff --git a/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareDestructured.tsx b/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareDestructured.tsx index b5cf588a1f..c3497f072b 100644 --- a/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareDestructured.tsx +++ b/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareDestructured.tsx @@ -1,13 +1,5 @@ -import { createMiddleware } from '@tanstack/react-start'; -export const withUseServer = createMiddleware({ - id: 'test' -}); -export const withoutUseServer = createMiddleware({ - id: 'test' -}); -export const withVariable = createMiddleware({ - id: 'test' -}); -export const withZodValidator = createMiddleware({ - id: 'test' -}); \ No newline at end of file +import { createMiddleware } from '@tanstack/react-start' +export const withUseServer = createMiddleware({ id: 'test' }) +export const withoutUseServer = createMiddleware({ id: 'test' }) +export const withVariable = createMiddleware({ id: 'test' }) +export const withZodValidator = createMiddleware({ id: 'test' }) diff --git a/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareDestructuredRename.tsx b/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareDestructuredRename.tsx index ee06179703..70d3921bda 100644 --- a/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareDestructuredRename.tsx +++ b/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareDestructuredRename.tsx @@ -1,13 +1,5 @@ -import { createMiddleware as middlewareFn } from '@tanstack/react-start'; -export const withUseServer = middlewareFn({ - id: 'test' -}); -export const withoutUseServer = middlewareFn({ - id: 'test' -}); -export const withVariable = middlewareFn({ - id: 'test' -}); -export const withZodValidator = middlewareFn({ - id: 'test' -}); \ No newline at end of file +import { createMiddleware as middlewareFn } from '@tanstack/react-start' +export const withUseServer = middlewareFn({ id: 'test' }) +export const withoutUseServer = middlewareFn({ id: 'test' }) +export const withVariable = middlewareFn({ id: 'test' }) +export const withZodValidator = middlewareFn({ id: 'test' }) diff --git a/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareStarImport.tsx b/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareStarImport.tsx index 6f2f40a2a3..f997f40fe0 100644 --- a/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareStarImport.tsx +++ b/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareStarImport.tsx @@ -1,13 +1,5 @@ -import * as TanStackStart from '@tanstack/react-start'; -export const withUseServer = TanStackStart.createMiddleware({ - id: 'test' -}); -export const withoutUseServer = TanStackStart.createMiddleware({ - id: 'test' -}); -export const withVariable = TanStackStart.createMiddleware({ - id: 'test' -}); -export const withZodValidator = TanStackStart.createMiddleware({ - id: 'test' -}); \ No newline at end of file +import * as TanStackStart from '@tanstack/react-start' +export const withUseServer = TanStackStart.createMiddleware({ id: 'test' }) +export const withoutUseServer = TanStackStart.createMiddleware({ id: 'test' }) +export const withVariable = TanStackStart.createMiddleware({ id: 'test' }) +export const withZodValidator = TanStackStart.createMiddleware({ id: 'test' }) diff --git a/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareValidator.tsx b/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareValidator.tsx index 3b1beac2c0..773e990702 100644 --- a/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareValidator.tsx +++ b/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createMiddlewareValidator.tsx @@ -1,4 +1,2 @@ -import { createMiddleware } from '@tanstack/react-start'; -export const withUseServer = createMiddleware({ - id: 'test' -}); \ No newline at end of file +import { createMiddleware } from '@tanstack/react-start' +export const withUseServer = createMiddleware({ id: 'test' }) diff --git a/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createStart.tsx b/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createStart.tsx index 8c3a7fc205..b2bde33436 100644 --- a/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createStart.tsx +++ b/packages/start-plugin-core/tests/createMiddleware/snapshots/client/createStart.tsx @@ -1,13 +1,9 @@ -import { createStart } from '@tanstack/react-start'; -export const startInstance = createStart(() => {}); -export const serverFnMw = startInstance.createMiddleware({ - type: 'function' -}).client(({ - next -}) => { - console.log('client mw'); - return next(); -}); -export const requestMw = startInstance.createMiddleware({ - type: 'request' -}); \ No newline at end of file +import { createStart } from '@tanstack/react-start' +export const startInstance = createStart(() => {}) +export const serverFnMw = startInstance + .createMiddleware({ type: 'function' }) + .client(({ next }) => { + console.log('client mw') + return next() + }) +export const requestMw = startInstance.createMiddleware({ type: 'request' }) diff --git a/packages/start-plugin-core/tests/createMiddleware/snapshots/client/middleware-factory.ts b/packages/start-plugin-core/tests/createMiddleware/snapshots/client/middleware-factory.ts index 6845bd0ef5..0e51f2f369 100644 --- a/packages/start-plugin-core/tests/createMiddleware/snapshots/client/middleware-factory.ts +++ b/packages/start-plugin-core/tests/createMiddleware/snapshots/client/middleware-factory.ts @@ -1,20 +1,11 @@ -import { createMiddleware } from '@tanstack/react-start'; - +import { createMiddleware } from '@tanstack/react-start' // Middleware factory function - returns a middleware with .server() call export function createPublicRateLimitMiddleware(keySuffix) { - return createMiddleware({ - type: 'function' - }); + return createMiddleware({ type: 'function' }) } - // Arrow function factory -export const createAuthMiddleware = requiredRole => { - return createMiddleware({ - type: 'function' - }); -}; - +export const createAuthMiddleware = (requiredRole) => { + return createMiddleware({ type: 'function' }) +} // Top-level middleware for comparison -export const topLevelMiddleware = createMiddleware({ - id: 'topLevel' -}); \ No newline at end of file +export const topLevelMiddleware = createMiddleware({ id: 'topLevel' }) diff --git a/packages/start-plugin-core/tests/createServerFn/createServerFn.test.ts b/packages/start-plugin-core/tests/createServerFn/createServerFn.test.ts index f5236d8443..e80f292891 100644 --- a/packages/start-plugin-core/tests/createServerFn/createServerFn.test.ts +++ b/packages/start-plugin-core/tests/createServerFn/createServerFn.test.ts @@ -1,7 +1,9 @@ import { readFile, readdir } from 'node:fs/promises' import path from 'node:path' +import { stripVTControlCharacters } from 'node:util' import { describe, expect, test, vi } from 'vitest' import { StartCompiler } from '../../src/start-compiler/compiler' +import { formatSnapshot } from '../format-snapshot' // Default test options for StartCompiler function getDefaultTestOptions(env: 'client' | 'server') { @@ -26,7 +28,6 @@ async function compile(opts: { parserFilename?: string isProviderFile: boolean mode: 'dev' | 'build' - warn?: (message: string) => void }) { // Use an absolute path inside the test root to ensure consistent filename output let id = '/test/src/test.ts' @@ -49,7 +50,6 @@ async function compile(opts: { kind: 'Root', }, ], - warn: opts.warn, getKnownServerFns: () => ({}), resolveId: async (id) => { return id @@ -91,9 +91,9 @@ describe('createServerFn compiles correctly', async () => { : env.isProviderFile ? 'server-provider' : 'server-caller' - await expect(result!.code).toMatchFileSnapshot( - `./snapshots/${folder}/${filename}`, - ) + await expect( + await formatSnapshot(result!.code, filename), + ).toMatchFileSnapshot(`./snapshots/${folder}/${filename}`) }) }) @@ -111,17 +111,21 @@ describe('createServerFn compiles correctly', async () => { mode: 'build', }) - expect(compiledResultClient!.code).toMatchInlineSnapshot(` - "import { createClientRpc } from '@tanstack/react-start/client-rpc'; - import { createServerFn } from '@tanstack/react-start'; - const myServerFn = createServerFn().handler(createClientRpc(\"2c205add8e6755de551521133ddff3d48859b1631add5f1bbe5c48a5664f319b\"));" - `) + expect(await formatSnapshot(compiledResultClient!.code, 'test.ts')) + .toMatchInlineSnapshot(` + "import { createClientRpc } from '@tanstack/react-start/client-rpc' + import { createServerFn } from '@tanstack/react-start' + const myServerFn = createServerFn().handler( + createClientRpc( + '2c205add8e6755de551521133ddff3d48859b1631add5f1bbe5c48a5664f319b', + ), + ) + " + `) }) // Editors count \n, \r\n, a lone \r, U+2028 and U+2029 as line // terminators, so diagnostic locations must count every one. - // TODO remove upon stable with the inputValidator deprecation, after moving - // these line terminator cases to another located diagnostic. test.each([ ['\\n', '\n'], ['\\r\\n', '\r\n'], @@ -129,50 +133,25 @@ describe('createServerFn compiles correctly', async () => { ['U+2028', '\u2028'], ['U+2029', '\u2029'], ])( - 'reports the inputValidator deprecation location with %s line endings', + 'reports the location of a diagnostic with %s line endings', async (_name, eol) => { - const warn = vi.fn() - await compile({ + const error = await compile({ code: [ `import { createServerFn } from '@tanstack/react-start'`, - `export const fn = createServerFn().inputValidator((x: string) => x).handler(async () => 1)`, + `export const { fn } = createServerFn().handler(async () => 1)`, ].join(eol), env: 'client', isProviderFile: false, mode: 'build', - warn, - }) + }).catch((caught: unknown) => caught) - expect(warn).toHaveBeenCalledWith( - '/test/src/test.ts:2:19 createServerFn().inputValidator() is deprecated. Use createServerFn().validator() instead.', + expect(error).toBeInstanceOf(Error) + expect(stripVTControlCharacters((error as Error).message)).toMatch( + /> 2 \| export const \{ fn \} = createServerFn\(\)/, ) }, ) - // TODO remove upon stable - test('should warn for deprecated inputValidator method', async () => { - const warn = vi.fn() - const code = ` - import { createServerFn } from '@tanstack/react-start' - const myServerFn = createServerFn() - .inputValidator((input: string) => input) - .handler(({ input }) => input)` - - await compile({ - code, - env: 'client', - isProviderFile: false, - mode: 'build', - warn, - }) - - expect(warn).toHaveBeenCalledWith( - expect.stringContaining( - 'createServerFn().inputValidator() is deprecated. Use createServerFn().validator() instead.', - ), - ) - }) - test('should work with identifiers of functions', async () => { const code = ` import { createServerFn } from '@tanstack/react-start' @@ -206,34 +185,54 @@ describe('createServerFn compiles correctly', async () => { mode: 'build', }) - expect(compiledResultClient!.code).toMatchInlineSnapshot(` - "import { createClientRpc } from '@tanstack/react-start/client-rpc'; - import { createServerFn } from '@tanstack/react-start'; - const myServerFn = createServerFn().handler(createClientRpc("2c205add8e6755de551521133ddff3d48859b1631add5f1bbe5c48a5664f319b"));" - `) + expect(await formatSnapshot(compiledResultClient!.code, 'test.ts')) + .toMatchInlineSnapshot(` + "import { createClientRpc } from '@tanstack/react-start/client-rpc' + import { createServerFn } from '@tanstack/react-start' + const myServerFn = createServerFn().handler( + createClientRpc( + '2c205add8e6755de551521133ddff3d48859b1631add5f1bbe5c48a5664f319b', + ), + ) + " + `) // Server caller: no second argument (implementation from extracted chunk) - expect(compiledResultServerCaller!.code).toMatchInlineSnapshot(` - "import { createSsrRpc } from '@tanstack/react-start/ssr-rpc'; - import { createServerFn } from '@tanstack/react-start'; - const myServerFn = createServerFn().handler(createSsrRpc("2c205add8e6755de551521133ddff3d48859b1631add5f1bbe5c48a5664f319b"));" - `) + expect(await formatSnapshot(compiledResultServerCaller!.code, 'test.ts')) + .toMatchInlineSnapshot(` + "import { createSsrRpc } from '@tanstack/react-start/ssr-rpc' + import { createServerFn } from '@tanstack/react-start' + const myServerFn = createServerFn().handler( + createSsrRpc( + '2c205add8e6755de551521133ddff3d48859b1631add5f1bbe5c48a5664f319b', + ), + ) + " + `) // Server provider: has second argument (this is the implementation file) - expect(compiledResultServerProvider!.code).toMatchInlineSnapshot(` - "import { createServerRpc } from '@tanstack/react-start/server-rpc'; - import { createServerFn } from '@tanstack/react-start'; - const myFunc = () => { - return 'hello from the server'; - }; - const myServerFn_createServerFn_handler = createServerRpc({ - id: "2c205add8e6755de551521133ddff3d48859b1631add5f1bbe5c48a5664f319b", - name: "myServerFn", - filename: "src/test.ts" - }, opts => myServerFn.__executeServer(opts)); - const myServerFn = createServerFn().handler(myServerFn_createServerFn_handler, myFunc); - export { myServerFn_createServerFn_handler };" - `) + expect(await formatSnapshot(compiledResultServerProvider!.code, 'test.ts')) + .toMatchInlineSnapshot(` + "import { createServerRpc } from '@tanstack/react-start/server-rpc' + import { createServerFn } from '@tanstack/react-start' + const myFunc = () => { + return 'hello from the server' + } + const myServerFn_createServerFn_handler = createServerRpc( + { + id: '2c205add8e6755de551521133ddff3d48859b1631add5f1bbe5c48a5664f319b', + name: 'myServerFn', + filename: 'src/test.ts', + }, + (opts) => myServerFn.__executeServer(opts), + ) + const myServerFn = createServerFn().handler( + myServerFn_createServerFn_handler, + myFunc, + ) + export { myServerFn_createServerFn_handler } + " + `) }) test('should remove imports used only as caller handler identifiers', async () => { @@ -251,11 +250,17 @@ describe('createServerFn compiles correctly', async () => { mode: 'build', }) - expect(compiledResult!.code).toMatchInlineSnapshot(` - "import { createClientRpc } from '@tanstack/react-start/client-rpc'; - import { createServerFn } from '@tanstack/react-start'; - export const getUsersFn = createServerFn().handler(createClientRpc(\"a78c63d4bb3c0b10a8b70902c73611fbf0b9229e0807b065c03c939f9c0ce100\"));" - `) + expect(await formatSnapshot(compiledResult!.code, 'test.ts')) + .toMatchInlineSnapshot(` + "import { createClientRpc } from '@tanstack/react-start/client-rpc' + import { createServerFn } from '@tanstack/react-start' + export const getUsersFn = createServerFn().handler( + createClientRpc( + 'a78c63d4bb3c0b10a8b70902c73611fbf0b9229e0807b065c03c939f9c0ce100', + ), + ) + " + `) }) test('should not remove handler identifier bindings that are still referenced', async () => { @@ -274,13 +279,19 @@ describe('createServerFn compiles correctly', async () => { mode: 'build', }) - expect(compiledResult!.code).toMatchInlineSnapshot(` - "import { createClientRpc } from '@tanstack/react-start/client-rpc'; - import { createServerFn } from '@tanstack/react-start'; - import { getUsers } from './server'; - export const getUsersFn = createServerFn().handler(createClientRpc(\"a78c63d4bb3c0b10a8b70902c73611fbf0b9229e0807b065c03c939f9c0ce100\")); - console.log(getUsers);" - `) + expect(await formatSnapshot(compiledResult!.code, 'test.ts')) + .toMatchInlineSnapshot(` + "import { createClientRpc } from '@tanstack/react-start/client-rpc' + import { createServerFn } from '@tanstack/react-start' + import { getUsers } from './server' + export const getUsersFn = createServerFn().handler( + createClientRpc( + 'a78c63d4bb3c0b10a8b70902c73611fbf0b9229e0807b065c03c939f9c0ce100', + ), + ) + console.log(getUsers) + " + `) }) test('should compile server functions wrapped in TypeScript as expressions', async () => { @@ -341,12 +352,22 @@ describe('createServerFn compiles correctly', async () => { mode: 'build', }) - expect(compiledResult!.code).toMatchInlineSnapshot(` - "import { createClientRpc } from '@tanstack/react-start/client-rpc'; - import { createServerFn } from '@tanstack/react-start'; - export const exportedFn = createServerFn().handler(createClientRpc("c306c96e9256c7604f2a6022c4c94eb89f863274c022bc45b03970f067ea9864")); - const nonExportedFn = createServerFn().handler(createClientRpc("f4403dc0b18e216dfe0a9711cab028bc1b9768175daa9236d7115e29c99d76c2"));" - `) + expect(await formatSnapshot(compiledResult!.code, 'test.ts')) + .toMatchInlineSnapshot(` + "import { createClientRpc } from '@tanstack/react-start/client-rpc' + import { createServerFn } from '@tanstack/react-start' + export const exportedFn = createServerFn().handler( + createClientRpc( + 'c306c96e9256c7604f2a6022c4c94eb89f863274c022bc45b03970f067ea9864', + ), + ) + const nonExportedFn = createServerFn().handler( + createClientRpc( + 'f4403dc0b18e216dfe0a9711cab028bc1b9768175daa9236d7115e29c99d76c2', + ), + ) + " + `) // Server caller (route file) - no second argument const compiledResultServerCaller = await compile({ @@ -356,12 +377,22 @@ describe('createServerFn compiles correctly', async () => { mode: 'build', }) - expect(compiledResultServerCaller!.code).toMatchInlineSnapshot(` - "import { createSsrRpc } from '@tanstack/react-start/ssr-rpc'; - import { createServerFn } from '@tanstack/react-start'; - export const exportedFn = createServerFn().handler(createSsrRpc("c306c96e9256c7604f2a6022c4c94eb89f863274c022bc45b03970f067ea9864")); - const nonExportedFn = createServerFn().handler(createSsrRpc("f4403dc0b18e216dfe0a9711cab028bc1b9768175daa9236d7115e29c99d76c2"));" - `) + expect(await formatSnapshot(compiledResultServerCaller!.code, 'test.ts')) + .toMatchInlineSnapshot(` + "import { createSsrRpc } from '@tanstack/react-start/ssr-rpc' + import { createServerFn } from '@tanstack/react-start' + export const exportedFn = createServerFn().handler( + createSsrRpc( + 'c306c96e9256c7604f2a6022c4c94eb89f863274c022bc45b03970f067ea9864', + ), + ) + const nonExportedFn = createServerFn().handler( + createSsrRpc( + 'f4403dc0b18e216dfe0a9711cab028bc1b9768175daa9236d7115e29c99d76c2', + ), + ) + " + `) // Server provider (extracted file) - has second argument const compiledResultServerProvider = await compile({ @@ -371,29 +402,46 @@ describe('createServerFn compiles correctly', async () => { mode: 'build', }) - expect(compiledResultServerProvider!.code).toMatchInlineSnapshot(` - "import { createServerRpc } from '@tanstack/react-start/server-rpc'; - import { createServerFn } from '@tanstack/react-start'; - const exportedVar = 'exported'; - const exportedFn_createServerFn_handler = createServerRpc({ - id: "c306c96e9256c7604f2a6022c4c94eb89f863274c022bc45b03970f067ea9864", - name: "exportedFn", - filename: "src/test.ts" - }, opts => exportedFn.__executeServer(opts)); - const exportedFn = createServerFn().handler(exportedFn_createServerFn_handler, async () => { - return exportedVar; - }); - const nonExportedVar = 'non-exported'; - const nonExportedFn_createServerFn_handler = createServerRpc({ - id: "f4403dc0b18e216dfe0a9711cab028bc1b9768175daa9236d7115e29c99d76c2", - name: "nonExportedFn", - filename: "src/test.ts" - }, opts => nonExportedFn.__executeServer(opts)); - const nonExportedFn = createServerFn().handler(nonExportedFn_createServerFn_handler, async () => { - return nonExportedVar; - }); - export { exportedFn_createServerFn_handler, nonExportedFn_createServerFn_handler };" - `) + expect(await formatSnapshot(compiledResultServerProvider!.code, 'test.ts')) + .toMatchInlineSnapshot(` + "import { createServerRpc } from '@tanstack/react-start/server-rpc' + import { createServerFn } from '@tanstack/react-start' + const exportedVar = 'exported' + const exportedFn_createServerFn_handler = createServerRpc( + { + id: 'c306c96e9256c7604f2a6022c4c94eb89f863274c022bc45b03970f067ea9864', + name: 'exportedFn', + filename: 'src/test.ts', + }, + (opts) => exportedFn.__executeServer(opts), + ) + const exportedFn = createServerFn().handler( + exportedFn_createServerFn_handler, + async () => { + return exportedVar + }, + ) + const nonExportedVar = 'non-exported' + const nonExportedFn_createServerFn_handler = createServerRpc( + { + id: 'f4403dc0b18e216dfe0a9711cab028bc1b9768175daa9236d7115e29c99d76c2', + name: 'nonExportedFn', + filename: 'src/test.ts', + }, + (opts) => nonExportedFn.__executeServer(opts), + ) + const nonExportedFn = createServerFn().handler( + nonExportedFn_createServerFn_handler, + async () => { + return nonExportedVar + }, + ) + export { + exportedFn_createServerFn_handler, + nonExportedFn_createServerFn_handler, + } + " + `) }) test('should use fast path for direct imports from known library (no extra resolveId calls)', async () => { @@ -742,6 +790,60 @@ describe('createServerFn compiles correctly', async () => { expect(secondResult!.code).toContain('createSsrRpc("constant_id_1"') }) + // The client puts the id in the URL unencoded and the server reads that + // path segment back: a `/`, `#` or `?` cut it short (the call ran another + // server function of the file or none), a client percent-encodes `"`, + // `\`, whitespace, control and non-ASCII characters, URL parsing removes + // dot segments, and the server decodes a percent-encoding to another id or + // rejects it. + test.each([ + 'users/get', + 'users#get', + 'users?get', + 'users"get', + 'users\\get', + 'users get', + 'users\u0007get', + 'utilisateurs-é', + '..', + 'users%41get', + 'x%c3%a9', + '%2E', + 'users%zz', + ])( + 'a custom id the URL never carries whole fails the build: %j', + async (id) => { + const compiler = new StartCompiler({ + env: 'client', + ...getDefaultTestOptions('client'), + mode: 'build', + loadModule: async () => {}, + lookupKinds: new Set(['ServerFn']), + lookupConfigurations: [ + { + libName: '@tanstack/react-start', + rootExport: 'createServerFn', + kind: 'Root', + }, + ], + resolveId: async (id) => id, + generateFunctionId: () => id, + getKnownServerFns: () => ({}), + }) + await expect( + compiler.compile({ + code: ` + import { createServerFn } from '@tanstack/react-start' + export const getUser = createServerFn().handler(async () => 'user') + `, + id: '/test/src/users.ts', + }), + ).rejects.toThrow( + `[tanstack-start] serverFns.generateFunctionId returned ${JSON.stringify(id)} for the server function getUser (functionName "getUser_createServerFn_handler") of src/users.ts.`, + ) + }, + ) + test('should resolve createServerFn from the same binding as a known root export', async () => { const virtualModules: Record = { '@tanstack/start-client-core': ` diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnDestructured.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnDestructured.tsx index 2c0e54f9c9..88e8607da2 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnDestructured.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnDestructured.tsx @@ -1,23 +1,39 @@ -import { createClientRpc } from '@tanstack/react-start/client-rpc'; -import { createServerFn } from '@tanstack/react-start'; -export const withUseServer = createServerFn({ - method: 'GET' -}).handler(createClientRpc("b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320")); -export const withArrowFunction = createServerFn({ - method: 'GET' -}).handler(createClientRpc("a311dfd9a6554bc0bb9371ef4fbc72c852d0b5532829a2613a29157b8595a793")); +import { createClientRpc } from '@tanstack/react-start/client-rpc' +import { createServerFn } from '@tanstack/react-start' +export const withUseServer = createServerFn({ method: 'GET' }).handler( + createClientRpc( + 'b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320', + ), +) +export const withArrowFunction = createServerFn({ method: 'GET' }).handler( + createClientRpc( + 'a311dfd9a6554bc0bb9371ef4fbc72c852d0b5532829a2613a29157b8595a793', + ), +) export const withArrowFunctionAndFunction = createServerFn({ - method: 'GET' -}).handler(createClientRpc("dbe1f77c6ea7590bce3212a75b06d3cee83b425bcf493014cb47462ef725e36e")); -export const withoutUseServer = createServerFn({ - method: 'GET' -}).handler(createClientRpc("c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2")); -export const withVariable = createServerFn({ - method: 'GET' -}).handler(createClientRpc("7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70")); -export const withZodValidator = createServerFn({ - method: 'GET' -}).handler(createClientRpc("43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3")); -export const withValidatorFn = createServerFn({ - method: 'GET' -}).handler(createClientRpc("5cf922ac733d835fee496964cbf0b4b4067cb43d51f2efa484d072e6bb7dae44")); \ No newline at end of file + method: 'GET', +}).handler( + createClientRpc( + 'dbe1f77c6ea7590bce3212a75b06d3cee83b425bcf493014cb47462ef725e36e', + ), +) +export const withoutUseServer = createServerFn({ method: 'GET' }).handler( + createClientRpc( + 'c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2', + ), +) +export const withVariable = createServerFn({ method: 'GET' }).handler( + createClientRpc( + '7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70', + ), +) +export const withZodValidator = createServerFn({ method: 'GET' }).handler( + createClientRpc( + '43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3', + ), +) +export const withValidatorFn = createServerFn({ method: 'GET' }).handler( + createClientRpc( + '5cf922ac733d835fee496964cbf0b4b4067cb43d51f2efa484d072e6bb7dae44', + ), +) diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnDestructuredRename.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnDestructuredRename.tsx index e55318337d..34e0c452b6 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnDestructuredRename.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnDestructuredRename.tsx @@ -1,14 +1,22 @@ -import { createClientRpc } from '@tanstack/react-start/client-rpc'; -import { createServerFn as serverFn } from '@tanstack/react-start'; -export const withUseServer = serverFn({ - method: 'GET' -}).handler(createClientRpc("b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320")); -export const withoutUseServer = serverFn({ - method: 'GET' -}).handler(createClientRpc("c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2")); -export const withVariable = serverFn({ - method: 'GET' -}).handler(createClientRpc("7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70")); -export const withZodValidator = serverFn({ - method: 'GET' -}).handler(createClientRpc("43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3")); \ No newline at end of file +import { createClientRpc } from '@tanstack/react-start/client-rpc' +import { createServerFn as serverFn } from '@tanstack/react-start' +export const withUseServer = serverFn({ method: 'GET' }).handler( + createClientRpc( + 'b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320', + ), +) +export const withoutUseServer = serverFn({ method: 'GET' }).handler( + createClientRpc( + 'c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2', + ), +) +export const withVariable = serverFn({ method: 'GET' }).handler( + createClientRpc( + '7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70', + ), +) +export const withZodValidator = serverFn({ method: 'GET' }).handler( + createClientRpc( + '43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3', + ), +) diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnStarImport.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnStarImport.tsx index 5b33829a38..2cea070645 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnStarImport.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnStarImport.tsx @@ -1,14 +1,30 @@ -import { createClientRpc } from '@tanstack/react-start/client-rpc'; -import * as TanStackStart from '@tanstack/react-start'; +import { createClientRpc } from '@tanstack/react-start/client-rpc' +import * as TanStackStart from '@tanstack/react-start' export const withUseServer = TanStackStart.createServerFn({ - method: 'GET' -}).handler(createClientRpc("b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320")); + method: 'GET', +}).handler( + createClientRpc( + 'b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320', + ), +) export const withoutUseServer = TanStackStart.createServerFn({ - method: 'GET' -}).handler(createClientRpc("c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2")); + method: 'GET', +}).handler( + createClientRpc( + 'c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2', + ), +) export const withVariable = TanStackStart.createServerFn({ - method: 'GET' -}).handler(createClientRpc("7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70")); + method: 'GET', +}).handler( + createClientRpc( + '7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70', + ), +) export const withZodValidator = TanStackStart.createServerFn({ - method: 'GET' -}).handler(createClientRpc("43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3")); \ No newline at end of file + method: 'GET', +}).handler( + createClientRpc( + '43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3', + ), +) diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnValidator.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnValidator.tsx index 056535d0bc..97253672a6 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnValidator.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/client/createServerFnValidator.tsx @@ -1,5 +1,7 @@ -import { createClientRpc } from '@tanstack/react-start/client-rpc'; -import { createServerFn } from '@tanstack/react-start'; -export const withUseServer = createServerFn({ - method: 'GET' -}).handler(createClientRpc("b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320")); \ No newline at end of file +import { createClientRpc } from '@tanstack/react-start/client-rpc' +import { createServerFn } from '@tanstack/react-start' +export const withUseServer = createServerFn({ method: 'GET' }).handler( + createClientRpc( + 'b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320', + ), +) diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/client/factory.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/client/factory.tsx index 436b8ab4cb..889c1fbf4e 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/client/factory.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/client/factory.tsx @@ -1,38 +1,34 @@ -import { createClientRpc } from '@tanstack/react-start/client-rpc'; -import { createServerFn, createMiddleware } from '@tanstack/react-start'; -const authMiddleware = createMiddleware({ - type: 'function' -}).server(({ - next -}) => { - return next({ - context: { - auth: 'auth' - } - }); -}); -const adminMiddleware = createMiddleware({ - type: 'function' -}).server(({ - next -}) => { - return next({ - context: { - admin: 'admin' - } - }); -}); -export const createAuthServerFn = createServerFn().middleware([authMiddleware]); -const createAdminServerFn = createAuthServerFn().middleware([adminMiddleware]); -export const myAuthedFn = createAuthServerFn().handler(createClientRpc("3bb88b23926fa224cea3dcfb877026757733d95b42e3b66cf7f06bb89dab06a3")); -export const deleteUserFn = createAdminServerFn().handler(createClientRpc("44d9483a9412daaacaa5a8aee6b02294333a0e61b5d3b17ba6bcb34fd2bdce31")); +import { createClientRpc } from '@tanstack/react-start/client-rpc' +import { createServerFn, createMiddleware } from '@tanstack/react-start' +const authMiddleware = createMiddleware({ type: 'function' }).server( + ({ next }) => { + return next({ context: { auth: 'auth' } }) + }, +) +const adminMiddleware = createMiddleware({ type: 'function' }).server( + ({ next }) => { + return next({ context: { admin: 'admin' } }) + }, +) +export const createAuthServerFn = createServerFn().middleware([authMiddleware]) +const createAdminServerFn = createAuthServerFn().middleware([adminMiddleware]) +export const myAuthedFn = createAuthServerFn().handler( + createClientRpc( + '3bb88b23926fa224cea3dcfb877026757733d95b42e3b66cf7f06bb89dab06a3', + ), +) +export const deleteUserFn = createAdminServerFn().handler( + createClientRpc( + '44d9483a9412daaacaa5a8aee6b02294333a0e61b5d3b17ba6bcb34fd2bdce31', + ), +) function createFakeFn() { return { - handler: cb => { - return cb(); - } - }; + handler: (cb) => { + return cb() + }, + } } const x = createFakeFn().handler(() => { - return 'fakeFn'; -}); \ No newline at end of file + return 'fakeFn' +}) diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/client/isomorphic-fns.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/client/isomorphic-fns.tsx index 020d1346e4..8e09a57d37 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/client/isomorphic-fns.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/client/isomorphic-fns.tsx @@ -1,48 +1,49 @@ -import { createClientRpc } from '@tanstack/react-start/client-rpc'; -import { createFileRoute } from '@tanstack/react-router'; -import { createIsomorphicFn, createServerFn } from '@tanstack/react-start'; -import { useState } from 'react'; -const getEnv = createIsomorphicFn().server(() => 'server').client(() => 'client'); -const getServerEnv = createServerFn().handler(createClientRpc("6049dd46bc00e0980e387f3e74924b40e92f37634a3fe74a1a1facda9e9207c2")); -const getEcho = createIsomorphicFn().server((input: string) => 'server received ' + input).client(input => 'client received ' + input); -const getServerEcho = createServerFn().handler(createClientRpc("ebb82e0293952b7b1dde3f664dec4c139471c046d06d4dc4ca172f4f45e386d1")); +import { createClientRpc } from '@tanstack/react-start/client-rpc' +import { createFileRoute } from '@tanstack/react-router' +import { createIsomorphicFn, createServerFn } from '@tanstack/react-start' +import { useState } from 'react' +const getEnv = createIsomorphicFn() + .server(() => 'server') + .client(() => 'client') +const getServerEnv = createServerFn().handler( + createClientRpc( + '6049dd46bc00e0980e387f3e74924b40e92f37634a3fe74a1a1facda9e9207c2', + ), +) +const getEcho = createIsomorphicFn() + .server((input: string) => 'server received ' + input) + .client((input) => 'client received ' + input) +const getServerEcho = createServerFn().handler( + createClientRpc( + 'ebb82e0293952b7b1dde3f664dec4c139471c046d06d4dc4ca172f4f45e386d1', + ), +) export const Route = createFileRoute('/isomorphic-fns')({ component: RouteComponent, loader() { - return { - envOnLoad: getEnv() - }; - } -}); + return { envOnLoad: getEnv() } + }, +}) function RouteComponent() { - const { - envOnLoad - } = Route.useLoaderData(); - const [results, setResults] = useState>>(); + const { envOnLoad } = Route.useLoaderData() + const [results, setResults] = useState>>() async function handleClick() { - const envOnClick = getEnv(); - const echo = getEcho('hello'); - const [serverEnv, serverEcho] = await Promise.all([getServerEnv(), getServerEcho({ - data: 'hello' - })]); - setResults({ - envOnClick, - echo, - serverEnv, - serverEcho - }); + const envOnClick = getEnv() + const echo = getEcho('hello') + const [serverEnv, serverEcho] = await Promise.all([ + getServerEnv(), + getServerEcho({ data: 'hello' }), + ]) + setResults({ envOnClick, echo, serverEnv, serverEcho }) } - const { - envOnClick, - echo, - serverEnv, - serverEcho - } = results || {}; - return
+ const { envOnClick, echo, serverEnv, serverEcho } = results || {} + return ( +
- {!!results &&
+ {!!results && ( +

getEnv

@@ -62,6 +63,8 @@ function RouteComponent() {
When we called the function on the client it returned:
{JSON.stringify(echo)}
- } - ; -} \ No newline at end of file + + )} + + ) +} diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/createServerFnDestructured.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/createServerFnDestructured.tsx index 37c93d5c00..efa8f395d5 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/createServerFnDestructured.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/createServerFnDestructured.tsx @@ -1,24 +1,42 @@ -import { createSsrRpc } from '@tanstack/react-start/ssr-rpc'; -import { createServerFn } from '@tanstack/react-start'; -import { z } from 'zod'; -export const withUseServer = createServerFn({ - method: 'GET' -}).handler(createSsrRpc("b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320")); -export const withArrowFunction = createServerFn({ - method: 'GET' -}).handler(createSsrRpc("a311dfd9a6554bc0bb9371ef4fbc72c852d0b5532829a2613a29157b8595a793")); +import { createSsrRpc } from '@tanstack/react-start/ssr-rpc' +import { createServerFn } from '@tanstack/react-start' +import { z } from 'zod' +export const withUseServer = createServerFn({ method: 'GET' }).handler( + createSsrRpc( + 'b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320', + ), +) +export const withArrowFunction = createServerFn({ method: 'GET' }).handler( + createSsrRpc( + 'a311dfd9a6554bc0bb9371ef4fbc72c852d0b5532829a2613a29157b8595a793', + ), +) export const withArrowFunctionAndFunction = createServerFn({ - method: 'GET' -}).handler(createSsrRpc("dbe1f77c6ea7590bce3212a75b06d3cee83b425bcf493014cb47462ef725e36e")); -export const withoutUseServer = createServerFn({ - method: 'GET' -}).handler(createSsrRpc("c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2")); -export const withVariable = createServerFn({ - method: 'GET' -}).handler(createSsrRpc("7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70")); -export const withZodValidator = createServerFn({ - method: 'GET' -}).handler(createSsrRpc("43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3")); -export const withValidatorFn = createServerFn({ - method: 'GET' -}).validator(z.number()).handler(createSsrRpc("5cf922ac733d835fee496964cbf0b4b4067cb43d51f2efa484d072e6bb7dae44")); \ No newline at end of file + method: 'GET', +}).handler( + createSsrRpc( + 'dbe1f77c6ea7590bce3212a75b06d3cee83b425bcf493014cb47462ef725e36e', + ), +) +export const withoutUseServer = createServerFn({ method: 'GET' }).handler( + createSsrRpc( + 'c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2', + ), +) +export const withVariable = createServerFn({ method: 'GET' }).handler( + createSsrRpc( + '7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70', + ), +) +export const withZodValidator = createServerFn({ method: 'GET' }).handler( + createSsrRpc( + '43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3', + ), +) +export const withValidatorFn = createServerFn({ method: 'GET' }) + .validator(z.number()) + .handler( + createSsrRpc( + '5cf922ac733d835fee496964cbf0b4b4067cb43d51f2efa484d072e6bb7dae44', + ), + ) diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/createServerFnDestructuredRename.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/createServerFnDestructuredRename.tsx index 94a351ffa9..7088a4bc69 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/createServerFnDestructuredRename.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/createServerFnDestructuredRename.tsx @@ -1,14 +1,22 @@ -import { createSsrRpc } from '@tanstack/react-start/ssr-rpc'; -import { createServerFn as serverFn } from '@tanstack/react-start'; -export const withUseServer = serverFn({ - method: 'GET' -}).handler(createSsrRpc("b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320")); -export const withoutUseServer = serverFn({ - method: 'GET' -}).handler(createSsrRpc("c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2")); -export const withVariable = serverFn({ - method: 'GET' -}).handler(createSsrRpc("7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70")); -export const withZodValidator = serverFn({ - method: 'GET' -}).handler(createSsrRpc("43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3")); \ No newline at end of file +import { createSsrRpc } from '@tanstack/react-start/ssr-rpc' +import { createServerFn as serverFn } from '@tanstack/react-start' +export const withUseServer = serverFn({ method: 'GET' }).handler( + createSsrRpc( + 'b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320', + ), +) +export const withoutUseServer = serverFn({ method: 'GET' }).handler( + createSsrRpc( + 'c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2', + ), +) +export const withVariable = serverFn({ method: 'GET' }).handler( + createSsrRpc( + '7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70', + ), +) +export const withZodValidator = serverFn({ method: 'GET' }).handler( + createSsrRpc( + '43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3', + ), +) diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/createServerFnStarImport.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/createServerFnStarImport.tsx index 74d22a2fc4..899aaf3d0d 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/createServerFnStarImport.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/createServerFnStarImport.tsx @@ -1,14 +1,30 @@ -import { createSsrRpc } from '@tanstack/react-start/ssr-rpc'; -import * as TanStackStart from '@tanstack/react-start'; +import { createSsrRpc } from '@tanstack/react-start/ssr-rpc' +import * as TanStackStart from '@tanstack/react-start' export const withUseServer = TanStackStart.createServerFn({ - method: 'GET' -}).handler(createSsrRpc("b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320")); + method: 'GET', +}).handler( + createSsrRpc( + 'b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320', + ), +) export const withoutUseServer = TanStackStart.createServerFn({ - method: 'GET' -}).handler(createSsrRpc("c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2")); + method: 'GET', +}).handler( + createSsrRpc( + 'c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2', + ), +) export const withVariable = TanStackStart.createServerFn({ - method: 'GET' -}).handler(createSsrRpc("7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70")); + method: 'GET', +}).handler( + createSsrRpc( + '7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70', + ), +) export const withZodValidator = TanStackStart.createServerFn({ - method: 'GET' -}).handler(createSsrRpc("43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3")); \ No newline at end of file + method: 'GET', +}).handler( + createSsrRpc( + '43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3', + ), +) diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/createServerFnValidator.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/createServerFnValidator.tsx index 59fb4d2fd9..e1d136311b 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/createServerFnValidator.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/createServerFnValidator.tsx @@ -1,6 +1,10 @@ -import { createSsrRpc } from '@tanstack/react-start/ssr-rpc'; -import { createServerFn } from '@tanstack/react-start'; -import { z } from 'zod'; -export const withUseServer = createServerFn({ - method: 'GET' -}).validator(z.number()).handler(createSsrRpc("b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320")); \ No newline at end of file +import { createSsrRpc } from '@tanstack/react-start/ssr-rpc' +import { createServerFn } from '@tanstack/react-start' +import { z } from 'zod' +export const withUseServer = createServerFn({ method: 'GET' }) + .validator(z.number()) + .handler( + createSsrRpc( + 'b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320', + ), + ) diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/factory.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/factory.tsx index e82ca932e8..ab19c3e1f8 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/factory.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/factory.tsx @@ -1,38 +1,34 @@ -import { createSsrRpc } from '@tanstack/react-start/ssr-rpc'; -import { createServerFn, createMiddleware } from '@tanstack/react-start'; -const authMiddleware = createMiddleware({ - type: 'function' -}).server(({ - next -}) => { - return next({ - context: { - auth: 'auth' - } - }); -}); -const adminMiddleware = createMiddleware({ - type: 'function' -}).server(({ - next -}) => { - return next({ - context: { - admin: 'admin' - } - }); -}); -export const createAuthServerFn = createServerFn().middleware([authMiddleware]); -const createAdminServerFn = createAuthServerFn().middleware([adminMiddleware]); -export const myAuthedFn = createAuthServerFn().handler(createSsrRpc("3bb88b23926fa224cea3dcfb877026757733d95b42e3b66cf7f06bb89dab06a3")); -export const deleteUserFn = createAdminServerFn().handler(createSsrRpc("44d9483a9412daaacaa5a8aee6b02294333a0e61b5d3b17ba6bcb34fd2bdce31")); +import { createSsrRpc } from '@tanstack/react-start/ssr-rpc' +import { createServerFn, createMiddleware } from '@tanstack/react-start' +const authMiddleware = createMiddleware({ type: 'function' }).server( + ({ next }) => { + return next({ context: { auth: 'auth' } }) + }, +) +const adminMiddleware = createMiddleware({ type: 'function' }).server( + ({ next }) => { + return next({ context: { admin: 'admin' } }) + }, +) +export const createAuthServerFn = createServerFn().middleware([authMiddleware]) +const createAdminServerFn = createAuthServerFn().middleware([adminMiddleware]) +export const myAuthedFn = createAuthServerFn().handler( + createSsrRpc( + '3bb88b23926fa224cea3dcfb877026757733d95b42e3b66cf7f06bb89dab06a3', + ), +) +export const deleteUserFn = createAdminServerFn().handler( + createSsrRpc( + '44d9483a9412daaacaa5a8aee6b02294333a0e61b5d3b17ba6bcb34fd2bdce31', + ), +) function createFakeFn() { return { - handler: cb => { - return cb(); - } - }; + handler: (cb) => { + return cb() + }, + } } const x = createFakeFn().handler(() => { - return 'fakeFn'; -}); \ No newline at end of file + return 'fakeFn' +}) diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/isomorphic-fns.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/isomorphic-fns.tsx index d56d81fdda..cfefad2bfb 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/isomorphic-fns.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/server-caller/isomorphic-fns.tsx @@ -1,48 +1,51 @@ -import { createSsrRpc } from '@tanstack/react-start/ssr-rpc'; -import { createFileRoute } from '@tanstack/react-router'; -import { createIsomorphicFn, createServerFn } from '@tanstack/react-start'; -import { useState } from 'react'; -const getEnv = createIsomorphicFn().server(() => 'server').client(() => 'client'); -const getServerEnv = createServerFn().handler(createSsrRpc("6049dd46bc00e0980e387f3e74924b40e92f37634a3fe74a1a1facda9e9207c2")); -const getEcho = createIsomorphicFn().server((input: string) => 'server received ' + input).client(input => 'client received ' + input); -const getServerEcho = createServerFn().validator((input: string) => input).handler(createSsrRpc("ebb82e0293952b7b1dde3f664dec4c139471c046d06d4dc4ca172f4f45e386d1")); +import { createSsrRpc } from '@tanstack/react-start/ssr-rpc' +import { createFileRoute } from '@tanstack/react-router' +import { createIsomorphicFn, createServerFn } from '@tanstack/react-start' +import { useState } from 'react' +const getEnv = createIsomorphicFn() + .server(() => 'server') + .client(() => 'client') +const getServerEnv = createServerFn().handler( + createSsrRpc( + '6049dd46bc00e0980e387f3e74924b40e92f37634a3fe74a1a1facda9e9207c2', + ), +) +const getEcho = createIsomorphicFn() + .server((input: string) => 'server received ' + input) + .client((input) => 'client received ' + input) +const getServerEcho = createServerFn() + .validator((input: string) => input) + .handler( + createSsrRpc( + 'ebb82e0293952b7b1dde3f664dec4c139471c046d06d4dc4ca172f4f45e386d1', + ), + ) export const Route = createFileRoute('/isomorphic-fns')({ component: RouteComponent, loader() { - return { - envOnLoad: getEnv() - }; - } -}); + return { envOnLoad: getEnv() } + }, +}) function RouteComponent() { - const { - envOnLoad - } = Route.useLoaderData(); - const [results, setResults] = useState>>(); + const { envOnLoad } = Route.useLoaderData() + const [results, setResults] = useState>>() async function handleClick() { - const envOnClick = getEnv(); - const echo = getEcho('hello'); - const [serverEnv, serverEcho] = await Promise.all([getServerEnv(), getServerEcho({ - data: 'hello' - })]); - setResults({ - envOnClick, - echo, - serverEnv, - serverEcho - }); + const envOnClick = getEnv() + const echo = getEcho('hello') + const [serverEnv, serverEcho] = await Promise.all([ + getServerEnv(), + getServerEcho({ data: 'hello' }), + ]) + setResults({ envOnClick, echo, serverEnv, serverEcho }) } - const { - envOnClick, - echo, - serverEnv, - serverEcho - } = results || {}; - return
+ const { envOnClick, echo, serverEnv, serverEcho } = results || {} + return ( +
- {!!results &&
+ {!!results && ( +

getEnv

@@ -62,6 +65,8 @@ function RouteComponent() { When we called the function on the client it returned:
{JSON.stringify(echo)}
-
} -
; -} \ No newline at end of file +
+ )} +
+ ) +} diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/createServerFnDestructured.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/createServerFnDestructured.tsx index 7459b65cc0..3bc4879c14 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/createServerFnDestructured.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/createServerFnDestructured.tsx @@ -1,86 +1,126 @@ -import { createServerRpc } from '@tanstack/react-start/server-rpc'; -import { createServerFn } from '@tanstack/react-start'; -import { z } from 'zod'; -const withUseServer_createServerFn_handler = createServerRpc({ - id: "b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320", - name: "withUseServer", - filename: "src/test.ts" -}, opts => withUseServer.__executeServer(opts)); -const withUseServer = createServerFn({ - method: 'GET' -}).handler(withUseServer_createServerFn_handler, async function () { - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); -}); -const withArrowFunction_createServerFn_handler = createServerRpc({ - id: "a311dfd9a6554bc0bb9371ef4fbc72c852d0b5532829a2613a29157b8595a793", - name: "withArrowFunction", - filename: "src/test.ts" -}, opts => withArrowFunction.__executeServer(opts)); -const withArrowFunction = createServerFn({ - method: 'GET' -}).handler(withArrowFunction_createServerFn_handler, async () => null); -const withArrowFunctionAndFunction_createServerFn_handler = createServerRpc({ - id: "dbe1f77c6ea7590bce3212a75b06d3cee83b425bcf493014cb47462ef725e36e", - name: "withArrowFunctionAndFunction", - filename: "src/test.ts" -}, opts => withArrowFunctionAndFunction.__executeServer(opts)); -const withArrowFunctionAndFunction = createServerFn({ - method: 'GET' -}).handler(withArrowFunctionAndFunction_createServerFn_handler, async () => test()); -const withoutUseServer_createServerFn_handler = createServerRpc({ - id: "c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2", - name: "withoutUseServer", - filename: "src/test.ts" -}, opts => withoutUseServer.__executeServer(opts)); -const withoutUseServer = createServerFn({ - method: 'GET' -}).handler(withoutUseServer_createServerFn_handler, async () => { - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); -}); -const withVariable_createServerFn_handler = createServerRpc({ - id: "7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70", - name: "withVariable", - filename: "src/test.ts" -}, opts => withVariable.__executeServer(opts)); -const withVariable = createServerFn({ - method: 'GET' -}).handler(withVariable_createServerFn_handler, abstractedFunction); +import { createServerRpc } from '@tanstack/react-start/server-rpc' +import { createServerFn } from '@tanstack/react-start' +import { z } from 'zod' +const withUseServer_createServerFn_handler = createServerRpc( + { + id: 'b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320', + name: 'withUseServer', + filename: 'src/test.ts', + }, + (opts) => withUseServer.__executeServer(opts), +) +const withUseServer = createServerFn({ method: 'GET' }).handler( + withUseServer_createServerFn_handler, + async function () { + console.info('Fetching posts...') + await new Promise((r) => setTimeout(r, 500)) + return axios + .get>('https://jsonplaceholder.typicode.com/posts') + .then((r) => r.data.slice(0, 10)) + }, +) +const withArrowFunction_createServerFn_handler = createServerRpc( + { + id: 'a311dfd9a6554bc0bb9371ef4fbc72c852d0b5532829a2613a29157b8595a793', + name: 'withArrowFunction', + filename: 'src/test.ts', + }, + (opts) => withArrowFunction.__executeServer(opts), +) +const withArrowFunction = createServerFn({ method: 'GET' }).handler( + withArrowFunction_createServerFn_handler, + async () => null, +) +const withArrowFunctionAndFunction_createServerFn_handler = createServerRpc( + { + id: 'dbe1f77c6ea7590bce3212a75b06d3cee83b425bcf493014cb47462ef725e36e', + name: 'withArrowFunctionAndFunction', + filename: 'src/test.ts', + }, + (opts) => withArrowFunctionAndFunction.__executeServer(opts), +) +const withArrowFunctionAndFunction = createServerFn({ method: 'GET' }).handler( + withArrowFunctionAndFunction_createServerFn_handler, + async () => test(), +) +const withoutUseServer_createServerFn_handler = createServerRpc( + { + id: 'c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2', + name: 'withoutUseServer', + filename: 'src/test.ts', + }, + (opts) => withoutUseServer.__executeServer(opts), +) +const withoutUseServer = createServerFn({ method: 'GET' }).handler( + withoutUseServer_createServerFn_handler, + async () => { + console.info('Fetching posts...') + await new Promise((r) => setTimeout(r, 500)) + return axios + .get>('https://jsonplaceholder.typicode.com/posts') + .then((r) => r.data.slice(0, 10)) + }, +) +const withVariable_createServerFn_handler = createServerRpc( + { + id: '7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70', + name: 'withVariable', + filename: 'src/test.ts', + }, + (opts) => withVariable.__executeServer(opts), +) +const withVariable = createServerFn({ method: 'GET' }).handler( + withVariable_createServerFn_handler, + abstractedFunction, +) async function abstractedFunction() { - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); + console.info('Fetching posts...') + await new Promise((r) => setTimeout(r, 500)) + return axios + .get>('https://jsonplaceholder.typicode.com/posts') + .then((r) => r.data.slice(0, 10)) } -function zodValidator(schema: TSchema, fn: (input: z.output) => TResult) { +function zodValidator( + schema: TSchema, + fn: (input: z.output) => TResult, +) { return async (input: unknown) => { - return fn(schema.parse(input)); - }; + return fn(schema.parse(input)) + } +} +const withZodValidator_createServerFn_handler = createServerRpc( + { + id: '43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3', + name: 'withZodValidator', + filename: 'src/test.ts', + }, + (opts) => withZodValidator.__executeServer(opts), +) +const withZodValidator = createServerFn({ method: 'GET' }).handler( + withZodValidator_createServerFn_handler, + zodValidator(z.number(), (input) => { + return { 'you gave': input } + }), +) +const withValidatorFn_createServerFn_handler = createServerRpc( + { + id: '5cf922ac733d835fee496964cbf0b4b4067cb43d51f2efa484d072e6bb7dae44', + name: 'withValidatorFn', + filename: 'src/test.ts', + }, + (opts) => withValidatorFn.__executeServer(opts), +) +const withValidatorFn = createServerFn({ method: 'GET' }) + .validator(z.number()) + .handler(withValidatorFn_createServerFn_handler, async ({ input }) => { + return null + }) +export { + withUseServer_createServerFn_handler, + withArrowFunction_createServerFn_handler, + withArrowFunctionAndFunction_createServerFn_handler, + withoutUseServer_createServerFn_handler, + withVariable_createServerFn_handler, + withZodValidator_createServerFn_handler, + withValidatorFn_createServerFn_handler, } -const withZodValidator_createServerFn_handler = createServerRpc({ - id: "43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3", - name: "withZodValidator", - filename: "src/test.ts" -}, opts => withZodValidator.__executeServer(opts)); -const withZodValidator = createServerFn({ - method: 'GET' -}).handler(withZodValidator_createServerFn_handler, zodValidator(z.number(), input => { - return { - 'you gave': input - }; -})); -const withValidatorFn_createServerFn_handler = createServerRpc({ - id: "5cf922ac733d835fee496964cbf0b4b4067cb43d51f2efa484d072e6bb7dae44", - name: "withValidatorFn", - filename: "src/test.ts" -}, opts => withValidatorFn.__executeServer(opts)); -const withValidatorFn = createServerFn({ - method: 'GET' -}).validator(z.number()).handler(withValidatorFn_createServerFn_handler, async ({ - input -}) => { - return null; -}); -export { withUseServer_createServerFn_handler, withArrowFunction_createServerFn_handler, withArrowFunctionAndFunction_createServerFn_handler, withoutUseServer_createServerFn_handler, withVariable_createServerFn_handler, withZodValidator_createServerFn_handler, withValidatorFn_createServerFn_handler }; \ No newline at end of file diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/createServerFnDestructuredRename.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/createServerFnDestructuredRename.tsx index fd5a36351b..775c32b645 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/createServerFnDestructuredRename.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/createServerFnDestructuredRename.tsx @@ -1,58 +1,86 @@ -import { createServerRpc } from '@tanstack/react-start/server-rpc'; -import { createServerFn as serverFn } from '@tanstack/react-start'; -import { z } from 'zod'; -const withUseServer_createServerFn_handler = createServerRpc({ - id: "b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320", - name: "withUseServer", - filename: "src/test.ts" -}, opts => withUseServer.__executeServer(opts)); -const withUseServer = serverFn({ - method: 'GET' -}).handler(withUseServer_createServerFn_handler, async function () { - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); -}); -const withoutUseServer_createServerFn_handler = createServerRpc({ - id: "c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2", - name: "withoutUseServer", - filename: "src/test.ts" -}, opts => withoutUseServer.__executeServer(opts)); -const withoutUseServer = serverFn({ - method: 'GET' -}).handler(withoutUseServer_createServerFn_handler, async () => { - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); -}); -const withVariable_createServerFn_handler = createServerRpc({ - id: "7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70", - name: "withVariable", - filename: "src/test.ts" -}, opts => withVariable.__executeServer(opts)); -const withVariable = serverFn({ - method: 'GET' -}).handler(withVariable_createServerFn_handler, abstractedFunction); +import { createServerRpc } from '@tanstack/react-start/server-rpc' +import { createServerFn as serverFn } from '@tanstack/react-start' +import { z } from 'zod' +const withUseServer_createServerFn_handler = createServerRpc( + { + id: 'b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320', + name: 'withUseServer', + filename: 'src/test.ts', + }, + (opts) => withUseServer.__executeServer(opts), +) +const withUseServer = serverFn({ method: 'GET' }).handler( + withUseServer_createServerFn_handler, + async function () { + console.info('Fetching posts...') + await new Promise((r) => setTimeout(r, 500)) + return axios + .get>('https://jsonplaceholder.typicode.com/posts') + .then((r) => r.data.slice(0, 10)) + }, +) +const withoutUseServer_createServerFn_handler = createServerRpc( + { + id: 'c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2', + name: 'withoutUseServer', + filename: 'src/test.ts', + }, + (opts) => withoutUseServer.__executeServer(opts), +) +const withoutUseServer = serverFn({ method: 'GET' }).handler( + withoutUseServer_createServerFn_handler, + async () => { + console.info('Fetching posts...') + await new Promise((r) => setTimeout(r, 500)) + return axios + .get>('https://jsonplaceholder.typicode.com/posts') + .then((r) => r.data.slice(0, 10)) + }, +) +const withVariable_createServerFn_handler = createServerRpc( + { + id: '7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70', + name: 'withVariable', + filename: 'src/test.ts', + }, + (opts) => withVariable.__executeServer(opts), +) +const withVariable = serverFn({ method: 'GET' }).handler( + withVariable_createServerFn_handler, + abstractedFunction, +) async function abstractedFunction() { - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); + console.info('Fetching posts...') + await new Promise((r) => setTimeout(r, 500)) + return axios + .get>('https://jsonplaceholder.typicode.com/posts') + .then((r) => r.data.slice(0, 10)) } -function zodValidator(schema: TSchema, fn: (input: z.output) => TResult) { +function zodValidator( + schema: TSchema, + fn: (input: z.output) => TResult, +) { return async (input: unknown) => { - return fn(schema.parse(input)); - }; + return fn(schema.parse(input)) + } +} +const withZodValidator_createServerFn_handler = createServerRpc( + { + id: '43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3', + name: 'withZodValidator', + filename: 'src/test.ts', + }, + (opts) => withZodValidator.__executeServer(opts), +) +const withZodValidator = serverFn({ method: 'GET' }).handler( + withZodValidator_createServerFn_handler, + zodValidator(z.number(), (input) => { + return { 'you gave': input } + }), +) +export { + withUseServer_createServerFn_handler, + withoutUseServer_createServerFn_handler, + withVariable_createServerFn_handler, + withZodValidator_createServerFn_handler, } -const withZodValidator_createServerFn_handler = createServerRpc({ - id: "43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3", - name: "withZodValidator", - filename: "src/test.ts" -}, opts => withZodValidator.__executeServer(opts)); -const withZodValidator = serverFn({ - method: 'GET' -}).handler(withZodValidator_createServerFn_handler, zodValidator(z.number(), input => { - return { - 'you gave': input - }; -})); -export { withUseServer_createServerFn_handler, withoutUseServer_createServerFn_handler, withVariable_createServerFn_handler, withZodValidator_createServerFn_handler }; \ No newline at end of file diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/createServerFnStarImport.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/createServerFnStarImport.tsx index e759e35f42..bc18c08855 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/createServerFnStarImport.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/createServerFnStarImport.tsx @@ -1,60 +1,88 @@ -import { createServerRpc } from '@tanstack/react-start/server-rpc'; -import * as TanStackStart from '@tanstack/react-start'; -import { z } from 'zod'; -const withUseServer_createServerFn_handler = createServerRpc({ - id: "b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320", - name: "withUseServer", - filename: "src/test.ts" -}, opts => withUseServer.__executeServer(opts)); -const withUseServer = TanStackStart.createServerFn({ - method: 'GET' -}).handler(withUseServer_createServerFn_handler, async function () { - 'use server'; - - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); -}); -const withoutUseServer_createServerFn_handler = createServerRpc({ - id: "c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2", - name: "withoutUseServer", - filename: "src/test.ts" -}, opts => withoutUseServer.__executeServer(opts)); +import { createServerRpc } from '@tanstack/react-start/server-rpc' +import * as TanStackStart from '@tanstack/react-start' +import { z } from 'zod' +const withUseServer_createServerFn_handler = createServerRpc( + { + id: 'b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320', + name: 'withUseServer', + filename: 'src/test.ts', + }, + (opts) => withUseServer.__executeServer(opts), +) +const withUseServer = TanStackStart.createServerFn({ method: 'GET' }).handler( + withUseServer_createServerFn_handler, + async function () { + 'use server' + console.info('Fetching posts...') + await new Promise((r) => setTimeout(r, 500)) + return axios + .get>('https://jsonplaceholder.typicode.com/posts') + .then((r) => r.data.slice(0, 10)) + }, +) +const withoutUseServer_createServerFn_handler = createServerRpc( + { + id: 'c0d9fdeb2b01aafecc782f439416b86f666cb5334ac9a934546b177e5698bbb2', + name: 'withoutUseServer', + filename: 'src/test.ts', + }, + (opts) => withoutUseServer.__executeServer(opts), +) const withoutUseServer = TanStackStart.createServerFn({ - method: 'GET' + method: 'GET', }).handler(withoutUseServer_createServerFn_handler, async () => { - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); -}); -const withVariable_createServerFn_handler = createServerRpc({ - id: "7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70", - name: "withVariable", - filename: "src/test.ts" -}, opts => withVariable.__executeServer(opts)); -const withVariable = TanStackStart.createServerFn({ - method: 'GET' -}).handler(withVariable_createServerFn_handler, abstractedFunction); + console.info('Fetching posts...') + await new Promise((r) => setTimeout(r, 500)) + return axios + .get>('https://jsonplaceholder.typicode.com/posts') + .then((r) => r.data.slice(0, 10)) +}) +const withVariable_createServerFn_handler = createServerRpc( + { + id: '7d36cb30c30bd688b9773bd7f85a0d51d83f868255e127605e4f236615fefe70', + name: 'withVariable', + filename: 'src/test.ts', + }, + (opts) => withVariable.__executeServer(opts), +) +const withVariable = TanStackStart.createServerFn({ method: 'GET' }).handler( + withVariable_createServerFn_handler, + abstractedFunction, +) async function abstractedFunction() { - console.info('Fetching posts...'); - await new Promise(r => setTimeout(r, 500)); - return axios.get>('https://jsonplaceholder.typicode.com/posts').then(r => r.data.slice(0, 10)); + console.info('Fetching posts...') + await new Promise((r) => setTimeout(r, 500)) + return axios + .get>('https://jsonplaceholder.typicode.com/posts') + .then((r) => r.data.slice(0, 10)) } -function zodValidator(schema: TSchema, fn: (input: z.output) => TResult) { +function zodValidator( + schema: TSchema, + fn: (input: z.output) => TResult, +) { return async (input: unknown) => { - return fn(schema.parse(input)); - }; + return fn(schema.parse(input)) + } } -const withZodValidator_createServerFn_handler = createServerRpc({ - id: "43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3", - name: "withZodValidator", - filename: "src/test.ts" -}, opts => withZodValidator.__executeServer(opts)); +const withZodValidator_createServerFn_handler = createServerRpc( + { + id: '43606a369c85444a332f701d6399564b6a3691aabab63dfc9a0b7c341fb798f3', + name: 'withZodValidator', + filename: 'src/test.ts', + }, + (opts) => withZodValidator.__executeServer(opts), +) const withZodValidator = TanStackStart.createServerFn({ - method: 'GET' -}).handler(withZodValidator_createServerFn_handler, zodValidator(z.number(), input => { - return { - 'you gave': input - }; -})); -export { withUseServer_createServerFn_handler, withoutUseServer_createServerFn_handler, withVariable_createServerFn_handler, withZodValidator_createServerFn_handler }; \ No newline at end of file + method: 'GET', +}).handler( + withZodValidator_createServerFn_handler, + zodValidator(z.number(), (input) => { + return { 'you gave': input } + }), +) +export { + withUseServer_createServerFn_handler, + withoutUseServer_createServerFn_handler, + withVariable_createServerFn_handler, + withZodValidator_createServerFn_handler, +} diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/createServerFnValidator.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/createServerFnValidator.tsx index 66bcb9376e..f62fa718d6 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/createServerFnValidator.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/createServerFnValidator.tsx @@ -1,14 +1,15 @@ -import { createServerRpc } from '@tanstack/react-start/server-rpc'; -import { createServerFn } from '@tanstack/react-start'; -import { z } from 'zod'; -const withUseServer_createServerFn_handler = createServerRpc({ - id: "b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320", - name: "withUseServer", - filename: "src/test.ts" -}, opts => withUseServer.__executeServer(opts)); -const withUseServer = createServerFn({ - method: 'GET' -}).validator(z.number()).handler(withUseServer_createServerFn_handler, ({ - input -}) => input + 1); -export { withUseServer_createServerFn_handler }; \ No newline at end of file +import { createServerRpc } from '@tanstack/react-start/server-rpc' +import { createServerFn } from '@tanstack/react-start' +import { z } from 'zod' +const withUseServer_createServerFn_handler = createServerRpc( + { + id: 'b6fe31e85836ae6c65d8ab262dd1af6a68620aeef609029d50127f4cceaaf320', + name: 'withUseServer', + filename: 'src/test.ts', + }, + (opts) => withUseServer.__executeServer(opts), +) +const withUseServer = createServerFn({ method: 'GET' }) + .validator(z.number()) + .handler(withUseServer_createServerFn_handler, ({ input }) => input + 1) +export { withUseServer_createServerFn_handler } diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/factory.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/factory.tsx index 5a2c26fe0b..26298edd56 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/factory.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/factory.tsx @@ -1,53 +1,56 @@ -import { createServerRpc } from '@tanstack/react-start/server-rpc'; -import { createServerFn, createMiddleware } from '@tanstack/react-start'; -const authMiddleware = createMiddleware({ - type: 'function' -}).server(({ - next -}) => { - return next({ - context: { - auth: 'auth' - } - }); -}); -const adminMiddleware = createMiddleware({ - type: 'function' -}).server(({ - next -}) => { - return next({ - context: { - admin: 'admin' - } - }); -}); -const createAuthServerFn = createServerFn().middleware([authMiddleware]); -const createAdminServerFn = createAuthServerFn().middleware([adminMiddleware]); -const myAuthedFn_createServerFn_handler = createServerRpc({ - id: "3bb88b23926fa224cea3dcfb877026757733d95b42e3b66cf7f06bb89dab06a3", - name: "myAuthedFn", - filename: "src/test.ts" -}, opts => myAuthedFn.__executeServer(opts)); -const myAuthedFn = createAuthServerFn().handler(myAuthedFn_createServerFn_handler, () => { - return 'myAuthedFn'; -}); -const deleteUserFn_createServerFn_handler = createServerRpc({ - id: "44d9483a9412daaacaa5a8aee6b02294333a0e61b5d3b17ba6bcb34fd2bdce31", - name: "deleteUserFn", - filename: "src/test.ts" -}, opts => deleteUserFn.__executeServer(opts)); -const deleteUserFn = createAdminServerFn().handler(deleteUserFn_createServerFn_handler, () => { - return 'deleteUserFn'; -}); +import { createServerRpc } from '@tanstack/react-start/server-rpc' +import { createServerFn, createMiddleware } from '@tanstack/react-start' +const authMiddleware = createMiddleware({ type: 'function' }).server( + ({ next }) => { + return next({ context: { auth: 'auth' } }) + }, +) +const adminMiddleware = createMiddleware({ type: 'function' }).server( + ({ next }) => { + return next({ context: { admin: 'admin' } }) + }, +) +const createAuthServerFn = createServerFn().middleware([authMiddleware]) +const createAdminServerFn = createAuthServerFn().middleware([adminMiddleware]) +const myAuthedFn_createServerFn_handler = createServerRpc( + { + id: '3bb88b23926fa224cea3dcfb877026757733d95b42e3b66cf7f06bb89dab06a3', + name: 'myAuthedFn', + filename: 'src/test.ts', + }, + (opts) => myAuthedFn.__executeServer(opts), +) +const myAuthedFn = createAuthServerFn().handler( + myAuthedFn_createServerFn_handler, + () => { + return 'myAuthedFn' + }, +) +const deleteUserFn_createServerFn_handler = createServerRpc( + { + id: '44d9483a9412daaacaa5a8aee6b02294333a0e61b5d3b17ba6bcb34fd2bdce31', + name: 'deleteUserFn', + filename: 'src/test.ts', + }, + (opts) => deleteUserFn.__executeServer(opts), +) +const deleteUserFn = createAdminServerFn().handler( + deleteUserFn_createServerFn_handler, + () => { + return 'deleteUserFn' + }, +) function createFakeFn() { return { - handler: cb => { - return cb(); - } - }; + handler: (cb) => { + return cb() + }, + } } const x = createFakeFn().handler(() => { - return 'fakeFn'; -}); -export { myAuthedFn_createServerFn_handler, deleteUserFn_createServerFn_handler }; \ No newline at end of file + return 'fakeFn' +}) +export { + myAuthedFn_createServerFn_handler, + deleteUserFn_createServerFn_handler, +} diff --git a/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/isomorphic-fns.tsx b/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/isomorphic-fns.tsx index a65629abd0..3ae8622683 100644 --- a/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/isomorphic-fns.tsx +++ b/packages/start-plugin-core/tests/createServerFn/snapshots/server-provider/isomorphic-fns.tsx @@ -1,19 +1,35 @@ -import { createServerRpc } from '@tanstack/react-start/server-rpc'; -import { createIsomorphicFn, createServerFn } from '@tanstack/react-start'; -const getEnv = createIsomorphicFn().server(() => 'server').client(() => 'client'); -const getServerEnv_createServerFn_handler = createServerRpc({ - id: "6049dd46bc00e0980e387f3e74924b40e92f37634a3fe74a1a1facda9e9207c2", - name: "getServerEnv", - filename: "src/test.ts" -}, opts => getServerEnv.__executeServer(opts)); -const getServerEnv = createServerFn().handler(getServerEnv_createServerFn_handler, () => getEnv()); -const getEcho = createIsomorphicFn().server((input: string) => 'server received ' + input).client(input => 'client received ' + input); -const getServerEcho_createServerFn_handler = createServerRpc({ - id: "ebb82e0293952b7b1dde3f664dec4c139471c046d06d4dc4ca172f4f45e386d1", - name: "getServerEcho", - filename: "src/test.ts" -}, opts => getServerEcho.__executeServer(opts)); -const getServerEcho = createServerFn().validator((input: string) => input).handler(getServerEcho_createServerFn_handler, ({ - data -}) => getEcho(data)); -export { getServerEnv_createServerFn_handler, getServerEcho_createServerFn_handler }; \ No newline at end of file +import { createServerRpc } from '@tanstack/react-start/server-rpc' +import { createIsomorphicFn, createServerFn } from '@tanstack/react-start' +const getEnv = createIsomorphicFn() + .server(() => 'server') + .client(() => 'client') +const getServerEnv_createServerFn_handler = createServerRpc( + { + id: '6049dd46bc00e0980e387f3e74924b40e92f37634a3fe74a1a1facda9e9207c2', + name: 'getServerEnv', + filename: 'src/test.ts', + }, + (opts) => getServerEnv.__executeServer(opts), +) +const getServerEnv = createServerFn().handler( + getServerEnv_createServerFn_handler, + () => getEnv(), +) +const getEcho = createIsomorphicFn() + .server((input: string) => 'server received ' + input) + .client((input) => 'client received ' + input) +const getServerEcho_createServerFn_handler = createServerRpc( + { + id: 'ebb82e0293952b7b1dde3f664dec4c139471c046d06d4dc4ca172f4f45e386d1', + name: 'getServerEcho', + filename: 'src/test.ts', + }, + (opts) => getServerEcho.__executeServer(opts), +) +const getServerEcho = createServerFn() + .validator((input: string) => input) + .handler(getServerEcho_createServerFn_handler, ({ data }) => getEcho(data)) +export { + getServerEnv_createServerFn_handler, + getServerEcho_createServerFn_handler, +} diff --git a/packages/start-plugin-core/tests/entry-planning.test.ts b/packages/start-plugin-core/tests/entry-planning.test.ts new file mode 100644 index 0000000000..b8a71675a1 --- /dev/null +++ b/packages/start-plugin-core/tests/entry-planning.test.ts @@ -0,0 +1,116 @@ +import { + mkdtempSync, + mkdirSync, + realpathSync, + rmSync, + writeFileSync, +} from 'node:fs' +import { tmpdir } from 'node:os' +import { join } from 'node:path' +import { normalize } from 'pathe' +import { afterEach, describe, expect, test } from 'vitest' +import { resolveStartEntryPlan } from '../src/planning' +import { parseStartConfig as parseRsbuildStartConfig } from '../src/rsbuild/schema' +import { parseStartConfig as parseViteStartConfig } from '../src/vite/schema' + +const corePluginOpts = { framework: 'react' as const } +const defaultEntryPaths = { + client: '/virtual/default-client', + server: '/virtual/default-server', + start: '/virtual/default-start', +} +const roots = new Set() + +function createRoot() { + const root = mkdtempSync(join(tmpdir(), 'tanstack-start-entry-')) + roots.add(root) + mkdirSync(join(root, 'src')) + writeFileSync(join(root, 'src', 'router.ts'), 'export {}\n') + return root +} + +afterEach(() => { + for (const root of roots) { + rmSync(root, { recursive: true, force: true }) + } + roots.clear() +}) + +describe('server entry planning', () => { + test.each([ + ['vite', parseViteStartConfig], + ['rsbuild', parseRsbuildStartConfig], + ])( + 'uses the default server entry for %s when none is configured', + (_, parse) => { + const root = createRoot() + const startConfig = parse({}, corePluginOpts, root) + + const plan = resolveStartEntryPlan({ + root, + startConfig, + defaultEntryPaths, + }) + + expect(plan.entryPaths.server).toBe(defaultEntryPaths.server) + }, + ) + + test.each([ + ['vite', parseViteStartConfig], + ['rsbuild', parseRsbuildStartConfig], + ])('resolves a custom server entry for %s from srcDirectory', (_, parse) => { + const root = createRoot() + const serverEntry = join(root, 'src', 'server-entry.ts') + writeFileSync(serverEntry, 'export default {}\n') + const startConfig = parse( + { + server: { + entry: './server-entry.ts', + }, + }, + corePluginOpts, + root, + ) + + const plan = resolveStartEntryPlan({ + root, + startConfig, + defaultEntryPaths, + }) + + expect(plan.entryPaths.server).toBe(normalize(realpathSync(serverEntry))) + }) + + test.each([ + ['vite', parseViteStartConfig], + ['rsbuild', parseRsbuildStartConfig], + ])( + 'resolves a custom server entry for %s from a custom srcDirectory', + (_, parse) => { + const root = createRoot() + mkdirSync(join(root, 'app')) + writeFileSync(join(root, 'app', 'router.ts'), 'export {}\n') + const serverEntry = join(root, 'app', 'server-entry.ts') + writeFileSync(serverEntry, 'export default {}\n') + const startConfig = parse( + { + srcDirectory: 'app', + server: { + entry: './server-entry.ts', + }, + }, + corePluginOpts, + root, + ) + + const plan = resolveStartEntryPlan({ + root, + startConfig, + defaultEntryPaths, + }) + + expect(plan.entryPaths.server).toBe(normalize(realpathSync(serverEntry))) + }, + ) +}) diff --git a/packages/start-plugin-core/tests/envOnly/envOnly.test.ts b/packages/start-plugin-core/tests/envOnly/envOnly.test.ts index 128e4f4162..4c18f2da81 100644 --- a/packages/start-plugin-core/tests/envOnly/envOnly.test.ts +++ b/packages/start-plugin-core/tests/envOnly/envOnly.test.ts @@ -3,6 +3,7 @@ import path from 'node:path' import { describe, expect, test } from 'vitest' import { StartCompiler } from '../../src/start-compiler/compiler' +import { formatSnapshot } from '../format-snapshot' // Default test options for StartCompiler function getDefaultTestOptions(env: 'client' | 'server') { @@ -73,9 +74,9 @@ describe('envOnly functions compile correctly', async () => { id: filename, }) - await expect(compiledResult!.code).toMatchFileSnapshot( - `./snapshots/${env}/${filename}`, - ) + await expect( + await formatSnapshot(compiledResult!.code, filename), + ).toMatchFileSnapshot(`./snapshots/${env}/${filename}`) }, ) }) diff --git a/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyDestructured.tsx b/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyDestructured.tsx index d56ad1f374..8c97577305 100644 --- a/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyDestructured.tsx +++ b/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyDestructured.tsx @@ -1,4 +1,6 @@ const serverFunc = () => { - throw new Error("createServerOnlyFn() functions can only be called on the server!"); -}; -const clientFunc = () => 'client'; \ No newline at end of file + throw new Error( + 'createServerOnlyFn() functions can only be called on the server!', + ) +} +const clientFunc = () => 'client' diff --git a/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyDestructuredRename.tsx b/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyDestructuredRename.tsx index d56ad1f374..8c97577305 100644 --- a/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyDestructuredRename.tsx +++ b/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyDestructuredRename.tsx @@ -1,4 +1,6 @@ const serverFunc = () => { - throw new Error("createServerOnlyFn() functions can only be called on the server!"); -}; -const clientFunc = () => 'client'; \ No newline at end of file + throw new Error( + 'createServerOnlyFn() functions can only be called on the server!', + ) +} +const clientFunc = () => 'client' diff --git a/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyExportedAlias.tsx b/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyExportedAlias.tsx index ee84019143..cad8d612c9 100644 --- a/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyExportedAlias.tsx +++ b/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyExportedAlias.tsx @@ -1,6 +1,10 @@ export const fn = () => { - throw new Error("createServerOnlyFn() functions can only be called on the server!"); -}; + throw new Error( + 'createServerOnlyFn() functions can only be called on the server!', + ) +} export const wrappedFn = (() => { - throw new Error("createServerOnlyFn() functions can only be called on the server!"); -}) as () => string; \ No newline at end of file + throw new Error( + 'createServerOnlyFn() functions can only be called on the server!', + ) +}) as () => string diff --git a/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyFactory.tsx b/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyFactory.tsx index 6a29fcbfe6..b226e30116 100644 --- a/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyFactory.tsx +++ b/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyFactory.tsx @@ -1,32 +1,34 @@ // Server-only function factory export function createServerFactory(name: string) { return () => { - throw new Error("createServerOnlyFn() functions can only be called on the server!"); - }; + throw new Error( + 'createServerOnlyFn() functions can only be called on the server!', + ) + } } - // Client-only function factory export function createClientFactory(name: string) { return () => { - console.log(`Client only: ${name}`); - return `client-${name}`; - }; + console.log(`Client only: ${name}`) + return `client-${name}` + } } - // Arrow function server factory export const createServerArrowFactory = (prefix: string) => { return () => { - throw new Error("createServerOnlyFn() functions can only be called on the server!"); - }; -}; - + throw new Error( + 'createServerOnlyFn() functions can only be called on the server!', + ) + } +} // Arrow function client factory export const createClientArrowFactory = (prefix: string) => { - return () => `${prefix}-client`; -}; - + return () => `${prefix}-client` +} // Top-level for comparison export const topLevelServerFn = () => { - throw new Error("createServerOnlyFn() functions can only be called on the server!"); -}; -export const topLevelClientFn = () => 'client'; \ No newline at end of file + throw new Error( + 'createServerOnlyFn() functions can only be called on the server!', + ) +} +export const topLevelClientFn = () => 'client' diff --git a/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyStarImport.tsx b/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyStarImport.tsx index d56ad1f374..8c97577305 100644 --- a/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyStarImport.tsx +++ b/packages/start-plugin-core/tests/envOnly/snapshots/client/envOnlyStarImport.tsx @@ -1,4 +1,6 @@ const serverFunc = () => { - throw new Error("createServerOnlyFn() functions can only be called on the server!"); -}; -const clientFunc = () => 'client'; \ No newline at end of file + throw new Error( + 'createServerOnlyFn() functions can only be called on the server!', + ) +} +const clientFunc = () => 'client' diff --git a/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyDestructured.tsx b/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyDestructured.tsx index 5373578295..924d8d2442 100644 --- a/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyDestructured.tsx +++ b/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyDestructured.tsx @@ -1,4 +1,6 @@ -const serverFunc = () => 'server'; +const serverFunc = () => 'server' const clientFunc = () => { - throw new Error("createClientOnlyFn() functions can only be called on the client!"); -}; \ No newline at end of file + throw new Error( + 'createClientOnlyFn() functions can only be called on the client!', + ) +} diff --git a/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyDestructuredRename.tsx b/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyDestructuredRename.tsx index 5373578295..924d8d2442 100644 --- a/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyDestructuredRename.tsx +++ b/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyDestructuredRename.tsx @@ -1,4 +1,6 @@ -const serverFunc = () => 'server'; +const serverFunc = () => 'server' const clientFunc = () => { - throw new Error("createClientOnlyFn() functions can only be called on the client!"); -}; \ No newline at end of file + throw new Error( + 'createClientOnlyFn() functions can only be called on the client!', + ) +} diff --git a/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyExportedAlias.tsx b/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyExportedAlias.tsx index 8f906790b8..078c324406 100644 --- a/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyExportedAlias.tsx +++ b/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyExportedAlias.tsx @@ -1,2 +1,2 @@ -export const fn = () => 'server-only-value'; -export const wrappedFn = (() => 'wrapped-server-only-value') as () => string; \ No newline at end of file +export const fn = () => 'server-only-value' +export const wrappedFn = (() => 'wrapped-server-only-value') as () => string diff --git a/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyFactory.tsx b/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyFactory.tsx index 58b2483a48..fdb022bc0d 100644 --- a/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyFactory.tsx +++ b/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyFactory.tsx @@ -1,32 +1,34 @@ // Server-only function factory export function createServerFactory(name: string) { return () => { - console.log(`Server only: ${name}`); - return `server-${name}`; - }; + console.log(`Server only: ${name}`) + return `server-${name}` + } } - // Client-only function factory export function createClientFactory(name: string) { return () => { - throw new Error("createClientOnlyFn() functions can only be called on the client!"); - }; + throw new Error( + 'createClientOnlyFn() functions can only be called on the client!', + ) + } } - // Arrow function server factory export const createServerArrowFactory = (prefix: string) => { - return () => `${prefix}-server`; -}; - + return () => `${prefix}-server` +} // Arrow function client factory export const createClientArrowFactory = (prefix: string) => { return () => { - throw new Error("createClientOnlyFn() functions can only be called on the client!"); - }; -}; - + throw new Error( + 'createClientOnlyFn() functions can only be called on the client!', + ) + } +} // Top-level for comparison -export const topLevelServerFn = () => 'server'; +export const topLevelServerFn = () => 'server' export const topLevelClientFn = () => { - throw new Error("createClientOnlyFn() functions can only be called on the client!"); -}; \ No newline at end of file + throw new Error( + 'createClientOnlyFn() functions can only be called on the client!', + ) +} diff --git a/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyStarImport.tsx b/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyStarImport.tsx index 5373578295..924d8d2442 100644 --- a/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyStarImport.tsx +++ b/packages/start-plugin-core/tests/envOnly/snapshots/server/envOnlyStarImport.tsx @@ -1,4 +1,6 @@ -const serverFunc = () => 'server'; +const serverFunc = () => 'server' const clientFunc = () => { - throw new Error("createClientOnlyFn() functions can only be called on the client!"); -}; \ No newline at end of file + throw new Error( + 'createClientOnlyFn() functions can only be called on the client!', + ) +} diff --git a/packages/start-plugin-core/tests/format-snapshot.ts b/packages/start-plugin-core/tests/format-snapshot.ts new file mode 100644 index 0000000000..d152094bea --- /dev/null +++ b/packages/start-plugin-core/tests/format-snapshot.ts @@ -0,0 +1,69 @@ +import { format } from 'prettier' +import { parsers } from 'prettier/plugins/typescript' +import type { ParserOptions } from 'prettier' + +/** + * Formats compiler output before it is compared with a file snapshot, so that + * snapshots record the emitted program instead of the layout choices of the + * code generator (object wrapping, blank lines, parentheses around JSX, ...). + * + * Comments are kept: they are part of the output. Output that does not parse + * is returned unchanged. + */ +export async function formatSnapshot(code: string, filepath: string) { + try { + return await format(await removeBlankLines(code, filepath), { + filepath, + parser: 'typescript', + semi: false, + singleQuote: true, + trailingComma: 'all', + // Do not keep an object expanded because the generator printed it + // over several lines. + objectWrap: 'collapse', + }) + } catch { + return code + } +} + +/** + * Prettier keeps single blank lines from its input. Outside template literals, + * line breaks are not significant, so blank lines can be dropped. + */ +async function removeBlankLines(code: string, filepath: string) { + const parser = parsers.typescript + const ast = await parser.parse(code, { filepath } as ParserOptions) + const templateRanges: Array<[number, number]> = [] + const visit = (node: unknown): void => { + if (Array.isArray(node)) { + node.forEach(visit) + return + } + if (!node || typeof node !== 'object') { + return + } + if ((node as { type?: unknown }).type === 'TemplateElement') { + templateRanges.push([parser.locStart(node), parser.locEnd(node)]) + } + for (const [key, value] of Object.entries(node)) { + if (key !== 'loc' && key !== 'range') { + visit(value) + } + } + } + visit(ast) + + const lines: Array = [] + let lineStart = 0 + for (const line of code.split('\n')) { + const isInTemplate = templateRanges.some( + ([start, end]) => start < lineStart && lineStart < end, + ) + if (line.trim() !== '' || isInTemplate) { + lines.push(line) + } + lineStart += line.length + 1 + } + return lines.join('\n') +} diff --git a/packages/start-plugin-core/tests/hydrateWhen/hydrateWhen.test.ts b/packages/start-plugin-core/tests/hydrateWhen/hydrateWhen.test.ts index a027fac505..d47bc3972d 100644 --- a/packages/start-plugin-core/tests/hydrateWhen/hydrateWhen.test.ts +++ b/packages/start-plugin-core/tests/hydrateWhen/hydrateWhen.test.ts @@ -5,6 +5,7 @@ import { generateFromAst, parseAst } from '@tanstack/router-utils' import path from 'pathe' import { describe, expect, test } from 'vitest' import { createHydrateCompilerPlugin } from '../../src/hydrate-when-transform' +import { formatSnapshot } from '../format-snapshot' const fixtureRoot = path.resolve(import.meta.dirname, './test-files') const errorRoot = path.resolve(import.meta.dirname, './error-files') @@ -13,8 +14,13 @@ function fixtureId(filename: string) { return path.join(fixtureRoot, filename) } -function normalizeSnapshotCode(code: string) { - return code.split(fixtureRoot).join('') +// Replace the fixture root before formatting so that line breaks do not +// depend on where the repository is checked out. +async function normalizeSnapshotCode(code: string, filename: string) { + return await formatSnapshot( + code.split(fixtureRoot).join(''), + filename, + ) } async function readFixture(filename: string) { @@ -136,7 +142,9 @@ describe('Hydrate compiler transform fixtures', async () => { const result = compile({ env: 'client', code, id }) await expect( - normalizeSnapshotCode(result?.code ?? 'no-transform'), + result + ? await normalizeSnapshotCode(result.code, filename) + : 'no-transform', ).toMatchFileSnapshot(`./snapshots/client/${filename}`) }) @@ -144,7 +152,9 @@ describe('Hydrate compiler transform fixtures', async () => { const result = compile({ env: 'server', code, id }) await expect( - normalizeSnapshotCode(result?.code ?? 'no-transform'), + result + ? await normalizeSnapshotCode(result.code, filename) + : 'no-transform', ).toMatchFileSnapshot(`./snapshots/server/${filename}`) }) }) @@ -225,7 +235,9 @@ describe('Hydrate compiler transform fixtures', async () => { }) await expect( - normalizeSnapshotCode(loaded?.code ?? 'no-virtual-module'), + loaded + ? await normalizeSnapshotCode(loaded.code, filename) + : 'no-virtual-module', ).toMatchFileSnapshot( `./snapshots/virtual/${filename}.${boundary.exportName}.tsx`, ) @@ -245,7 +257,9 @@ describe('Hydrate compiler transform fixtures', async () => { }) await expect( - normalizeSnapshotCode(nestedPass?.code ?? 'no-transform'), + nestedPass + ? await normalizeSnapshotCode(nestedPass.code, filename) + : 'no-transform', ).toMatchFileSnapshot(`./snapshots/virtual/${filename}.H0.client.tsx`) }) }) diff --git a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenBasic.tsx b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenBasic.tsx index f1d2243d68..5f057addab 100644 --- a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenBasic.tsx +++ b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenBasic.tsx @@ -1,18 +1,24 @@ -const _H = _lazyRouteComponent(() => import("/hydrateWhenBasic.tsx?tss-hydrate=0_3cf0187f82"), "H0"), - _H0_preload = _H.preload; -import { lazyRouteComponent as _lazyRouteComponent } from "@tanstack/react-router"; -import { Hydrate } from '@tanstack/react-start'; -import { idle, visible } from '@tanstack/react-start/hydration'; -import { FallbackPane } from './widgets'; +const _H = _lazyRouteComponent( + () => import('/hydrateWhenBasic.tsx?tss-hydrate=0_3cf0187f82'), + 'H0', + ), + _H0_preload = _H.preload +import { lazyRouteComponent as _lazyRouteComponent } from '@tanstack/react-router' +import { Hydrate } from '@tanstack/react-start' +import { idle, visible } from '@tanstack/react-start/hydration' +import { FallbackPane } from './widgets' export function Page() { - return
- } h="0_3cf0187f82" p={_H0_preload}> -{<_H />} - -
; -} \ No newline at end of file + return ( +
+ } + h="0_3cf0187f82" + p={_H0_preload} + > + {<_H />} + +
+ ) +} diff --git a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenMultiple.tsx b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenMultiple.tsx index 73070a4fe1..34203df6ad 100644 --- a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenMultiple.tsx +++ b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenMultiple.tsx @@ -1,19 +1,33 @@ -const _H3 = _lazyRouteComponent(() => import("/hydrateWhenMultiple.tsx?tss-hydrate=2_21aa371e0f"), "H2"); -const _H2 = _lazyRouteComponent(() => import("/hydrateWhenMultiple.tsx?tss-hydrate=1_21aa371e0f"), "H1"); -const _H = _lazyRouteComponent(() => import("/hydrateWhenMultiple.tsx?tss-hydrate=0_21aa371e0f"), "H0"); -import { lazyRouteComponent as _lazyRouteComponent } from "@tanstack/react-router"; -import { Hydrate } from '@tanstack/react-start'; -import { load, media, visible } from '@tanstack/react-start/hydration'; +const _H3 = _lazyRouteComponent( + () => + import('/hydrateWhenMultiple.tsx?tss-hydrate=2_21aa371e0f'), + 'H2', +) +const _H2 = _lazyRouteComponent( + () => + import('/hydrateWhenMultiple.tsx?tss-hydrate=1_21aa371e0f'), + 'H1', +) +const _H = _lazyRouteComponent( + () => + import('/hydrateWhenMultiple.tsx?tss-hydrate=0_21aa371e0f'), + 'H0', +) +import { lazyRouteComponent as _lazyRouteComponent } from '@tanstack/react-router' +import { Hydrate } from '@tanstack/react-start' +import { load, media, visible } from '@tanstack/react-start/hydration' export function Page() { - return <> + return ( + <> -{<_H />} - + {<_H />} + -{<_H2 />} - + {<_H2 />} + -{<_H3 />} - - ; -} \ No newline at end of file + {<_H3 />} + + + ) +} diff --git a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenNested.tsx b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenNested.tsx index 70fe4ce862..adec83789c 100644 --- a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenNested.tsx +++ b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenNested.tsx @@ -1,16 +1,24 @@ -const _H2 = _lazyRouteComponent(() => import("/hydrateWhenNested.tsx?tss-hydrate=2_466696e41d"), "H2"); -const _H = _lazyRouteComponent(() => import("/hydrateWhenNested.tsx?tss-hydrate=0_466696e41d"), "H0"); -import { lazyRouteComponent as _lazyRouteComponent } from "@tanstack/react-router"; -import { Hydrate } from '@tanstack/react-start'; -import { idle, visible } from '@tanstack/react-start/hydration'; -const unused = 'remove me from virtual modules'; +const _H2 = _lazyRouteComponent( + () => import('/hydrateWhenNested.tsx?tss-hydrate=2_466696e41d'), + 'H2', +) +const _H = _lazyRouteComponent( + () => import('/hydrateWhenNested.tsx?tss-hydrate=0_466696e41d'), + 'H0', +) +import { lazyRouteComponent as _lazyRouteComponent } from '@tanstack/react-router' +import { Hydrate } from '@tanstack/react-start' +import { idle, visible } from '@tanstack/react-start/hydration' +const unused = 'remove me from virtual modules' export function Page() { - return <> + return ( + <> -{<_H />} - + {<_H />} + -{<_H2 />} - - ; -} \ No newline at end of file + {<_H2 />} + + + ) +} diff --git a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenNever.tsx b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenNever.tsx index 4d135f70f4..c2af676fa4 100644 --- a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenNever.tsx +++ b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenNever.tsx @@ -1,9 +1,14 @@ -const _H = _lazyRouteComponent(() => import("/hydrateWhenNever.tsx?tss-hydrate=0_b752509d76"), "H0"); -import { lazyRouteComponent as _lazyRouteComponent } from "@tanstack/react-router"; -import { Hydrate } from '@tanstack/react-start'; -import { never } from '@tanstack/react-start/hydration'; +const _H = _lazyRouteComponent( + () => import('/hydrateWhenNever.tsx?tss-hydrate=0_b752509d76'), + 'H0', +) +import { lazyRouteComponent as _lazyRouteComponent } from '@tanstack/react-router' +import { Hydrate } from '@tanstack/react-start' +import { never } from '@tanstack/react-start/hydration' export function Page() { - return -{<_H />} -; -} \ No newline at end of file + return ( + + {<_H />} + + ) +} diff --git a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenObjectFallback.tsx b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenObjectFallback.tsx index 1fc3dc39a9..a0353594f2 100644 --- a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenObjectFallback.tsx +++ b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenObjectFallback.tsx @@ -1,26 +1,47 @@ -const _H3 = _lazyRouteComponent(() => import("/hydrateWhenObjectFallback.tsx?tss-hydrate=2_7f4dc3aa80"), "H2"); -const _H2 = _lazyRouteComponent(() => import("/hydrateWhenObjectFallback.tsx?tss-hydrate=1_7f4dc3aa80"), "H1"); -const _H = _lazyRouteComponent(() => import("/hydrateWhenObjectFallback.tsx?tss-hydrate=0_7f4dc3aa80"), "H0"); -import { lazyRouteComponent as _lazyRouteComponent } from "@tanstack/react-router"; -import { Hydrate } from '@tanstack/react-start'; -import { idle, visible } from '@tanstack/react-start/hydration'; +const _H3 = _lazyRouteComponent( + () => + import('/hydrateWhenObjectFallback.tsx?tss-hydrate=2_7f4dc3aa80'), + 'H2', +) +const _H2 = _lazyRouteComponent( + () => + import('/hydrateWhenObjectFallback.tsx?tss-hydrate=1_7f4dc3aa80'), + 'H1', +) +const _H = _lazyRouteComponent( + () => + import('/hydrateWhenObjectFallback.tsx?tss-hydrate=0_7f4dc3aa80'), + 'H0', +) +import { lazyRouteComponent as _lazyRouteComponent } from '@tanstack/react-router' +import { Hydrate } from '@tanstack/react-start' +import { idle, visible } from '@tanstack/react-start/hydration' const spreadProps = { when: visible(), - fallback:
Bound
-}; + fallback:
Bound
, +} export function Page() { - return <> - Direct} h="0_7f4dc3aa80"> -{<_H />} - - Inline - }} h="1_7f4dc3aa80"> -{<_H2 />} - + return ( + <> + Direct} + h="0_7f4dc3aa80" + > + {<_H />} + + Inline, + }} + h="1_7f4dc3aa80" + > + {<_H2 />} + -{<_H3 />} - - ; -} \ No newline at end of file + {<_H3 />} + + + ) +} diff --git a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenPrefetchState.tsx b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenPrefetchState.tsx index 56bc8896ce..05028ec03b 100644 --- a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenPrefetchState.tsx +++ b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenPrefetchState.tsx @@ -1,19 +1,30 @@ -const _H = _lazyRouteComponent(() => import("/hydrateWhenPrefetchState.tsx?tss-hydrate=0_24b5f958eb"), "H0"), - _H0_preload = _H.preload; -import { lazyRouteComponent as _lazyRouteComponent } from "@tanstack/react-router"; -import { useState } from 'react'; -import { Hydrate } from '@tanstack/react-start'; -import { interaction } from '@tanstack/react-start/hydration'; +const _H = _lazyRouteComponent( + () => + import('/hydrateWhenPrefetchState.tsx?tss-hydrate=0_24b5f958eb'), + 'H0', + ), + _H0_preload = _H.preload +import { lazyRouteComponent as _lazyRouteComponent } from '@tanstack/react-router' +import { useState } from 'react' +import { Hydrate } from '@tanstack/react-start' +import { interaction } from '@tanstack/react-start/hydration' export function Page() { - const [status, setStatus] = useState('idle'); - const [, setUnusedStatus] = useState('idle'); - return
+ const [status, setStatus] = useState('idle') + const [, setUnusedStatus] = useState('idle') + return ( +

{status}

- { - setStatus('prefetched'); - setUnusedStatus('prefetched'); - }} h="0_24b5f958eb" p={_H0_preload}> -{<_H />} - -
; -} \ No newline at end of file + { + setStatus('prefetched') + setUnusedStatus('prefetched') + }} + h="0_24b5f958eb" + p={_H0_preload} + > + {<_H />} + +
+ ) +} diff --git a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenRenamed.tsx b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenRenamed.tsx index 13b86d4d5d..509b2b988b 100644 --- a/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenRenamed.tsx +++ b/packages/start-plugin-core/tests/hydrateWhen/snapshots/client/hydrateWhenRenamed.tsx @@ -1,11 +1,14 @@ -const _H = _lazyRouteComponent(() => import("/hydrateWhenRenamed.tsx?tss-hydrate=0_f555ef3ac2"), "H0"); -import { lazyRouteComponent as _lazyRouteComponent } from "@tanstack/react-router"; -import { Hydrate as HW } from '@tanstack/react-start'; -import { interaction } from '@tanstack/react-start/hydration'; +const _H = _lazyRouteComponent( + () => import('/hydrateWhenRenamed.tsx?tss-hydrate=0_f555ef3ac2'), + 'H0', +) +import { lazyRouteComponent as _lazyRouteComponent } from '@tanstack/react-router' +import { Hydrate as HW } from '@tanstack/react-start' +import { interaction } from '@tanstack/react-start/hydration' export function Page() { - return -{<_H />} -; -} \ No newline at end of file + return ( + + {<_H />} + + ) +} diff --git a/packages/start-plugin-core/tests/hydrateWhen/snapshots/server/hydrateWhenBasic.tsx b/packages/start-plugin-core/tests/hydrateWhen/snapshots/server/hydrateWhenBasic.tsx index 8bcf4099ca..71896aa304 100644 --- a/packages/start-plugin-core/tests/hydrateWhen/snapshots/server/hydrateWhenBasic.tsx +++ b/packages/start-plugin-core/tests/hydrateWhen/snapshots/server/hydrateWhenBasic.tsx @@ -1,17 +1,18 @@ -import { Hydrate } from '@tanstack/react-start'; -import { idle, visible } from '@tanstack/react-start/hydration'; -import { Chart } from './widgets'; -import { formatValue } from './format'; -const chartTitle = formatValue('Revenue'); +import { Hydrate } from '@tanstack/react-start' +import { idle, visible } from '@tanstack/react-start/hydration' +import { Chart } from './widgets' +import { formatValue } from './format' +const chartTitle = formatValue('Revenue') export function Page() { - return
- + return ( +
+ -
; -} \ No newline at end of file +
+ ) +} diff --git a/packages/start-plugin-core/tests/hydrateWhen/snapshots/server/hydrateWhenMultiple.tsx b/packages/start-plugin-core/tests/hydrateWhen/snapshots/server/hydrateWhenMultiple.tsx index 6959b25b3e..92bb4f9a26 100644 --- a/packages/start-plugin-core/tests/hydrateWhen/snapshots/server/hydrateWhenMultiple.tsx +++ b/packages/start-plugin-core/tests/hydrateWhen/snapshots/server/hydrateWhenMultiple.tsx @@ -1,16 +1,17 @@ -import { Hydrate } from '@tanstack/react-start'; -import { load, media, visible } from '@tanstack/react-start/hydration'; +import { Hydrate } from '@tanstack/react-start' +import { load, media, visible } from '@tanstack/react-start/hydration' function Summary() { - return
Summary
; + return
Summary
} function Comments() { - return
Comments
; + return
Comments
} function Footer() { - return
Footer
; + return
Footer
} export function Page() { - return <> + return ( + <> @@ -20,5 +21,6 @@ export function Page() {